Merge pull request #2731 from element-hq/feature/bma/roomPreview2

Improve room preview rendering

features/joinroom/impl/build.gradle.kts

@@ -23,6 +23,11 @@ plugins {
 
 android {
     namespace = "io.element.android.features.joinroom.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 anvil {
@@ -46,10 +51,13 @@ dependencies {
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 
     ksp(libs.showkase.processor)
 }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -38,6 +38,7 @@ 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.toInviteSender
 import java.util.Optional
 
 class JoinRoomPresenter @AssistedInject constructor(
@@ -75,7 +76,9 @@ class JoinRoomPresenter @AssistedInject constructor(
                     value = ContentState.Loading(roomIdOrAlias)
                     val result = matrixClient.getRoomPreview(roomId.toRoomIdOrAlias())
                     value = result.fold(
-                        onSuccess = { it.toContentState() },
+                        onSuccess = { roomPreview ->
+                            roomPreview.toContentState()
+                        },
                         onFailure = { throwable ->
                             if (throwable.message?.contains("403") == true) {
                                 ContentState.UnknownRoom(roomIdOrAlias)
@@ -128,7 +131,8 @@ private fun RoomPreview.toContentState(): ContentState {
         isDirect = false,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when {
-            isInvited -> JoinAuthorisationStatus.IsInvited
+            // Note when isInvited, roomInfo will be used, so if this happen, it will be temporary.
+            isInvited -> JoinAuthorisationStatus.IsInvited(null)
             canKnock -> JoinAuthorisationStatus.CanKnock
             isPublic -> JoinAuthorisationStatus.CanJoin
             else -> JoinAuthorisationStatus.Unknown
@@ -165,7 +169,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
         }

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
 }

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,13 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                 )
             ),
             aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited)
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null))
+            ),
+            aJoinRoomState(
+                contentState = aLoadedContentState(
+                    numberOfMembers = 123,
+                    joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(anInviteSender()),
+                )
             ),
             aJoinRoomState(
                 contentState = aFailureContentState()
@@ -102,5 +112,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")

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt

@@ -16,13 +16,18 @@
 
 package io.element.android.features.joinroom.impl
 
+import androidx.compose.foundation.background
 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.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -35,9 +40,11 @@ import io.element.android.libraries.designsystem.atomic.molecules.ButtonRowMolec
 import io.element.android.libraries.designsystem.atomic.molecules.RoomPreviewMembersCountMolecule
 import io.element.android.libraries.designsystem.atomic.organisms.RoomPreviewOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
+import io.element.android.libraries.designsystem.background.LightGradientBackground
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 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.SuperButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
@@ -46,6 +53,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
@@ -54,8 +62,10 @@ fun JoinRoomView(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val gradientBackground = remember { LightGradientBackground() }
     HeaderFooterPage(
-        modifier = modifier,
+        modifier = modifier.background(gradientBackground),
+        containerColor = Color.Transparent,
         paddingValues = PaddingValues(16.dp),
         topBar = {
             JoinRoomTopBar(onBackClicked = onBackPressed)
@@ -97,41 +107,44 @@ private fun JoinRoomFooter(
             text = stringResource(CommonStrings.action_retry),
             onClick = onRetry,
             modifier = modifier.fillMaxWidth(),
-            size = ButtonSize.Medium,
+            size = ButtonSize.Large,
         )
     } 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),
                         onClick = onDeclineInvite,
                         modifier = Modifier.weight(1f),
-                        size = ButtonSize.Medium,
+                        size = ButtonSize.Large,
                     )
                     Button(
                         text = stringResource(CommonStrings.action_accept),
                         onClick = onAcceptInvite,
                         modifier = Modifier.weight(1f),
-                        size = ButtonSize.Medium,
+                        size = ButtonSize.Large,
                     )
                 }
             }
             JoinAuthorisationStatus.CanJoin -> {
-                Button(
-                    text = stringResource(R.string.screen_join_room_join_action),
+                SuperButton(
                     onClick = onJoinRoom,
                     modifier = modifier.fillMaxWidth(),
-                    size = ButtonSize.Medium,
-                )
+                    buttonSize = ButtonSize.Large,
+                ) {
+                    Text(
+                        text = stringResource(R.string.screen_join_room_join_action),
+                    )
+                }
             }
             JoinAuthorisationStatus.CanKnock -> {
                 Button(
                     text = stringResource(R.string.screen_join_room_knock_action),
                     onClick = onJoinRoom,
                     modifier = modifier.fillMaxWidth(),
-                    size = ButtonSize.Medium,
+                    size = ButtonSize.Large,
                 )
             }
             JoinAuthorisationStatus.Unknown -> Unit
