Room list contextual menu (#427)

- Adds `ModalBottomSheet` to our design components (it wraps the homonimous Material3 one).
- Adds  a bottom sheet to the Room list using the aforementioned design component.
- Adds navigation from the room list to a room detail (context menu "Settings" action).
- Consolidates the "leave room flow" into a new `leaveroom` module used by both the room list and the room details.
  - Adds progress indicator to the leave room flow
- Uses new `leaveroom` module in `roomdetails` module too. 

Parent issue:
- https://github.com/vector-im/element-x-android/issues/261

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsEvent.kt

@@ -17,7 +17,5 @@
 package io.element.android.features.roomdetails.impl
 
 sealed interface RoomDetailsEvent {
-    data class LeaveRoom(val needsConfirmation: Boolean) : RoomDetailsEvent
-    object ClearLeaveRoomWarning : RoomDetailsEvent
-    object ClearError : RoomDetailsEvent
+    object LeaveRoom : RoomDetailsEvent
 }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt

@@ -18,44 +18,33 @@ package io.element.android.features.roomdetails.impl
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import io.element.android.features.leaveroom.api.LeaveRoomEvent
+import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class RoomDetailsPresenter @Inject constructor(
     private val room: MatrixRoom,
-    private val roomMembershipObserver: RoomMembershipObserver,
-    private val coroutineDispatchers: CoroutineDispatchers,
     private val roomMembersDetailsPresenterFactory: RoomMemberDetailsPresenter.Factory,
+    private val leaveRoomPresenter: LeaveRoomPresenter,
 ) : Presenter<RoomDetailsState> {
 
     @Composable
     override fun present(): RoomDetailsState {
-        val coroutineScope = rememberCoroutineScope()
-        val leaveRoomWarning = remember {
-            mutableStateOf<LeaveRoomWarning?>(null)
-        }
-        val error = remember {
-            mutableStateOf<RoomDetailsError?>(null)
-        }
+        val leaveRoomState = leaveRoomPresenter.present()
         LaunchedEffect(Unit) {
             room.updateMembers()
         }
@@ -69,16 +58,8 @@ class RoomDetailsPresenter @Inject constructor(
 
         fun handleEvents(event: RoomDetailsEvent) {
             when (event) {
-                is RoomDetailsEvent.LeaveRoom -> {
-                    coroutineScope.leaveRoom(
-                        needsConfirmation = event.needsConfirmation,
-                        memberCount = memberCount,
-                        leaveRoomWarning = leaveRoomWarning,
-                        error = error,
-                    )
-                }
-                RoomDetailsEvent.ClearLeaveRoomWarning -> leaveRoomWarning.value = null
-                RoomDetailsEvent.ClearError -> error.value = null
+                is RoomDetailsEvent.LeaveRoom ->
+                    leaveRoomState.eventSink(LeaveRoomEvent.ShowConfirmation(room.roomId))
             }
         }
 
@@ -93,10 +74,9 @@ class RoomDetailsPresenter @Inject constructor(
             memberCount = memberCount,
             isEncrypted = room.isEncrypted,
             canInvite = canInvite,
-            displayLeaveRoomWarning = leaveRoomWarning.value,
-            error = error.value,
             roomType = roomType.value,
             roomMemberDetailsState = roomMemberDetailsState,
+            leaveRoomState = leaveRoomState,
             eventSink = ::handleEvents,
         )
     }
@@ -141,27 +121,4 @@ class RoomDetailsPresenter @Inject constructor(
             }
         }
     }
-
-    private fun CoroutineScope.leaveRoom(
-        needsConfirmation: Boolean,
-        memberCount: Async<Int>,
-        leaveRoomWarning: MutableState<LeaveRoomWarning?>,
-        error: MutableState<RoomDetailsError?>,
-    ) = launch(coroutineDispatchers.io) {
-        if (needsConfirmation) {
-            leaveRoomWarning.value = LeaveRoomWarning.computeLeaveRoomWarning(room.isPublic, memberCount)
-        } else {
-            room.leave()
-                .onSuccess {
-                    roomMembershipObserver.notifyUserLeftRoom(room.roomId)
-                }.onFailure {
-                    error.value = RoomDetailsError.AlertGeneric
-                }
-            leaveRoomWarning.value = null
-        }
-    }
 }
-
-
-
-

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt

@@ -16,6 +16,7 @@
 
 package io.element.android.features.roomdetails.impl
 
