Create LoggedIn presenter

This commit is contained in:
Benoit Marty 2023-03-30 15:05:08 +02:00
parent c10df50622
commit b982d24bab
14 changed files with 243 additions and 68 deletions

View file

@ -47,8 +47,6 @@ dependencies {
implementation(projects.libraries.matrixui)
implementation(projects.libraries.designsystem)
implementation(projects.libraries.elementresources)
implementation(projects.libraries.permissions.api)
implementation(projects.libraries.permissions.noop)
implementation(projects.libraries.testtags)
implementation(projects.libraries.uiStrings)
implementation(projects.libraries.dateformatter.api)

View file

@ -16,8 +16,6 @@
package io.element.android.features.roomlist.impl
import android.Manifest
import android.os.Build
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.MutableState
@ -45,8 +43,6 @@ import io.element.android.libraries.matrix.api.room.RoomSummary
import io.element.android.libraries.matrix.api.verification.SessionVerificationService
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
import io.element.android.libraries.matrix.ui.model.MatrixUser
import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList
@ -63,20 +59,10 @@ class RoomListPresenter @Inject constructor(
private val roomLastMessageFormatter: RoomLastMessageFormatter,
private val sessionVerificationService: SessionVerificationService,
private val snackbarDispatcher: SnackbarDispatcher,
private val permissionsPresenterFactory: PermissionsPresenter.Factory,
) : Presenter<RoomListState> {
private val roomMembershipObserver: RoomMembershipObserver = client.roomMembershipObserver()
private val postNotificationPermissionsPresenter by lazy {
// Ask for POST_NOTIFICATION PERMISSION on Android 13+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissionsPresenterFactory.create(Manifest.permission.POST_NOTIFICATIONS)
} else {
NoopPermissionsPresenter()
}
}
@Composable
override fun present(): RoomListState {
val matrixUser: MutableState<MatrixUser?> = remember {
@ -119,15 +105,12 @@ class RoomListPresenter @Inject constructor(
val snackbarMessage = handleSnackbarMessage(snackbarDispatcher)
val permissionsState = postNotificationPermissionsPresenter.present()
return RoomListState(
matrixUser = matrixUser.value,
roomList = filteredRoomSummaries.value,
filter = filter,
displayVerificationPrompt = displayVerificationPrompt,
snackbarMessage = snackbarMessage,
permissionsState = permissionsState,
eventSink = ::handleEvents
)
}

View file

@ -20,7 +20,6 @@ import androidx.compose.runtime.Immutable
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.libraries.designsystem.utils.SnackbarMessage
import io.element.android.libraries.matrix.ui.model.MatrixUser
import io.element.android.libraries.permissions.api.PermissionsState
import kotlinx.collections.immutable.ImmutableList
@Immutable
@ -30,6 +29,5 @@ data class RoomListState(
val filter: String,
val displayVerificationPrompt: Boolean,
val snackbarMessage: SnackbarMessage?,
val permissionsState: PermissionsState,
val eventSink: (RoomListEvents) -> Unit
)

View file

@ -23,7 +23,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.utils.SnackbarMessage
import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.ui.model.MatrixUser
import io.element.android.libraries.permissions.api.createDummyPostNotificationPermissionsState
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import io.element.android.libraries.ui.strings.R as StringR
@ -43,7 +42,6 @@ internal fun aRoomListState() = RoomListState(
filter = "filter",
snackbarMessage = null,
displayVerificationPrompt = false,
permissionsState = createDummyPostNotificationPermissionsState(),
eventSink = {}
)

View file

@ -16,7 +16,6 @@
package io.element.android.features.roomlist.impl
import android.app.Activity
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@ -49,7 +48,6 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
@ -59,7 +57,6 @@ import androidx.compose.ui.unit.dp
import io.element.android.features.roomlist.impl.components.RoomListTopBar
import io.element.android.features.roomlist.impl.components.RoomSummaryRow
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.libraries.androidutils.system.openAppSettingsPage
import io.element.android.libraries.designsystem.ElementTextStyles
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@ -72,7 +69,6 @@ import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.utils.LogCompositions
import io.element.android.libraries.matrix.api.core.RoomId
import kotlinx.coroutines.launch
import io.element.android.libraries.permissions.api.PermissionsView
import io.element.android.libraries.designsystem.R as DrawableR
import io.element.android.libraries.ui.strings.R as StringR
@ -85,24 +81,14 @@ fun RoomListView(
onVerifyClicked: () -> Unit = {},
onCreateRoomClicked: () -> Unit = {},
) {
val activity = LocalContext.current as? Activity
Box(modifier = modifier) {
RoomListContent(
state = state,
modifier = Modifier,
onRoomClicked = onRoomClicked,
onOpenSettings = onOpenSettings,
onVerifyClicked = onVerifyClicked,
onCreateRoomClicked = onCreateRoomClicked,
)
PermissionsView(
state = state.permissionsState,
openSystemSettings = {
activity?.let { openAppSettingsPage(it, "") }
}
)
}
RoomListContent(
state = state,
modifier = modifier,
onRoomClicked = onRoomClicked,
onOpenSettings = onOpenSettings,
onVerifyClicked = onVerifyClicked,
onCreateRoomClicked = onCreateRoomClicked,
)
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)

View file

@ -37,7 +37,6 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
import io.element.android.libraries.permissions.noop.NoopPermissionsPresenterFactory
import kotlinx.coroutines.test.runTest
import org.junit.Test
@ -51,7 +50,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -79,7 +77,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -101,7 +98,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -127,7 +123,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -158,7 +153,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -194,7 +188,6 @@ class RoomListPresenterTests {
FakeRoomLastMessageFormatter(),
FakeSessionVerificationService(),
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()
@ -244,7 +237,6 @@ class RoomListPresenterTests {
givenVerifiedStatus(SessionVerifiedStatus.NotVerified)
},
SnackbarDispatcher(),
NoopPermissionsPresenterFactory(),
)
moleculeFlow(RecompositionClock.Immediate) {
presenter.present()