@@ -158,7 +171,16 @@ private fun JoinRoomContent(
                     RoomPreviewSubtitleAtom(contentState.computedSubtitle)
                 },
                 description = {
-                    RoomPreviewDescriptionAtom(contentState.topic ?: "")
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(8.dp),
+                    ) {
+                        val inviteSender = (contentState.joinAuthorisationStatus as? JoinAuthorisationStatus.IsInvited)?.inviteSender
+                        if (inviteSender != null) {
+                            InviteSenderView(inviteSender = inviteSender)
+                        }
+                        RoomPreviewDescriptionAtom(contentState.topic ?: "")
+                    }
                 },
                 memberCount = {
                     if (contentState.showMemberCount) {

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt

@@ -25,6 +25,7 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.MatrixClient
 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.UserId
 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.preview.RoomPreview
@@ -33,6 +34,8 @@ 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.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.aRoomMember
+import io.element.android.libraries.matrix.ui.model.toInviteSender
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -101,7 +104,31 @@ class JoinRoomPresenterTest {
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
-                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited)
+                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(null))
+            }
+        }
+    }
+
+    @Test
+    fun `present - when room is invited then join authorization is equal to invited, an inviter is provided`() = runTest {
+        val inviter = aRoomMember(userId = UserId("@bob:example.com"), displayName = "Bob")
+        val expectedInviteSender = inviter.toInviteSender()
+        val roomInfo = aRoomInfo(
+            currentUserMembership = CurrentUserMembership.INVITED,
+            inviter = inviter,
+        )
+        val matrixClient = FakeMatrixClient().apply {
+            getRoomInfoFlowLambda = { _ ->
+                flowOf(Optional.of(roomInfo))
+            }
+        }
+        val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient
+        )
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(expectedInviteSender))
             }
         }
     }

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.joinroom.impl
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.pressBack
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class JoinRoomViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back invoke the expected callback`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
+        ensureCalledOnce {
+            rule.setJoinRoomView(
+                aJoinRoomState(
+                    eventSink = eventsRecorder,
+                ),
+                onBackPressed = it
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `clicking on Join room on CanJoin room emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(R.string.screen_join_room_join_action)
+        eventsRecorder.assertSingle(JoinRoomEvents.JoinRoom)
+    }
+
+    @Test
+    fun `clicking on Knock room on CanKnock room emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(R.string.screen_join_room_knock_action)
+        eventsRecorder.assertSingle(JoinRoomEvents.JoinRoom)
+    }
+
+    @Test
+    fun `clicking on Accept invitationon IsInvited room emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_accept)
+        eventsRecorder.assertSingle(JoinRoomEvents.AcceptInvite)
+    }
+
+    @Test
+    fun `clicking on Decline invitation on IsInvited room emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_decline)
+        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite)
+    }
+
+    @Test
+    fun `clicking on Retry when an error occurs emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aFailureContentState(),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_retry)
+        eventsRecorder.assertSingle(JoinRoomEvents.RetryFetchingContent)
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinRoomView(
+    state: JoinRoomState,
+    onBackPressed: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        JoinRoomView(
+            state = state,
+            onBackPressed = onBackPressed,
+        )
+    }
+}

features/roomaliasresolver/impl/build.gradle.kts