+import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -28,11 +29,10 @@ data class RoomDetailsState(
     val roomTopic: String?,
     val memberCount: Async<Int>,
     val isEncrypted: Boolean,
-    val displayLeaveRoomWarning: LeaveRoomWarning?,
-    val error: RoomDetailsError?,
     val roomType: RoomDetailsType,
     val roomMemberDetailsState: RoomMemberDetailsState?,
     val canInvite: Boolean,
+    val leaveRoomState: LeaveRoomState,
     val eventSink: (RoomDetailsEvent) -> Unit
 )
 
@@ -40,23 +40,3 @@ sealed interface RoomDetailsType {
     object Room : RoomDetailsType
     data class Dm(val roomMember: RoomMember) : RoomDetailsType
 }
-
-sealed class LeaveRoomWarning {
-    object Generic : LeaveRoomWarning()
-    object PrivateRoom : LeaveRoomWarning()
-    object LastUserInRoom : LeaveRoomWarning()
-
-    companion object {
-        fun computeLeaveRoomWarning(isPublic: Boolean, memberCount: Async<Int>): LeaveRoomWarning {
-            return when {
-                !isPublic -> PrivateRoom
-                (memberCount as? Async.Success<Int>)?.state == 1 -> LastUserInRoom
-                else -> Generic
-            }
-        }
-    }
-}
-
-sealed interface RoomDetailsError {
-    object AlertGeneric : RoomDetailsError
-}

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt

@@ -17,6 +17,7 @@
 package io.element.android.features.roomdetails.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.roomdetails.impl.members.details.aRoomMemberDetailsState
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.api.core.UserId
@@ -70,11 +71,10 @@ fun aRoomDetailsState() = RoomDetailsState(
         "|| MAI iki/Marketing...",
     memberCount = Async.Success(32),
     isEncrypted = true,
-    displayLeaveRoomWarning = null,
-    error = null,
     canInvite = false,
     roomType = RoomDetailsType.Room,
     roomMemberDetailsState = null,
+    leaveRoomState = LeaveRoomState(),
     eventSink = {}
 )
 

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

@@ -47,6 +47,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.features.roomdetails.impl.blockuser.BlockUserDialogs
 import io.element.android.features.roomdetails.impl.blockuser.BlockUserSection
+import io.element.android.features.leaveroom.api.LeaveRoomView
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberHeaderSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberMainActionsSection
 import io.element.android.libraries.architecture.isLoading
@@ -56,8 +57,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.button.MainActionButton
-import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
-import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
 import io.element.android.libraries.designsystem.components.preferences.PreferenceText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@@ -68,7 +67,6 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.ui.strings.R as StringR
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
@@ -97,6 +95,8 @@ fun RoomDetailsView(
             .consumeWindowInsets(padding)
             .verticalScroll(rememberScrollState())
         ) {
+            LeaveRoomView(state = state.leaveRoomState)
+
             when (state.roomType) {
                 RoomDetailsType.Room -> {
                     RoomHeaderSection(
@@ -145,23 +145,8 @@ fun RoomDetailsView(
             }
 
             OtherActionsSection(onLeaveRoom = {
-                state.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
+                state.eventSink(RoomDetailsEvent.LeaveRoom)
             })
-
-            if (state.displayLeaveRoomWarning != null) {
-                ConfirmLeaveRoomDialog(
-                    leaveRoomWarning = state.displayLeaveRoomWarning,
-                    onConfirmLeave = { state.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = false)) },
-                    onDismiss = { state.eventSink(RoomDetailsEvent.ClearLeaveRoomWarning) }
-                )
-            }
-
-            if (state.error != null) {
-                ErrorDialog(
-                    content = stringResource(StringR.string.error_unknown),
-                    onDismiss = { state.eventSink(RoomDetailsEvent.ClearError) }
-                )
-            }
         }
     }
 }
@@ -260,27 +245,6 @@ internal fun OtherActionsSection(onLeaveRoom: () -> Unit, modifier: Modifier = M
     }
 }
 
