Skip to content
Snippets Groups Projects
Commit c9e76652 authored by louis's avatar louis
Browse files

add logout to settings

parent 9e672973
Branches
Tags
No related merge requests found
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CodeStream">
<option name="webViewContext" value="{&quot;chatProviderAccess&quot;:&quot;strict&quot;,&quot;currentTeamId&quot;:&quot;&quot;,&quot;currentStreamId&quot;:&quot;&quot;,&quot;pullRequestCheckoutBranch&quot;:false,&quot;isRepositioning&quot;:false,&quot;onboardStep&quot;:0,&quot;panelStack&quot;:[&quot;landing-redirect&quot;],&quot;hasFocus&quot;:false,&quot;channelFilter&quot;:&quot;all&quot;,&quot;channelsMuteAll&quot;:false,&quot;codemarkFileFilter&quot;:&quot;all&quot;,&quot;codemarkTypeFilter&quot;:&quot;all&quot;,&quot;codemarkTagFilter&quot;:&quot;all&quot;,&quot;codemarkBranchFilter&quot;:&quot;all&quot;,&quot;codemarkAuthorFilter&quot;:&quot;all&quot;,&quot;codemarksFileViewStyle&quot;:&quot;inline&quot;,&quot;codemarksShowArchived&quot;:false,&quot;codemarksShowResolved&quot;:false,&quot;codemarksWrapComments&quot;:false,&quot;showFeedbackSmiley&quot;:true,&quot;route&quot;:{&quot;name&quot;:&quot;newUserEntry&quot;,&quot;params&quot;:{}},&quot;spatialViewShowPRComments&quot;:false,&quot;currentPullRequestNeedsRefresh&quot;:{&quot;needsRefresh&quot;:false,&quot;providerId&quot;:&quot;&quot;,&quot;pullRequestId&quot;:&quot;&quot;},&quot;entityAccounts&quot;:[],&quot;__teamless__&quot;:{&quot;selectedRegion&quot;:&quot;us&quot;},&quot;sessionStart&quot;:1711952290599}" />
<option name="webViewContext" value="{&quot;chatProviderAccess&quot;:&quot;strict&quot;,&quot;currentTeamId&quot;:&quot;&quot;,&quot;currentStreamId&quot;:&quot;&quot;,&quot;pullRequestCheckoutBranch&quot;:false,&quot;isRepositioning&quot;:false,&quot;onboardStep&quot;:0,&quot;panelStack&quot;:[&quot;landing-redirect&quot;],&quot;hasFocus&quot;:false,&quot;channelFilter&quot;:&quot;all&quot;,&quot;channelsMuteAll&quot;:false,&quot;codemarkFileFilter&quot;:&quot;all&quot;,&quot;codemarkTypeFilter&quot;:&quot;all&quot;,&quot;codemarkTagFilter&quot;:&quot;all&quot;,&quot;codemarkBranchFilter&quot;:&quot;all&quot;,&quot;codemarkAuthorFilter&quot;:&quot;all&quot;,&quot;codemarksFileViewStyle&quot;:&quot;inline&quot;,&quot;codemarksShowArchived&quot;:false,&quot;codemarksShowResolved&quot;:false,&quot;codemarksWrapComments&quot;:false,&quot;showFeedbackSmiley&quot;:true,&quot;route&quot;:{&quot;name&quot;:&quot;newUserEntry&quot;,&quot;params&quot;:{}},&quot;spatialViewShowPRComments&quot;:false,&quot;currentPullRequestNeedsRefresh&quot;:{&quot;needsRefresh&quot;:false,&quot;providerId&quot;:&quot;&quot;,&quot;pullRequestId&quot;:&quot;&quot;},&quot;entityAccounts&quot;:[],&quot;__teamless__&quot;:{&quot;selectedRegion&quot;:&quot;us&quot;},&quot;sessionStart&quot;:1712041095621}" />
</component>
</project>
\ No newline at end of file
package com.example.myapplication
import android.app.Activity
import android.content.Intent
import android.content.SharedPreferences
import android.os.Bundle
import android.util.Log
......@@ -55,6 +57,10 @@ class LoginActivity : AppCompatActivity() {
Log.d("Development", "Activity: Login success")
val preference : SharedPreferences = getSharedPreferences("secret_shared_prefs", MODE_PRIVATE)
Log.d("Development", "Activity: Token: ${preference.getString("token", null)}\nPref: ${secretPreference.getToken()}")
val resultIntent = Intent()
resultIntent.putExtra("userData", binding.emailInput.text.toString())
setResult(Activity.RESULT_OK, resultIntent)
finish()
}
......
......@@ -29,7 +29,6 @@ class MainActivity : AppCompatActivity(){
private lateinit var secretPreference : SecretPreference
private val checkConnection by lazy { CheckConnection(application) }
private val connected : MutableLiveData<Boolean> = MutableLiveData(true)
private lateinit var viewModelSettings: SettingsViewModel
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -51,13 +50,6 @@ class MainActivity : AppCompatActivity(){
setupActionBarWithNavController(navController, appBarConfiguration)
navView.setupWithNavController(navController)
val isOnline : String = if (isOnline()) "Online" else "Offline"
Log.i("Development", "Online Connectivity Status: $isOnline")
val loginIntent = Intent(this, LoginActivity::class.java)
startActivity(loginIntent)
}
......@@ -115,4 +107,11 @@ class MainActivity : AppCompatActivity(){
return networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
}
fun logout() {
secretPreference = SecretPreference(this)
secretPreference.clearToken()
val loginIntent = Intent(this, LoginActivity::class.java)
startActivity(loginIntent)
}
}
\ No newline at end of file
......@@ -45,6 +45,7 @@ class SettingsFragment : Fragment() {
}
val button = root.findViewById<Button>(R.id.send)
val logoutButton = root.findViewById<Button>(R.id.logout_button)
val subject = root.findViewById<EditText>(R.id.subject).text.toString()
val content = root.findViewById<EditText>(R.id.content).text.toString()
val email = root.findViewById<EditText>(R.id.send_to).text.toString()
......@@ -74,6 +75,11 @@ class SettingsFragment : Fragment() {
}
}
logoutButton.setOnClickListener {
val mainActivity = activity as? MainActivity
mainActivity?.logout()
}
return root
}
......
......@@ -9,6 +9,7 @@ import android.net.ConnectivityManager
import android.net.Network
import android.util.Log
import com.example.myapplication.NetworkConnection
import com.example.myapplication.ui.login.UserViewModel
class SettingsViewModel : ViewModel() {
private val _text = MutableLiveData<String>().apply {
......
......@@ -17,45 +17,46 @@
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.199" />
app:layout_constraintVertical_bias="0.093" />
<EditText
android:id="@+id/subject"
android:hint="Enter subject"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Enter subject"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.399" />
app:layout_constraintVertical_bias="0.204" />
<EditText
android:id="@+id/content"
android:hint="Enter content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Enter content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.31" />
<EditText
android:id="@+id/send_to"
android:hint="Enter email address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Enter email address"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.596" />
app:layout_constraintVertical_bias="0.415" />
<Button
android:id="@+id/send"
......@@ -67,6 +68,16 @@
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.715" />
app:layout_constraintVertical_bias="0.534" />
<Button
android:id="@+id/logout_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:text="Logout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/send" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment