Move logout and report bug to Setting screen

features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListScreen.kt

@@ -21,13 +21,10 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Velocity
-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.core.compose.LogCompositions
 import io.element.android.x.designsystem.ElementXTheme
-import io.element.android.x.designsystem.components.ProgressDialog
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.features.roomlist.components.RoomListTopBar
 import io.element.android.x.features.roomlist.components.RoomSummaryRow
@@ -42,17 +39,10 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 fun RoomListScreen(
     viewModel: RoomListViewModel = mavericksViewModel(),
-    onSuccessLogout: () -> Unit = { },
     onRoomClicked: (RoomId) -> Unit = { },
-    onOpenRageShake: () -> Unit = { },
     onOpenSettings: () -> Unit = { },
 ) {
-    val logoutAction by viewModel.collectAsState(RoomListViewState::logoutAction)
     val filter by viewModel.collectAsState(RoomListViewState::filter)
-    if (logoutAction is Success) {
-        onSuccessLogout()
-        return
-    }
     LogCompositions(tag = "RoomListScreen", msg = "Root")
     val roomSummaries by viewModel.collectAsState(RoomListViewState::rooms)
     val matrixUser by viewModel.collectAsState(RoomListViewState::user)
@@ -60,10 +50,7 @@ fun RoomListScreen(
         roomSummaries = roomSummaries().orEmpty().toImmutableList(),
         matrixUser = matrixUser(),
         onRoomClicked = onRoomClicked,
-        onLogoutClicked = viewModel::logout,
         onOpenSettings = onOpenSettings,
-        onOpenRageShake = onOpenRageShake,
-        isLoginOut = logoutAction is Loading,
         filter = filter,
         onFilterChanged = viewModel::filterRoom,
         onScrollOver = viewModel::updateVisibleRange
@@ -75,13 +62,10 @@ fun RoomListContent(
     roomSummaries: ImmutableList<RoomListRoomSummary>,
     matrixUser: MatrixUser?,
     filter: String,
-    isLoginOut: Boolean,
     modifier: Modifier = Modifier,
     onRoomClicked: (RoomId) -> Unit = {},
     onFilterChanged: (String) -> Unit = {},
-    onLogoutClicked: () -> Unit = {},
     onOpenSettings: () -> Unit = {},
-    onOpenRageShake: () -> Unit = { },
     onScrollOver: (IntRange) -> Unit = {},
 ) {
     fun onRoomClicked(room: RoomListRoomSummary) {
@@ -118,9 +102,7 @@ fun RoomListContent(
                 matrixUser = matrixUser,
                 filter = filter,
                 onFilterChanged = onFilterChanged,
-                onLogoutClicked = onLogoutClicked,
                 onOpenSettings = onOpenSettings,
-                onOpenRageShake = onOpenRageShake,
                 scrollBehavior = scrollBehavior
             )
         },
@@ -142,9 +124,6 @@ fun RoomListContent(
             }
         }
     )
-    if (isLoginOut) {
-        ProgressDialog(text = "Login out...")
-    }
 }
 
 private fun RoomListRoomSummary.contentType() = isPlaceholder
@@ -161,10 +140,8 @@ fun PreviewableRoomListContent() {
             roomSummaries = stubbedRoomSummaries(),
             matrixUser = MatrixUser("User#1", avatarData = AvatarData("U")),
             onRoomClicked = {},
-            onLogoutClicked = {},
             filter = "filter",
             onFilterChanged = {},
-            isLoginOut = false,
             onScrollOver = {}
         )
     }
@@ -178,10 +155,8 @@ fun PreviewableDarkRoomListContent() {
             roomSummaries = stubbedRoomSummaries(),
             matrixUser = MatrixUser("User#1", avatarData = AvatarData("U")),
             onRoomClicked = {},
-            onLogoutClicked = {},
             filter = "filter",
             onFilterChanged = {},
-            isLoginOut = true,
             onScrollOver = {}
         )
     }

features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListViewModel.kt

