Let JoinRoomView render the InviteSender

2024-04-18 15:19:03 +02:00
parent 866bfed218
commit bfd91c4934
12 changed files with 159 additions and 53 deletions
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
@@ -38,7 +38,11 @@ import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.preview.RoomPreview
+import io.element.android.libraries.matrix.ui.model.InviteSender
+import io.element.android.libraries.matrix.ui.model.toInviteSender
+import kotlinx.coroutines.flow.first
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull

 class JoinRoomPresenter @AssistedInject constructor(
    @Assisted private val roomId: RoomId,
@@ -74,10 +78,22 @@ class JoinRoomPresenter @AssistedInject constructor(
                else -> {
                    value = ContentState.Loading(roomIdOrAlias)
                    val result = matrixClient.getRoomPreview(roomId.toRoomIdOrAlias())
-                    value = result.fold(
-                        onSuccess = { it.toContentState() },
+                    result.fold(
+                        onSuccess = {
+                            value = it.toContentState(null)
+                            if (it.isInvited) {
+                                // Get the inviteSender
+                                matrixClient.getRoomInfoFlow(roomId).first()
+                                    .getOrNull()
+                                    ?.inviter
+                                    ?.toInviteSender()
+                                    ?.let { inviteSender ->
+                                        value = it.toContentState(inviteSender)
+                                    }
+                            }
+                        },
                        onFailure = { throwable ->
-                            if (throwable.message?.contains("403") == true) {
+                            value = if (throwable.message?.contains("403") == true) {
                                ContentState.UnknownRoom(roomIdOrAlias)
                            } else {
                                ContentState.Failure(roomIdOrAlias, throwable)
@@ -118,7 +134,9 @@ class JoinRoomPresenter @AssistedInject constructor(
    }
 }

-private fun RoomPreview.toContentState(): ContentState {
+private fun RoomPreview.toContentState(
+    inviteSender: InviteSender?
+): ContentState {
    return ContentState.Loaded(
        roomId = roomId,
        name = name,
@@ -128,7 +146,7 @@ private fun RoomPreview.toContentState(): ContentState {
        isDirect = false,
        roomAvatarUrl = avatarUrl,
        joinAuthorisationStatus = when {
-            isInvited -> JoinAuthorisationStatus.IsInvited
+            isInvited -> JoinAuthorisationStatus.IsInvited(inviteSender)
            canKnock -> JoinAuthorisationStatus.CanKnock
            isPublic -> JoinAuthorisationStatus.CanJoin
            else -> JoinAuthorisationStatus.Unknown
@@ -165,7 +183,9 @@ internal fun MatrixRoomInfo.toContentState(): ContentState {
        isDirect = isDirect,
        roomAvatarUrl = avatarUrl,
        joinAuthorisationStatus = when {
-            currentUserMembership == CurrentUserMembership.INVITED -> JoinAuthorisationStatus.IsInvited
+            currentUserMembership == CurrentUserMembership.INVITED -> JoinAuthorisationStatus.IsInvited(
+                inviteSender = inviter?.toInviteSender()
+            )
            isPublic -> JoinAuthorisationStatus.CanJoin
            else -> JoinAuthorisationStatus.Unknown
        }
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.ui.model.InviteSender

@Immutable
 data class JoinRoomState(
@@ -71,9 +72,9 @@ sealed interface ContentState {
    }
 }

-enum class JoinAuthorisationStatus {
-    IsInvited,
-    CanKnock,
-    CanJoin,
-    Unknown,
+sealed interface JoinAuthorisationStatus {
+    data class IsInvited(val inviteSender: InviteSender?) : JoinAuthorisationStatus
+    data object CanKnock : JoinAuthorisationStatus
+    data object CanJoin : JoinAuthorisationStatus
+    data object Unknown : JoinAuthorisationStatus
 }
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
@@ -19,10 +19,14 @@ package io.element.android.features.joinroom.impl
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
 import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.matrix.ui.model.InviteSender

 open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
    override val values: Sequence<JoinRoomState>
@@ -48,7 +52,10 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                )
            ),
            aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited)
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null))
+            ),
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(anInviteSender()))
            ),
            aJoinRoomState(
                contentState = aFailureContentState()
@@ -102,5 +109,15 @@ fun aJoinRoomState(
    eventSink = eventSink
 )

+internal fun anInviteSender(
+    userId: UserId = UserId("@bob:domain"),
+    displayName: String = "Bob",
+    avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
+) = InviteSender(
+    userId = userId,
+    displayName = displayName,
+    avatarData = avatarData,
+)
+
 private val A_ROOM_ID = RoomId("!exa:matrix.org")
 private val A_ROOM_ALIAS = RoomAlias("#exa:matrix.org")
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -17,11 +17,13 @@
 package io.element.android.features.joinroom.impl

 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -47,6 +49,7 @@ import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 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.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.ui.components.InviteSenderView
 import io.element.android.libraries.ui.strings.CommonStrings

@Composable
@@ -103,7 +106,7 @@ private fun JoinRoomFooter(
    } else {
        val joinAuthorisationStatus = state.joinAuthorisationStatus
        when (joinAuthorisationStatus) {
-            JoinAuthorisationStatus.IsInvited -> {
+            is JoinAuthorisationStatus.IsInvited -> {
                ButtonRowMolecule(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(20.dp)) {
                    OutlinedButton(
                        text = stringResource(CommonStrings.action_decline),
@@ -159,7 +162,16 @@ private fun JoinRoomContent(
                    RoomPreviewTitleAtom(contentState.computedTitle)
                },
                subtitle = {
-                    RoomPreviewSubtitleAtom(contentState.computedSubtitle)
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        RoomPreviewSubtitleAtom(contentState.computedSubtitle)
+                        val inviteSender = (contentState.joinAuthorisationStatus as? JoinAuthorisationStatus.IsInvited)?.inviteSender
+                        if (inviteSender != null) {
+                            InviteSenderView(inviteSender = inviteSender)
+                        }
+                    }
                },
                description = {
                    RoomPreviewDescriptionAtom(contentState.topic ?: "")
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
@@ -101,7 +101,7 @@ class JoinRoomPresenterTest {
        presenter.test {
            skipItems(1)
            awaitItem().also { state ->
-                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited)
+                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(null))
            }
        }
    }
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
@@ -80,7 +80,7 @@ class JoinRoomViewTest {
        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
        rule.setJoinRoomView(
            aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited),
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
                eventSink = eventsRecorder,
            ),
        )
@@ -93,7 +93,7 @@ class JoinRoomViewTest {
        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
        rule.setJoinRoomView(
            aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited),
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
                eventSink = eventsRecorder,
            ),
        )