Implemented logout button

AchoArnold · AchoArnold · commit 84dfd1133327 · 2022-06-29T23:32:17.000+03:00
diff --git a/android/app/src/main/java/com/httpsms/MainActivity.kt b/android/app/src/main/java/com/httpsms/MainActivity.kt
@@ -16,6 +16,7 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.switchmaterial.SwitchMaterial
 import timber.log.Timber
 import java.util.*
@@ -41,6 +42,8 @@ class MainActivity : AppCompatActivity() {
 
         setOwner(getPhoneNumber(this))
         setActiveStatus(this)
+        registerListeners()
+        refreshToken()
     }
 
     override fun onResume() {
@@ -49,12 +52,26 @@ class MainActivity : AppCompatActivity() {
         redirectToLogin()
     }
 
+    private fun refreshToken() {
+
+    }
+
     private fun initTimber() {
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
     }
 
+    private fun registerListeners() {
+        findViewById<MaterialButton>(R.id.mainLogoutButton).setOnClickListener { onLogoutClick() }
+    }
+
+    private fun onLogoutClick() {
+        Timber.d("logout button clicked")
+        Settings.setApiKeyAsync(this, null)
+        redirectToLogin()
+    }
+
     private fun redirectToLogin() {
         if (Settings.isLoggedIn(this)) {
             return
diff --git a/android/app/src/main/java/com/httpsms/Settings.kt b/android/app/src/main/java/com/httpsms/Settings.kt
@@ -80,7 +80,7 @@ object Settings {
         return getApiKey(context) ?: ""
     }
 
-    fun setApiKeyAsync(context: Context, apiKey: String) {
+    fun setApiKeyAsync(context: Context, apiKey: String?) {
         Timber.d(Settings::setApiKeyAsync.name)
 
         PreferenceManager.getDefaultSharedPreferences(context)
diff --git a/android/app/src/main/res/layout/activity_login.xml b/android/app/src/main/res/layout/activity_login.xml
@@ -92,7 +92,7 @@
             android:indeterminate="true"
             android:layout_marginTop="4dp"
             app:indicatorColor="@color/pink_500"
-            app:layout_constraintTop_toBottomOf="@+id/button"
+            app:layout_constraintTop_toBottomOf="@+id/loginButton"
             tools:layout_editor_absoluteX="16dp" />
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
@@ -80,6 +80,7 @@
     </LinearLayout>
 
     <com.google.android.material.button.MaterialButton
+        android:id="@+id/mainLogoutButton"
         style="@style/Widget.MaterialComponents.Button.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ object Settings {`
`80`	`80`	`return getApiKey(context) ?: ""`
`81`	`81`	`}`
`82`	`82`
`83`		`- fun setApiKeyAsync(context: Context, apiKey: String) {`
	`83`	`+ fun setApiKeyAsync(context: Context, apiKey: String?) {`
`84`	`84`	`Timber.d(Settings::setApiKeyAsync.name)`
`85`	`85`
`86`	`86`	`PreferenceManager.getDefaultSharedPreferences(context)`