Move signout button from overflow to profile activity

Author: MarkNjunge

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

@@ -68,7 +68,7 @@ val viewModelModule = module {
     viewModel { SignInViewModel(get(), get(), get()) }
     viewModel { CompleteSignUpViewModel(get(), get()) }
     viewModel { SignUpViewModel(get(), get(), get()) }
-    viewModel { ProfileViewModel(get()) }
+    viewModel { ProfileViewModel(get(), get()) }
     viewModel { AddressBookViewModel(get()) }
     viewModel { CheckoutViewModel(get(), get(), get(), get()) }
     viewModel { OrdersViewModel(get()) }

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

@@ -4,26 +4,17 @@ import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.marknjunge.core.data.local.PreferencesRepository
-import com.marknjunge.core.data.model.Resource
-import com.marknjunge.core.data.repository.AuthRepository
 import com.marknkamau.justjava.R
 import com.marknkamau.justjava.ui.about.AboutActivity
 import com.marknkamau.justjava.ui.cart.CartActivity
 import com.marknkamau.justjava.ui.login.SignInActivity
 import com.marknkamau.justjava.ui.profile.ProfileActivity
-import com.marknkamau.justjava.utils.toast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 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 coroutineScope by lazy { CoroutineScope(Dispatchers.Main) }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
@@ -40,7 +31,6 @@ abstract class BaseActivity : AppCompatActivity() {
             menu?.findItem(R.id.menu_profile)?.isVisible = false
         }
 
-        menu?.findItem(R.id.menu_logout)?.isVisible = preferencesRepository.isSignedIn
         return true
     }
 
@@ -58,10 +48,6 @@ abstract class BaseActivity : AppCompatActivity() {
                 }
                 return true
             }
-            R.id.menu_logout -> {
-                logout()
-                return true
-            }
             R.id.menu_about -> {
                 startActivity(Intent(this, AboutActivity::class.java))
                 return true
@@ -70,20 +56,4 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    private fun logout() {
-        coroutineScope.launch {
-            when (val resource = authRepository.signOut()) {
-                is Resource.Success -> {
-                    // If this is ProfileActivity, leave it
-                    (this@BaseActivity as? ProfileActivity)?.finish()
-                    toast("Logged out")
-
-                    invalidateOptionsMenu()
-                }
-                is Resource.Failure -> toast(resource.message)
-            }
-
-        }
-    }
-
 }

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

@@ -52,6 +52,9 @@ class ProfileActivity : BaseActivity() {
         llOrders.setOnClickListener {
             startActivity(Intent(this, OrdersActivity::class.java))
         }
+        btnLogout.setOnClickListener {
+            signOut()
+        }
         btnDeleteAccount.setOnClickListener {
             AlertDialog.Builder(this)
                 .setTitle("Delete account")
@@ -123,6 +126,20 @@ class ProfileActivity : BaseActivity() {
         })
     }
 
+    private fun signOut() {
+        profileViewModel.signOut().observe(this, Observer { resource ->
+            when (resource) {
+                is Resource.Success -> {
+                    invalidateOptionsMenu()
+                    finish()
+                }
+                is Resource.Failure -> {
+                    toast(resource.message)
+                }
+            }
+        })
+    }
+
     private fun deleteAccount() {
         profileViewModel.deleteAccount().observe(this, Observer { resource ->
             when (resource) {

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

@@ -6,11 +6,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.marknjunge.core.data.model.Resource
 import com.marknjunge.core.data.model.User
+import com.marknjunge.core.data.repository.AuthRepository
 import com.marknjunge.core.data.repository.UsersRepository
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-class ProfileViewModel(private val usersRepository: UsersRepository) : ViewModel() {
+class ProfileViewModel(private val usersRepository: UsersRepository,private val authRepository: AuthRepository) : ViewModel() {
     private val _loading = MutableLiveData<Boolean>()
     val loading: LiveData<Boolean> = _loading
 
@@ -37,6 +38,18 @@ class ProfileViewModel(private val usersRepository: UsersRepository) : ViewModel
         return livedata
     }
 
+    fun signOut():LiveData<Resource<Unit>>{
+        val livedata = MutableLiveData<Resource<Unit>>()
+
+        viewModelScope.launch {
+            _loading.value = true
+            livedata.value = authRepository.signOut()
+            _loading.value = false
+        }
+
+        return livedata
+    }
+
     fun deleteAccount():LiveData<Resource<Unit>>{
         val livedata = MutableLiveData<Resource<Unit>>()
 

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

@@ -241,15 +241,32 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/llOrders" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnLogout"
+        style="@style/AppTheme.Button.OutlinedAccent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="Sign out"
+        app:layout_constraintEnd_toStartOf="@+id/btnDeleteAccount"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view5" />
+
     <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:layout_marginEnd="32dp"
         android:text="Delete Account"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/btnLogout"
         app:layout_constraintTop_toBottomOf="@+id/view5" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/overflow_menu.xml

@@ -12,10 +12,6 @@
         android:icon="@drawable/ic_profile_light"
         android:title="@string/profile"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/menu_logout"
-        android:title="@string/logout"
-        app:showAsAction="never" />
     <item
         android:id="@+id/menu_about"
         android:title="@string/about" />