-@Composable
-internal fun ConfirmLeaveRoomDialog(
-    leaveRoomWarning: LeaveRoomWarning,
-    onConfirmLeave: () -> Unit,
-    onDismiss: () -> Unit
-) {
-    val content = stringResource(
-            when (leaveRoomWarning) {
-            LeaveRoomWarning.PrivateRoom -> StringR.string.leave_room_alert_private_subtitle
-            LeaveRoomWarning.LastUserInRoom -> StringR.string.leave_room_alert_empty_subtitle
-            LeaveRoomWarning.Generic -> StringR.string.leave_room_alert_subtitle
-        }
-    )
-    ConfirmationDialog(
-        content = content,
-        submitText = stringResource(StringR.string.action_leave),
-        onSubmitClicked = onConfirmLeave,
-        onDismiss = onDismiss,
-    )
-}
-
 @LargeHeightPreview
 @Composable
 fun RoomDetailsLightPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) =

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt

@@ -20,8 +20,7 @@ import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth
-import io.element.android.features.roomdetails.impl.LeaveRoomWarning
-import io.element.android.features.roomdetails.impl.RoomDetailsEvent
+import io.element.android.features.leaveroom.fake.LeaveRoomPresenterFake
 import io.element.android.features.roomdetails.impl.RoomDetailsPresenter
 import io.element.android.features.roomdetails.impl.RoomDetailsType
 import io.element.android.features.roomdetails.impl.members.aRoomMember
@@ -34,7 +33,6 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
-import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_SESSION_ID
@@ -44,9 +42,6 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -62,7 +57,7 @@ class RoomDetailsPresenterTests {
                 return RoomMemberDetailsPresenter(aMatrixClient(), room, roomMemberId)
             }
         }
-        return RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers, roomMemberDetailsPresenterFactory)
+        return RoomDetailsPresenter(room, roomMemberDetailsPresenterFactory, LeaveRoomPresenterFake())
     }
 
     @Test
@@ -155,103 +150,6 @@ class RoomDetailsPresenterTests {
         }
     }
 
-    @Test
-    fun `present - Leave with confirmation on private room shows a specific warning`() = runTest {
-        val room = aMatrixRoom(isPublic = false).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
-        }
-        val presenter = aRoomDetailsPresenter(room)
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            skipItems(1)
-
-            initialState.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
-            val confirmationState = awaitItem()
-            Truth.assertThat(confirmationState.displayLeaveRoomWarning).isEqualTo(LeaveRoomWarning.PrivateRoom)
-        }
-    }
-
-    @Test
-    fun `present - Leave with confirmation on empty room shows a specific warning`() = runTest {
-        val room = aMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(listOf(aRoomMember())))
-        }
-        val presenter = aRoomDetailsPresenter(room)
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            skipItems(1)
-
-            initialState.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
-            val confirmationState = awaitItem()
-            Truth.assertThat(confirmationState.displayLeaveRoomWarning).isEqualTo(LeaveRoomWarning.LastUserInRoom)
-        }
-    }
-
-    @Test
-    fun `present - Leave with confirmation shows a generic warning`() = runTest {
-        val room = aMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
-        }
-        val presenter = aRoomDetailsPresenter(room)
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            skipItems(1)
-
-            initialState.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
-            val confirmationState = awaitItem()
-            Truth.assertThat(confirmationState.displayLeaveRoomWarning).isEqualTo(LeaveRoomWarning.Generic)
-        }
-    }
-
-    @Test
-    fun `present - Leave without confirmation leaves the room`() = runTest {
-        val room = aMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
-        }
-        val presenter = aRoomDetailsPresenter(room)
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            skipItems(1)
-
-            initialState.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = false))
-
-            cancelAndIgnoreRemainingEvents()
-        }
-
-        // Membership observer should receive a 'left room' change
-        roomMembershipObserver.updates.take(1)
-            .onEach { update -> Truth.assertThat(update.change).isEqualTo(MembershipChange.LEFT) }
-            .collect()
-    }
-
-    @Test
-    fun `present - ClearError removes any error present`() = runTest {
-        val room = aMatrixRoom().apply {
-            givenLeaveRoomError(Throwable())
-        }
-        val presenter = aRoomDetailsPresenter(room)
-        moleculeFlow(RecompositionClock.Immediate) {
-            presenter.present()
-        }.test {
-            val initialState = awaitItem()
-            skipItems(1)
-
-            initialState.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = false))
-            val errorState = awaitItem()
-            Truth.assertThat(errorState.error).isNotNull()
-            errorState.eventSink(RoomDetailsEvent.ClearError)
-            Truth.assertThat(awaitItem().error).isNull()
-        }
-    }
-
     @Test
     fun `present - initial state when user can invite others to room`() = runTest {
         val room = aMatrixRoom().apply {