@@ -23,6 +23,11 @@ plugins {
 
 android {
     namespace = "io.element.android.features.roomaliasresolver.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 anvil {
@@ -44,10 +49,13 @@ dependencies {
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 
     ksp(libs.showkase.processor)
 }

features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt

@@ -16,6 +16,7 @@
 
 package io.element.android.features.roomaliasresolver.impl
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -25,8 +26,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -36,6 +39,7 @@ import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom
 import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewTitleAtom
 import io.element.android.libraries.designsystem.atomic.organisms.RoomPreviewOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
+import io.element.android.libraries.designsystem.background.LightGradientBackground
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -61,9 +65,10 @@ fun RoomAliasResolverView(
             latestOnAliasResolved(state.resolveState.data)
         }
     }
-
+    val gradientBackground = remember { LightGradientBackground() }
     HeaderFooterPage(
-        modifier = modifier,
+        modifier = modifier.background(gradientBackground),
+        containerColor = Color.Transparent,
         paddingValues = PaddingValues(16.dp),
         topBar = {
             RoomAliasResolverTopBar(onBackClicked = onBackPressed)
@@ -92,7 +97,7 @@ private fun RoomAliasResolverFooter(
                     state.eventSink(RoomAliasResolverEvents.Retry)
                 },
                 modifier = modifier.fillMaxWidth(),
-                size = ButtonSize.Medium,
+                size = ButtonSize.Large,
             )
         }
         is AsyncData.Loading -> {

features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverViewTest.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomaliasresolver.impl
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.pressBack
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class RoomAliasResolverViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back invokes the expected callback`() {
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
+        ensureCalledOnce {
+            rule.setRoomAliasResolverView(
+                aRoomAliasResolverState(
+                    eventSink = eventsRecorder,
+                ),
+                onBackPressed = it
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `clicking on Retry emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>()
+        rule.setRoomAliasResolverView(
+            aRoomAliasResolverState(
+                resolveState = AsyncData.Failure(Exception("Error")),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_retry)
+        eventsRecorder.assertSingle(RoomAliasResolverEvents.Retry)
+    }
+
+    @Test
+    fun `success state invokes the expected Callback`() {
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
+        ensureCalledOnceWithParam(A_ROOM_ID) {
+            rule.setRoomAliasResolverView(
+                aRoomAliasResolverState(
+                    resolveState = AsyncData.Success(A_ROOM_ID),
+                    eventSink = eventsRecorder,
+                ),
+                onAliasResolved = it,
+            )
+        }
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomAliasResolverView(
+    state: RoomAliasResolverState,
+    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onAliasResolved: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+) {
+    setContent {
+        RoomAliasResolverView(
+            state = state,
+            onBackPressed = onBackPressed,
+            onAliasResolved = onAliasResolved,
+        )
+    }
+}

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt

@@ -23,10 +23,10 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.leaveroom.api.aLeaveRoomState
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
 import io.element.android.features.roomlist.impl.filters.aRoomListFiltersState
-import io.element.android.features.roomlist.impl.model.InviteSender
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
 import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary
+import io.element.android.features.roomlist.impl.model.anInviteSender
 import io.element.android.features.roomlist.impl.search.RoomListSearchState
 import io.element.android.features.roomlist.impl.search.aRoomListSearchState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -88,11 +88,7 @@ internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
             name = "Room Invited",
             avatarData = AvatarData("!roomId", "Room with Alice and Bob", size = AvatarSize.RoomListItem),
             id = "!roomId:domain",
-            inviteSender = InviteSender(
-                userId = UserId("@bob:domain"),
-                displayName = "Bob",
-                avatarData = AvatarData("@bob:domain", "Bob", size = AvatarSize.InviteSender),
-            ),
+            inviteSender = anInviteSender(),
             displayType = RoomSummaryDisplayType.INVITE,
         ),
         aRoomListRoomSummary(

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt

@@ -47,7 +47,6 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomlist.impl.RoomListEvents
-import io.element.android.features.roomlist.impl.model.InviteSender
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
@@ -67,6 +66,8 @@ import io.element.android.libraries.designsystem.theme.roomListRoomName
 import io.element.android.libraries.designsystem.theme.unreadIndicator
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.ui.components.InviteSenderView
+import io.element.android.libraries.matrix.ui.model.InviteSender
 import io.element.android.libraries.ui.strings.CommonStrings
 import timber.log.Timber
 
@@ -96,7 +97,10 @@ internal fun RoomSummaryRow(
                 InviteSubtitle(isDirect = room.isDirect, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias)
                 if (!room.isDirect && room.inviteSender != null) {
                     Spacer(modifier = Modifier.height(4.dp))
-                    InviteSenderRow(sender = room.inviteSender)
+                    InviteSenderView(
+                        modifier = Modifier.fillMaxWidth(),
+                        inviteSender = room.inviteSender,
+                    )
                 }
                 Spacer(modifier = Modifier.height(12.dp))
                 InviteButtonsRow(
@@ -290,24 +294,6 @@ private fun InviteNameAndIndicatorRow(
     }
 }
 
-@Composable
-private fun InviteSenderRow(
-    sender: InviteSender,
-    modifier: Modifier = Modifier
-) {
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = modifier.fillMaxWidth(),
-    ) {
-        Avatar(avatarData = sender.avatarData)
-        Text(
-            text = sender.annotatedString(),
-            style = ElementTheme.typography.fontBodyMdRegular,
-            color = MaterialTheme.colorScheme.secondary,
-        )
-    }
-}
-
 @Composable
 private fun InviteButtonsRow(
     onAcceptClicked: () -> Unit,

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.features.roomlist.impl.datasource
 
-import io.element.android.features.roomlist.impl.model.InviteSender
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
 import io.element.android.libraries.core.extensions.orEmpty
@@ -27,6 +26,7 @@ import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.ui.model.toInviteSender
 import javax.inject.Inject
 
 class RoomListRoomSummaryFactory @Inject constructor(
@@ -83,18 +83,7 @@ class RoomListRoomSummaryFactory @Inject constructor(
             hasRoomCall = roomSummary.details.hasRoomCall,
             isDirect = roomSummary.details.isDirect,
             isFavorite = roomSummary.details.isFavorite,
-            inviteSender = roomSummary.details.inviter?.run {
-                InviteSender(
-                    userId = userId,
-                    displayName = displayName ?: "",
-                    avatarData = AvatarData(
-                        id = userId.value,
-                        name = displayName,
-                        url = avatarUrl,
-                        size = AvatarSize.InviteSender,
-                    ),
-                )
-            },
+            inviteSender = roomSummary.details.inviter?.toInviteSender(),
             isDm = roomSummary.details.isDm,
             canonicalAlias = roomSummary.details.canonicalAlias,
             displayType = if (roomSummary.details.currentUserMembership == CurrentUserMembership.INVITED) {

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt

@@ -21,6 +21,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 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.room.RoomNotificationMode
+import io.element.android.libraries.matrix.ui.model.InviteSender
 
 @Immutable
 data class RoomListRoomSummary(
@@ -42,7 +43,7 @@ data class RoomListRoomSummary(
     val isDm: Boolean,
     val isFavorite: Boolean,
     val inviteSender: InviteSender?,
-    ) {
+) {
     val isHighlighted = userDefinedNotificationMode != RoomNotificationMode.MUTE &&
         (numberOfUnreadNotifications > 0 || numberOfUnreadMentions > 0) ||
         isMarkedUnread ||

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt

@@ -23,6 +23,7 @@ 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.UserId
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.ui.model.InviteSender
 
 open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSummary> {
     override val values: Sequence<RoomListRoomSummary>
@@ -86,7 +87,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                 aRoomListRoomSummary(
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
-                        userId = "@alice:matrix.org",
+                        userId = UserId("@alice:matrix.org"),
                         displayName = "Alice",
                     ),
                     canonicalAlias = RoomAlias("#alias:matrix.org"),
@@ -95,7 +96,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     name = "Bob",
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
-                        userId = "@bob:matrix.org",
+                        userId = UserId("@bob:matrix.org"),
                         displayName = "Bob",
                     ),
                     isDirect = true,
@@ -105,12 +106,13 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
 }
 
 internal fun anInviteSender(
-    userId: String,
-    displayName: String,
+    userId: UserId = UserId("@bob:domain"),
+    displayName: String = "Bob",
+    avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
 ) = InviteSender(
-    userId = UserId(userId),
+    userId = userId,
     displayName = displayName,
-    avatarData = AvatarData(userId, displayName, size = AvatarSize.InviteSender),
+    avatarData = avatarData,
 )
 
 internal fun aRoomListRoomSummary(

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt

@@ -21,9 +21,12 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -32,6 +35,7 @@ import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.focus.FocusRequester
@@ -49,14 +53,15 @@ import io.element.android.features.roomlist.impl.components.RoomSummaryRow
 import io.element.android.features.roomlist.impl.contentType
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.button.SuperButton
 import io.element.android.libraries.designsystem.modifiers.applyIf
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ButtonSize
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
-import io.element.android.libraries.designsystem.theme.components.IconSource
 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.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.copy
@@ -179,8 +184,8 @@ private fun RoomListSearchContent(
             if (state.displayRoomDirectorySearch) {
                 RoomDirectorySearchButton(
                     modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 24.dp, horizontal = 16.dp),
+                        .fillMaxWidth()
+                        .padding(vertical = 24.dp, horizontal = 16.dp),
                     onClick = onRoomDirectorySearchClicked
                 )
             }
@@ -207,12 +212,24 @@ private fun RoomDirectorySearchButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Button(
-        text = stringResource(id = R.string.screen_roomlist_room_directory_button_title),
-        leadingIcon = IconSource.Vector(CompoundIcons.ListBulleted()),
+    SuperButton(
         onClick = onClick,
         modifier = modifier,
-    )
+        buttonSize = ButtonSize.Large,
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                imageVector = CompoundIcons.ListBulleted(),
+                contentDescription = null,
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(
+                text = stringResource(R.string.screen_roomlist_room_directory_button_title),
+            )
+        }
+    }
 }
 
 @PreviewsDayNight

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomlist.impl.search
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.features.roomlist.impl.R
+import io.element.android.features.roomlist.impl.RoomListEvents
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class RoomListSearchViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on 'Browse all rooms' invokes the expected callback`() {
+        val eventsRecorder = EventsRecorder<RoomListSearchEvents>(expectEvents = false)
+        ensureCalledOnce {
+            rule.setRoomListSearchView(
+                aRoomListSearchState(
+                    isSearchActive = true,
+                    isRoomDirectorySearchEnabled = true,
+                    eventSink = eventsRecorder,
+                ),
+                onRoomDirectorySearchClicked = it,
+            )
+            rule.clickOn(R.string.screen_roomlist_room_directory_button_title)
+        }
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListSearchView(
+    state: RoomListSearchState,
+    eventSink: (RoomListEvents) -> Unit = EventsRecorder(expectEvents = false),
+    onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+    onRoomDirectorySearchClicked: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        RoomListSearchView(
+            state = state,
+            eventSink = eventSink,
+            onRoomClicked = onRoomClicked,
+            onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
+        )
+    }
+}

gradle/libs.versions.toml

@@ -154,7 +154,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:1.4.2"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.14"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.15"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/RoomPreviewMembersCountMolecule.kt

@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -42,8 +41,7 @@ fun RoomPreviewMembersCountMolecule(
     Row(
         modifier = modifier
             .background(color = ElementTheme.colors.bgSubtleSecondary, shape = CircleShape)
-            .widthIn(min = 48.dp)
-            .padding(start = 2.dp, end = 6.dp, top = 2.dp, bottom = 2.dp),
+            .padding(start = 2.dp, end = 8.dp, top = 2.dp, bottom = 2.dp),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(4.dp)
     ) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt

@@ -23,9 +23,11 @@ import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -36,6 +38,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 /**
  * @param modifier Classical modifier.
  * @param paddingValues padding values to apply to the content.
+ * @param containerColor color of the container. Set to [Color.Transparent] if you provide a background in the [modifier].
  * @param background optional background component.
  * @param topBar optional topBar.
  * @param header optional header.
@@ -46,6 +49,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 fun HeaderFooterPage(
     modifier: Modifier = Modifier,
     paddingValues: PaddingValues = PaddingValues(20.dp),
+    containerColor: Color = MaterialTheme.colorScheme.background,
     background: @Composable () -> Unit = {},
     topBar: @Composable () -> Unit = {},
     header: @Composable () -> Unit = {},
@@ -55,6 +59,7 @@ fun HeaderFooterPage(
     Scaffold(
         modifier = modifier,
         topBar = topBar,
+        containerColor = containerColor,
     ) { padding ->
         Box {
             background()

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/LightGradientBackground.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.designsystem.background
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.geometry.center
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RadialGradientShader
+import androidx.compose.ui.graphics.Shader
+import androidx.compose.ui.graphics.ShaderBrush
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+
+class LightGradientBackground(
+    private val firstColor: Color = Color(0x1E0DBD8B),
+    private val secondColor: Color = Color(0x001273EB),
+    private val ratio: Float = 642 / 775f,
+) : ShaderBrush() {
+    override fun createShader(size: Size): Shader {
+        val biggerDimension = size.width * 1.98f
+        return RadialGradientShader(
+            colors = listOf(firstColor, secondColor),
+            center = size.center.copy(x = size.width * ratio, y = size.height * ratio),
+            radius = biggerDimension / 2f,
+            colorStops = listOf(0f, 0.95f)
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun LightGradientBackgroundPreview() = ElementPreview {
+    val gradientBackground = remember {
+        LightGradientBackground()
+    }
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(gradientBackground)
+    )
+}

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -61,6 +61,7 @@ import io.element.android.libraries.matrix.impl.room.RoomContentForwarder
 import io.element.android.libraries.matrix.impl.room.RoomSyncSubscriber
 import io.element.android.libraries.matrix.impl.room.RustMatrixRoom
 import io.element.android.libraries.matrix.impl.room.map
+import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewMapper
 import io.element.android.libraries.matrix.impl.roomdirectory.RustRoomDirectoryService
 import io.element.android.libraries.matrix.impl.roomlist.RoomListFactory
 import io.element.android.libraries.matrix.impl.roomlist.RustRoomListService
@@ -463,21 +464,15 @@ class RustMatrixClient(
         }
     }
 
-    @Suppress("TooGenericExceptionThrown")
     override suspend fun resolveRoomAlias(roomAlias: RoomAlias): Result<RoomId> = withContext(sessionDispatcher) {
         runCatching {
-            // TODO Waiting for SDK to be released
-            throw Exception("Not implemented")
-            // client.resolveRoomAlias(roomAlias.value).let(::RoomId)
+            client.resolveRoomAlias(roomAlias.value).let(::RoomId)
         }
     }
 
-    @Suppress("TooGenericExceptionThrown")
     override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias): Result<RoomPreview> = withContext(sessionDispatcher) {
         runCatching {
-            // TODO Waiting for SDK to be released
-            throw Exception("Not implemented")
-            // client.getRoomPreview(roomIdOrAlias.identifier).let(RoomPreviewMapper::map)
+            client.getRoomPreview(roomIdOrAlias.identifier).let(RoomPreviewMapper::map)
         }
     }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/preview/RoomPreviewMapper.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.impl.room.preview
+
+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.room.preview.RoomPreview
+import org.matrix.rustcomponents.sdk.RoomPreview as RustRoomPreview
+
+object RoomPreviewMapper {
+    fun map(roomPreview: RustRoomPreview): RoomPreview {
+        return RoomPreview(
+            roomId = RoomId(roomPreview.roomId),
+            canonicalAlias = roomPreview.canonicalAlias?.let(::RoomAlias),
+            name = roomPreview.name,
+            topic = roomPreview.topic,
+            avatarUrl = roomPreview.avatarUrl,
+            numberOfJoinedMembers = roomPreview.numJoinedMembers.toLong(),
+            roomType = roomPreview.roomType,
+            isHistoryWorldReadable = roomPreview.isHistoryWorldReadable,
+            isJoined = roomPreview.isJoined,
+            isInvited = roomPreview.isInvited,
+            isPublic = roomPreview.isPublic,
+            canKnock = roomPreview.canKnock
+        )
+    }
+}

libraries/matrixui/build.gradle.kts

@@ -34,6 +34,7 @@ dependencies {
     anvil(projects.anvilcodegen)
     implementation(projects.libraries.di)
     implementation(projects.libraries.architecture)
+    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.core)

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.ui.model.InviteSender
+
+@Composable
+fun InviteSenderView(
+    inviteSender: InviteSender,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier,
+    ) {
+        Avatar(avatarData = inviteSender.avatarData)
+        Text(
+            text = inviteSender.annotatedString(),
+            style = ElementTheme.typography.fontBodyMdRegular,
+            color = MaterialTheme.colorScheme.secondary,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun InviteSenderViewPreview() = ElementPreview {
+    InviteSenderView(
+        inviteSender = InviteSender(
+            userId = UserId("@bob:example.com"),
+            displayName = "Bob",
+            avatarData = AvatarData(
+                id = "@bob:example.com",
+                name = "Bob",
+                url = null,
+                size = AvatarSize.InviteSender
+            )
+        )
+    )
+}

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.features.roomlist.impl.model
+package io.element.android.libraries.matrix.ui.model
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -24,9 +24,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.FontWeight
-import io.element.android.features.roomlist.impl.R
 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.UserId
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.ui.R
 
 @Immutable
 data class InviteSender(
@@ -54,3 +56,14 @@ data class InviteSender(
         }
     }
 }
+
+fun RoomMember.toInviteSender() = InviteSender(
+    userId = userId,
+    displayName = displayName ?: "",
+    avatarData = AvatarData(
+        id = userId.value,
+        name = displayName,
+        url = avatarUrl,
+        size = AvatarSize.InviteSender,
+    ),
+)

libraries/matrixui/src/main/res/values/localazy.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invites_invited_you">"%1$s (%2$s) invited you"</string>
+</resources>

tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt

@@ -16,8 +16,10 @@
 
 package io.element.android.tests.konsist
 
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
+import com.lemonappdev.konsist.api.verify.assertEmpty
 import com.lemonappdev.konsist.api.verify.assertTrue
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import org.junit.Test
@@ -57,4 +59,15 @@ class KonsistPreviewTest {
                 it.hasInternalModifier
             }
     }
+
+    @Test
+    fun `Ensure that '@PreviewLightDark' is not used`() {
+        Konsist
+            .scopeFromProject()
+            .functions()
+            .withAllAnnotationsOf(PreviewLightDark::class)
+            .assertEmpty(
+                additionalMessage = "Use '@PreviewsDayNight' instead of '@PreviewLightDark', or else screenshot(s) will not be generated.",
+            )
+    }
 }

tools/localazy/config.json

@@ -224,6 +224,12 @@
         "troubleshoot_notifications_screen_.*"
       ]
     },
+    {
+      "name" : ":libraries:matrixui",
+      "includeRegex" : [
+        "screen_invites_invited_you"
+      ]
+    },
     {
       "name" : ":features:call",
       "includeRegex" : [

tools/quality/check.sh

@@ -25,6 +25,9 @@ set -e
 # First run the quickest script
 ./tools/check/check_code_quality.sh
 
+# Check ktlint first
+./gradlew ktlintCheck
+
 # Build, test and check the project, with warning as errors
 # It also check that the minimal app is compiling.
 ./gradlew check -PallWarningsAsErrors=true