@@ -20,7 +20,6 @@ import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.media.MediaResolver
 import io.element.android.x.matrix.room.RoomSummary
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
@@ -33,8 +32,7 @@ private const val extendedRangeSize = 40
 class RoomListViewModel @AssistedInject constructor(
     private val client: MatrixClient,
     @Assisted initialState: RoomListViewState
-) :
-    MavericksViewModel<RoomListViewState>(initialState) {
+) : MavericksViewModel<RoomListViewState>(initialState) {
 
     companion object : MavericksViewModelFactory<RoomListViewModel, RoomListViewState> by daggerMavericksViewModelFactory()
 
@@ -44,17 +42,6 @@ class RoomListViewModel @AssistedInject constructor(
         handleInit()
     }
 
-    fun logout() {
-        viewModelScope.launch {
-            suspend {
-                delay(2000)
-                client.logout()
-            }.execute {
-                copy(logoutAction = it)
-            }
-        }
-    }
-
     fun filterRoom(filter: String) {
         setState {
             copy(

features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt

@@ -7,9 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Logout
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -34,25 +32,20 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.designsystem.components.avatar.Avatar
-import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.features.roomlist.model.MatrixUser
-import io.element.android.x.element.resources.R as ElementR
 
 @Composable
 fun RoomListTopBar(
     matrixUser: MatrixUser?,
     filter: String,
     onFilterChanged: (String) -> Unit,
-    onLogoutClicked: () -> Unit,
     onOpenSettings: () -> Unit,
-    onOpenRageShake: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior
 ) {
     LogCompositions(tag = "RoomListScreen", msg = "TopBar")
@@ -77,9 +70,7 @@ fun RoomListTopBar(
     } else {
         DefaultRoomListTopBar(
             matrixUser = matrixUser,
-            onLogoutClicked = onLogoutClicked,
             onOpenSettings = onOpenSettings,
-            onOpenRageShake = onOpenRageShake,
             onSearchClicked = {
                 searchWidgetStateIsOpened = true
             },
@@ -168,13 +159,10 @@ fun SearchRoomListTopBar(
 @Composable
 private fun DefaultRoomListTopBar(
     matrixUser: MatrixUser?,
-    onLogoutClicked: () -> Unit,
-    onOpenRageShake: () -> Unit,
     onOpenSettings: () -> Unit,
     onSearchClicked: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior
 ) {
-    val openDialog = remember { mutableStateOf(false) }
     MediumTopAppBar(
         modifier = Modifier
             .nestedScroll(scrollBehavior.nestedScrollConnection),
@@ -197,16 +185,6 @@ private fun DefaultRoomListTopBar(
             ) {
                 Icon(Icons.Default.Search, contentDescription = "search")
             }
-            IconButton(
-                onClick = onOpenRageShake
-            ) {
-                Icon(Icons.Default.BugReport, contentDescription = stringResource(id = ElementR.string.send_bug_report))
-            }
-            IconButton(
-                onClick = { openDialog.value = true }
-            ) {
-                Icon(Icons.Default.Logout, contentDescription = "logout")
-            }
             IconButton(
                 onClick = onOpenSettings
             ) {
@@ -215,19 +193,4 @@ private fun DefaultRoomListTopBar(
         },
         scrollBehavior = scrollBehavior,
     )
-    // Log out confirmation dialog
-    if (openDialog.value) {
-        ConfirmationDialog(
-            title = "Log out",
-            content = "Do you confirm you want to log out?",
-            submitText = "Log out",
-            onSubmitClicked = {
-                openDialog.value = false
-                onLogoutClicked()
-            },
-            onDismiss = {
-                openDialog.value = false
-            }
-        )
-    }
 }

features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListViewState.kt

@@ -11,6 +11,5 @@ data class RoomListViewState(
     val rooms: Async<List<RoomListRoomSummary>> = Uninitialized,
     val filter: String = "",
     val canLoadMore: Boolean = false,
-    val logoutAction: Async<Unit> = Uninitialized,
     val roomsById: Map<RoomId, RoomListRoomSummary> = emptyMap()
 ) : MavericksState