misc : remove direct usage of RoomSummary in UI and let RoomSummary use RoomInfo.

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

@@ -1,66 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- * Please see LICENSE in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.ui.components
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-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.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.api.room.message.RoomMessage
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.user.MatrixUser
-
-open class RoomSummaryDetailsProvider : PreviewParameterProvider<RoomSummary> {
-    override val values: Sequence<RoomSummary>
-        get() = sequenceOf(
-            aRoomSummaryDetails(),
-            aRoomSummaryDetails(name = null),
-        )
-}
-
-fun aRoomSummaryDetails(
-    roomId: RoomId = RoomId("!room:domain"),
-    name: String? = "roomName",
-    canonicalAlias: RoomAlias? = null,
-    alternativeAliases: List<RoomAlias> = emptyList(),
-    isDirect: Boolean = true,
-    avatarUrl: String? = null,
-    lastMessage: RoomMessage? = null,
-    inviter: RoomMember? = null,
-    notificationMode: RoomNotificationMode? = null,
-    hasRoomCall: Boolean = false,
-    isDm: Boolean = false,
-    numUnreadMentions: Int = 0,
-    numUnreadMessages: Int = 0,
-    numUnreadNotifications: Int = 0,
-    isMarkedUnread: Boolean = false,
-    isFavorite: Boolean = false,
-    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
-    heroes: List<MatrixUser> = emptyList(),
-) = RoomSummary(
-    roomId = roomId,
-    name = name,
-    canonicalAlias = canonicalAlias,
-    alternativeAliases = alternativeAliases,
-    isDirect = isDirect,
-    avatarUrl = avatarUrl,
-    lastMessage = lastMessage,
-    inviter = inviter,
-    userDefinedNotificationMode = notificationMode,
-    hasRoomCall = hasRoomCall,
-    isDm = isDm,
-    numUnreadMentions = numUnreadMentions,
-    numUnreadMessages = numUnreadMessages,
-    numUnreadNotifications = numUnreadNotifications,
-    isMarkedUnread = isMarkedUnread,
-    isFavorite = isFavorite,
-    currentUserMembership = currentUserMembership,
-    heroes = heroes,
-)

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.components
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+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.user.MatrixUser
+import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+class SelectRoomInfoProvider : PreviewParameterProvider<SelectRoomInfo> {
+    override val values: Sequence<SelectRoomInfo>
+        get() = sequenceOf(
+            aSelectRoomInfo(roomId = RoomId("!room1:domain")),
+            aSelectRoomInfo(roomId = RoomId("!room2:domain"), name = "Room with a name"),
+            aSelectRoomInfo(roomId = RoomId("!room3:domain"), name = "Room with a name and alias", canonicalAlias = RoomAlias("#alias:domain")),
+        )
+}
+
+fun aSelectRoomInfo(
+    roomId: RoomId,
+    name: String? = null,
+    canonicalAlias: RoomAlias? = null,
+    avatarUrl: String? = null,
+    heroes: ImmutableList<MatrixUser> = persistentListOf(),
+) = SelectRoomInfo(
+    roomId = roomId,
+    name = name,
+    canonicalAlias = canonicalAlias,
+    avatarUrl = avatarUrl,
+    heroes = heroes,
+)

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

@@ -34,15 +34,15 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.toImmutableList
 
 @Composable
 fun SelectedRoom(
-    roomSummary: RoomSummary,
-    onRemoveRoom: (RoomSummary) -> Unit,
+    roomInfo: SelectRoomInfo,
+    onRemoveRoom: (SelectRoomInfo) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -53,14 +53,12 @@ fun SelectedRoom(
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             CompositeAvatar(
-                avatarData = roomSummary.getAvatarData(size = AvatarSize.SelectedRoom),
-                heroes = roomSummary.heroes.map { user ->
-                    user.getAvatarData(size = AvatarSize.SelectedRoom)
-                }.toImmutableList()
+                avatarData = roomInfo.getAvatarData(AvatarSize.SelectedRoom),
+                heroes = roomInfo.heroes.map { it.getAvatarData(AvatarSize.SelectedRoom) }.toImmutableList(),
             )
             Text(
                 // If name is null, we do not have space to render "No room name", so just use `#` here.
-                text = roomSummary.name ?: "#",
+                text = roomInfo.name ?: "#",
                 overflow = TextOverflow.Ellipsis,
                 maxLines = 1,
                 style = MaterialTheme.typography.bodyLarge,
@@ -69,14 +67,14 @@ fun SelectedRoom(
         Surface(
             color = MaterialTheme.colorScheme.primary,
             modifier = Modifier
-                .clip(CircleShape)
-                .size(20.dp)
-                .align(Alignment.TopEnd)
-                .clickable(
-                    indication = ripple(),
-                    interactionSource = remember { MutableInteractionSource() },
-                    onClick = { onRemoveRoom(roomSummary) }
-                ),
+                    .clip(CircleShape)
+                    .size(20.dp)
+                    .align(Alignment.TopEnd)
+                    .clickable(
+                            indication = ripple(),
+                            interactionSource = remember { MutableInteractionSource() },
+                            onClick = { onRemoveRoom(roomInfo) }
+                    ),
         ) {
             Icon(
                 imageVector = CompoundIcons.Close(),
@@ -91,10 +89,10 @@ fun SelectedRoom(
 @PreviewsDayNight
 @Composable
 internal fun SelectedRoomPreview(
-    @PreviewParameter(RoomSummaryDetailsProvider::class) roomSummary: RoomSummary
+    @PreviewParameter(SelectRoomInfoProvider::class) roomInfo: SelectRoomInfo
 ) = ElementPreview {
     SelectedRoom(
-        roomSummary = roomSummary,
+        roomInfo = roomInfo,
         onRemoveRoom = {},
     )
 }

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

@@ -9,10 +9,10 @@ package io.element.android.libraries.matrix.ui.model
 
 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.roomlist.RoomSummary
+import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 
-fun RoomSummary.getAvatarData(size: AvatarSize) = AvatarData(
-    id = roomId.value,
+fun MatrixRoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
+    id = id.value,
     name = name,
     url = avatarUrl,
     size = size,

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.model
+
+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.user.MatrixUser
+import kotlinx.collections.immutable.ImmutableList
+
+data class SelectRoomInfo(
+    val roomId: RoomId,
+    val name: String?,
+    val canonicalAlias: RoomAlias?,
+    val avatarUrl: String?,
+    val heroes: ImmutableList<MatrixUser>,
+) {
+    fun getAvatarData(size: AvatarSize) = AvatarData(
+        id = roomId.value,
+        name = name,
+        url = avatarUrl,
+        size = size,
+    )
+}