Add delete account feature

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/data/network/GoogleSignInClientStub.kt

@@ -0,0 +1,11 @@
+package com.marknkamau.justjava.data.network
+
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
+import com.marknjunge.core.data.network.GoogleSignInClientStub
+import kotlinx.coroutines.tasks.await
+
+class GoogleSignInClientStubImpl(private val googleSignInClient: GoogleSignInClient) : GoogleSignInClientStub {
+    override suspend fun signOut() {
+        googleSignInClient.signOut().await()
+    }
+}

app/src/main/java/com/marknkamau/justjava/di/Modules.kt

@@ -5,12 +5,14 @@ import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.marknjunge.core.data.local.PreferencesRepository
+import com.marknjunge.core.data.network.GoogleSignInClientStub
 import com.marknkamau.justjava.BuildConfig
 import com.marknkamau.justjava.data.db.AppDatabase
 import com.marknkamau.justjava.data.db.DbRepository
 import com.marknkamau.justjava.data.db.DbRepositoryImpl
 import com.marknkamau.justjava.data.network.AppFirebaseService
 import com.marknkamau.justjava.data.network.FirebaseService
+import com.marknkamau.justjava.data.network.GoogleSignInClientStubImpl
 import com.marknkamau.justjava.data.preferences.PreferencesRepositoryImpl
 import com.marknkamau.justjava.ui.addressBook.AddressBookViewModel
 import com.marknkamau.justjava.ui.cart.CartViewModel
@@ -44,6 +46,8 @@ val appModule = module {
         GoogleSignIn.getClient(androidContext(), gso)
     }
 
+    single<GoogleSignInClientStub> { GoogleSignInClientStubImpl(get()) }
+
     single<FirebaseService> { AppFirebaseService() }
 }
 

app/src/main/java/com/marknkamau/justjava/ui/BaseActivity.kt

@@ -17,14 +17,12 @@ import com.marknkamau.justjava.utils.toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
 import org.koin.android.ext.android.inject
 
 abstract class BaseActivity : AppCompatActivity() {
 
     private val authRepository: AuthRepository by inject()
     private val preferencesRepository: PreferencesRepository by inject()
-    private val googleSignInClient: GoogleSignInClient by inject()
     private val coroutineScope by lazy { CoroutineScope(Dispatchers.Main) }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -73,15 +71,9 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     private fun logout() {
-        val signedInWithGoogle = preferencesRepository.user!!.signInMethod == "GOOGLE"
-
         coroutineScope.launch {
             when (val resource = authRepository.signOut()) {
                 is Resource.Success -> {
-                    if (signedInWithGoogle) {
-                        googleSignInClient.signOut().await()
-                    }
-
                     // If this is ProfileActivity, leave it
                     (this@BaseActivity as? ProfileActivity)?.finish()
                     toast("Logged out")

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileActivity.kt

@@ -3,6 +3,7 @@ package com.marknkamau.justjava.ui.profile
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
 import androidx.transition.TransitionManager
 import com.marknjunge.core.data.model.Resource
@@ -51,6 +52,14 @@ class ProfileActivity : BaseActivity() {
         llOrders.setOnClickListener {
             startActivity(Intent(this, OrdersActivity::class.java))
         }
+        btnDeleteAccount.setOnClickListener {
+            AlertDialog.Builder(this)
+                .setTitle("Delete account")
+                .setMessage("Are you sure you want to delete your account?")
+                .setPositiveButton("Delete") { _, _ -> deleteAccount() }
+                .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+                .show()
+        }
 
         profileViewModel.getCurrentUser()
     }
@@ -114,6 +123,19 @@ class ProfileActivity : BaseActivity() {
         })
     }
 
+    private fun deleteAccount() {
+        profileViewModel.deleteAccount().observe(this, Observer { resource ->
+            when (resource) {
+                is Resource.Success -> {
+                    finish()
+                }
+                is Resource.Failure -> {
+                    toast(resource.message)
+                }
+            }
+        })
+    }
+
     private fun isValid(): Boolean {
         var valid = true
 

app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileViewModel.kt

@@ -36,4 +36,16 @@ class ProfileViewModel(private val usersRepository: UsersRepository) : ViewModel
 
         return livedata
     }
+
+    fun deleteAccount():LiveData<Resource<Unit>>{
+        val livedata = MutableLiveData<Resource<Unit>>()
+
+        viewModelScope.launch {
+            _loading.value = true
+            livedata.value = usersRepository.deleteUser()
+            _loading.value = false
+        }
+
+        return livedata
+    }
 }

app/src/main/res/layout/activity_profile.xml

@@ -241,4 +241,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/llOrders" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnDeleteAccount"
+        style="@style/AppTheme.Button.Danger"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Delete Account"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view5" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -9,4 +9,5 @@
     <color name="colorTextTertiary">#E0E0E0</color>
     <color name="colorDisabled">#CCCCCC</color>
     <color name="colorDisabledText">#888888</color>
+    <color name="colorDanger">#E53E3E</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -106,6 +106,12 @@
         <item name="android:textColor">@color/color_states_button</item>
     </style>
 
+    <style name="AppTheme.Button.Danger" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="strokeColor">@color/colorDanger</item>
+        <item name="android:textColor">@color/colorDanger</item>
+        <item name="rippleColor">@color/colorDanger</item>
+    </style>
+
     <style name="AppTheme.InputField" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
     </style>

core/src/main/java/com/marknjunge/core/data/model/User.kt

@@ -29,6 +29,7 @@ data class User(
     @SerialName("fcmToken")
     val fcmToken: String?,
 
+    // TODO Use enum
     @SerialName("signInMethod")
     val signInMethod: String,
 

core/src/main/java/com/marknjunge/core/data/network/GoogleSignInClientStub.kt

@@ -0,0 +1,5 @@
+package com.marknjunge.core.data.network
+
+interface GoogleSignInClientStub {
+    suspend fun signOut()
+}