Merge pull request #15 from mrtry/feature/logout

Feature/logout

Author: mrtry

app/src/main/java/io/github/mrtry/todolist/app/splash/ui/SplashActivity.kt

@@ -1,5 +1,6 @@
 package io.github.mrtry.todolist.app.splash.ui
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -17,6 +18,10 @@ import io.github.mrtry.todolist.misc.ui.binding.Bindable
 import javax.inject.Inject
 
 class SplashActivity : AppCompatActivity(), Injectable<LoginComponent>, Bindable<ActivitySplashBinding> {
+    companion object {
+        fun createIntent(context: Context): Intent =
+            Intent(context, SplashActivity::class.java)
+    }
 
     @Inject
     internal lateinit var viewModel: SplashViewModel

app/src/main/java/io/github/mrtry/todolist/app/todo/ui/ToDoActivity.kt

@@ -3,12 +3,16 @@ package io.github.mrtry.todolist.app.todo.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.github.mrtry.todolist.MainApplication
 import io.github.mrtry.todolist.R
 import io.github.mrtry.todolist.app.todo.ui.adapter.ToDoAdapter
+import io.github.mrtry.todolist.app.todo.ui.menu.ToDoMenuAction
 import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
 import io.github.mrtry.todolist.app.todo.viewmodel.ToDoViewModel
 import io.github.mrtry.todolist.databinding.ActivityToDoBinding
@@ -67,6 +71,17 @@ class ToDoActivity : AppCompatActivity(), Injectable<ToDoComponent>, Bindable<Ac
         viewModel.load()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        val inflater: MenuInflater = menuInflater
+        inflater.inflate(R.menu.menu_activity_to_do, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = ToDoMenuAction
+        .valueOf(item.itemId)
+        .getActionHandler(component)
+        .handleAction() || super.onOptionsItemSelected(item)
+
     override fun onStop() {
         super.onStop()
         coroutineScope.coroutineContext.cancelChildren()

app/src/main/java/io/github/mrtry/todolist/app/todo/ui/menu/ToDoMenuAction.kt

@@ -0,0 +1,17 @@
+package io.github.mrtry.todolist.app.todo.ui.menu
+
+import io.github.mrtry.todolist.R
+import io.github.mrtry.todolist.di.component.ToDoComponent
+import io.github.mrtry.todolist.misc.ui.menu.MenuAction
+
+enum class ToDoMenuAction(override val menuId: Int) : MenuAction<ToDoMenuActionHandler, ToDoComponent> {
+    LOGOUT(R.id.menu_logout) {
+        override fun getActionHandler(component: ToDoComponent): ToDoMenuActionHandler =
+            component.toDoMenuLogoutActionHandler
+    };
+
+    companion object {
+        fun valueOf(menuId: Int) =
+            values().first { it.menuId == menuId }
+    }
+}

app/src/main/java/io/github/mrtry/todolist/app/todo/ui/menu/ToDoMenuActionHandler.kt

@@ -0,0 +1,5 @@
+package io.github.mrtry.todolist.app.todo.ui.menu
+
+import io.github.mrtry.todolist.misc.ui.menu.ActionHandler
+
+interface ToDoMenuActionHandler : ActionHandler

app/src/main/java/io/github/mrtry/todolist/app/todo/ui/menu/ToDoMenuLogoutActionHandler.kt

@@ -0,0 +1,21 @@
+package io.github.mrtry.todolist.app.todo.ui.menu
+
+import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
+import io.github.mrtry.todolist.auth.repository.AccountRepository
+import io.github.mrtry.todolist.di.scope.ActivityScope
+import javax.inject.Inject
+
+@ActivityScope
+class ToDoMenuLogoutActionHandler
+@Inject constructor(
+    private val repository: AccountRepository,
+    private val navigator: ToDoNavigator
+) : ToDoMenuActionHandler {
+    override fun handleAction(): Boolean {
+        navigator.showLogoutAlert() {
+            repository.logout()
+            navigator.navigateToSplash()
+        }
+        return true
+    }
+}

app/src/main/java/io/github/mrtry/todolist/app/todo/ui/navigator/ToDoNavigator.kt

@@ -1,6 +1,8 @@
 package io.github.mrtry.todolist.app.todo.ui.navigator
 
 import android.app.Activity
+import io.github.mrtry.todolist.R
+import io.github.mrtry.todolist.app.splash.ui.SplashActivity
 import io.github.mrtry.todolist.di.scope.ActivityScope
 import io.github.mrtry.todolist.misc.ui.navigator.AbsNavigator
 import javax.inject.Inject
@@ -9,4 +11,19 @@ import javax.inject.Inject
 class ToDoNavigator
 @Inject constructor(
     private val activity: Activity
-) : AbsNavigator(activity)
+) : AbsNavigator(activity) {
+    fun navigateToSplash() {
+        val intent = SplashActivity.createIntent(activity)
+        activity.startActivity(intent)
+        finishCurrentActivity()
+    }
+
+    fun showLogoutAlert(func: () -> Unit) {
+        showAlert(
+            R.string.to_do_activity_alert_logout,
+            android.R.string.ok,
+            { _, _ -> func() },
+            android.R.string.cancel
+        )
+    }
+}

app/src/main/java/io/github/mrtry/todolist/auth/repository/AccountRepository.kt

@@ -10,4 +10,6 @@ class AccountRepository
     private val firebaseAuth = FirebaseAuth.getInstance()
 
     fun isLoggedIn() = firebaseAuth.currentUser != null
+
+    fun logout() = firebaseAuth.signOut()
 }

app/src/main/java/io/github/mrtry/todolist/di/component/ToDoComponent.kt

@@ -2,6 +2,7 @@ package io.github.mrtry.todolist.di.component
 
 import dagger.Subcomponent
 import io.github.mrtry.todolist.app.todo.ui.ToDoActivity
+import io.github.mrtry.todolist.app.todo.ui.menu.ToDoMenuLogoutActionHandler
 import io.github.mrtry.todolist.di.module.ActivityModule
 import io.github.mrtry.todolist.di.scope.ActivityScope
 
@@ -10,4 +11,6 @@ import io.github.mrtry.todolist.di.scope.ActivityScope
 interface ToDoComponent : Component {
 
     fun inject(activity: ToDoActivity)
+
+    val toDoMenuLogoutActionHandler: ToDoMenuLogoutActionHandler
 }

app/src/main/java/io/github/mrtry/todolist/misc/ui/menu/ActionHandler.kt

@@ -0,0 +1,5 @@
+package io.github.mrtry.todolist.misc.ui.menu
+
+interface ActionHandler {
+    fun handleAction(): Boolean
+}

app/src/main/java/io/github/mrtry/todolist/misc/ui/menu/MenuAction.kt

@@ -0,0 +1,6 @@
+package io.github.mrtry.todolist.misc.ui.menu
+
+interface MenuAction<T : ActionHandler, C> {
+    val menuId: Int
+    fun getActionHandler(component: C): T
+}

app/src/main/java/io/github/mrtry/todolist/misc/ui/navigator/AbsNavigator.kt

@@ -1,10 +1,12 @@
 package io.github.mrtry.todolist.misc.ui.navigator
 
 import android.app.Activity
+import android.content.DialogInterface
 import android.content.Intent
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.databinding.ViewDataBinding
 import com.google.android.material.snackbar.Snackbar
 import io.github.mrtry.todolist.misc.ui.binding.Bindable
@@ -36,6 +38,22 @@ abstract class AbsNavigator(private val activity: Activity) {
         activity.finish()
     }
 
+    fun showAlert(
+        @StringRes messageId: Int,
+        @StringRes positiveLabel: Int = android.R.string.ok,
+        action: ((DialogInterface, Int) -> Unit)? = null,
+        @StringRes negativeLabel: Int = android.R.string.cancel,
+        negativeAction: ((DialogInterface, Int) -> Unit)? = null,
+        cancelable: Boolean = true
+    ) {
+        AlertDialog.Builder(activity)
+            .setMessage(activity.getString(messageId))
+            .setCancelable(cancelable)
+            .setPositiveButton(positiveLabel, action)
+            .setNegativeButton(negativeLabel, negativeAction)
+            .show()
+    }
+
     open fun showSnackBar(
         @StringRes messageId: Int, length: Int = Snackbar.LENGTH_SHORT
     ) {

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_logout"
+        android:title="@string/to_do_activity_menu_title_account_logout" />
+</menu>

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

@@ -4,4 +4,6 @@
     <string name="to_do_activity_error_add_task_failed">登録に失敗しました。再度お試しください。</string>
     <string name="to_do_activity_error_update_task_failed">更新に失敗しました。再度お試しください。</string>
     <string name="to_do_activity_error_get_task_failed">取得に失敗しました。再度お試しください。</string>
+    <string name="to_do_activity_menu_title_account_logout">ログアウト</string>
+    <string name="to_do_activity_alert_logout">ログアウトしますか？</string>
 </resources>

app/src/test/java/io/github/mrtry/todolist/app/todo/ui/menu/ToDoMenuLogoutActionHandlerTest.kt

@@ -0,0 +1,32 @@
+package io.github.mrtry.todolist.app.todo.ui.menu
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import io.github.mrtry.todolist.app.todo.ui.navigator.ToDoNavigator
+import org.junit.Before
+import org.junit.Test
+
+class ToDoMenuLogoutActionHandlerTest {
+    lateinit var actionHandler: ToDoMenuLogoutActionHandler
+
+    lateinit var mockNavigator: ToDoNavigator
+
+    @Before
+    fun setUp() {
+        mockNavigator = mock()
+
+        actionHandler = ToDoMenuLogoutActionHandler(
+            mock(),
+            mockNavigator
+        )
+    }
+
+    @Test
+    fun handleAction() {
+        actionHandler.handleAction()
+
+        verify(mockNavigator, times(1)).showLogoutAlert(any())
+    }
+}