Move logout and report bug to Setting screen

features/logout/src/androidTest/java/io/element/android/x/features/logout/ExampleInstrumentedTest.kt

@@ -0,0 +1,22 @@
+package io.element.android.x.features.logout
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
+    }
+}

features/logout/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>

features/logout/src/main/java/io/element/android/x/features/logout/LogoutScreen.kt

@@ -0,0 +1,84 @@
+package io.element.android.x.features.logout
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Logout
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.designsystem.ElementXTheme
+import io.element.android.x.designsystem.components.ProgressDialog
+import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.x.designsystem.components.preferences.PreferenceCategory
+import io.element.android.x.designsystem.components.preferences.PreferenceText
+import io.element.android.x.element.resources.R as ElementR
+
+@Composable
+fun LogoutPreference(
+    viewModel: LogoutViewModel = mavericksViewModel(),
+    onSuccessLogout: () -> Unit = { },
+) {
+    val state: LogoutViewState by viewModel.collectAsState()
+    if (state.logoutAction is Success) {
+        onSuccessLogout()
+        return
+    }
+
+    val openDialog = remember { mutableStateOf(false) }
+
+    LogoutPreferenceContent(
+        onClick = {
+            openDialog.value = true
+        }
+    )
+
+    // Log out confirmation dialog
+    if (openDialog.value) {
+        ConfirmationDialog(
+            title = stringResource(id = ElementR.string.action_sign_out),
+            content = stringResource(id = ElementR.string.action_sign_out_confirmation_simple),
+            submitText = stringResource(id = ElementR.string.action_sign_out),
+            onCancelClicked = {
+                openDialog.value = false
+            },
+            onSubmitClicked = {
+                openDialog.value = false
+                viewModel.logout()
+            },
+            onDismiss = {
+                openDialog.value = false
+            }
+        )
+    }
+
+    if (state.logoutAction is Loading) {
+        ProgressDialog(text = "Login out...")
+    }
+}
+
+@Composable
+fun LogoutPreferenceContent(
+    onClick: () -> Unit = {},
+) {
+    PreferenceCategory(title = stringResource(id = ElementR.string.settings_general_title)) {
+        PreferenceText(
+            title = stringResource(id = ElementR.string.action_sign_out),
+            icon = Icons.Default.Logout,
+            onClick = onClick
+        )
+    }
+}
+
+@Composable
+@Preview
+fun LogoutContentPreview() {
+    ElementXTheme(darkTheme = false) {
+        LogoutPreference()
+    }
+}

features/logout/src/main/java/io/element/android/x/features/logout/LogoutViewModel.kt

@@ -0,0 +1,30 @@
+package io.element.android.x.features.logout
+
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.core.di.daggerMavericksViewModelFactory
+import io.element.android.x.di.SessionScope
+import io.element.android.x.matrix.MatrixClient
+import kotlinx.coroutines.launch
+
+@ContributesViewModel(SessionScope::class)
+class LogoutViewModel @AssistedInject constructor(
+    private val client: MatrixClient,
+    @Assisted initialState: LogoutViewState
+) : MavericksViewModel<LogoutViewState>(initialState) {
+
+    companion object : MavericksViewModelFactory<LogoutViewModel, LogoutViewState> by daggerMavericksViewModelFactory()
+
+    fun logout() {
+        viewModelScope.launch {
+            suspend {
+                client.logout()
+            }.execute {
+                copy(logoutAction = it)
+            }
+        }
+    }
+}

features/logout/src/main/java/io/element/android/x/features/logout/LogoutViewState.kt

@@ -0,0 +1,9 @@
+package io.element.android.x.features.logout
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+
+data class LogoutViewState(
+    val logoutAction: Async<Unit> = Uninitialized,
+) : MavericksState

features/logout/src/test/java/io/element/android/x/features/logout/ExampleUnitTest.kt

@@ -0,0 +1,16 @@
+package io.element.android.x.features.logout
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}