Merge pull request #2061 from element-hq/feature/bma/doNotRenderRoomId

Do not render roomId

changelog.d/1970.bugfix

@@ -0,0 +1 @@
+Do not render `roomId` if the room has no canonical alias.

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt

@@ -25,7 +25,7 @@ enum class AvatarSize(val dp: Dp) {
     RoomHeader(96.dp),
     RoomListItem(52.dp),
 
-    ForwardRoomListItem(36.dp),
+    RoomSelectRoomListItem(36.dp),
 
     UserPreference(56.dp),
 

libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt

@@ -17,12 +17,12 @@
 package io.element.android.libraries.roomselect.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
+import io.element.android.libraries.roomselect.api.RoomSelectMode
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -47,7 +47,7 @@ open class RoomSelectStateProvider : PreviewParameterProvider<RoomSelectState> {
         )
 }
 
-fun aRoomSelectState(
+private fun aRoomSelectState(
     resultState: SearchBarResultState<ImmutableList<RoomSummaryDetails>> = SearchBarResultState.NotSearching(),
     query: String = "",
     isSearchActive: Boolean = false,
@@ -61,12 +61,16 @@ fun aRoomSelectState(
     eventSink = {}
 )
 
-internal fun aForwardMessagesRoomList() = persistentListOf(
+private fun aForwardMessagesRoomList() = persistentListOf(
     aRoomDetailsState(),
-    aRoomDetailsState(roomId = RoomId("!room2:domain"), canonicalAlias = "#element-x-room:matrix.org"),
+    aRoomDetailsState(
+        roomId = RoomId("!room2:domain"),
+        name = "Room with alias",
+        canonicalAlias = "#alias:example.org",
+    ),
 )
 
-fun aRoomDetailsState(
+private fun aRoomDetailsState(
     roomId: RoomId = RoomId("!room:domain"),
     name: String = "roomName",
     canonicalAlias: String? = null,

libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt

@@ -32,7 +32,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 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
@@ -41,7 +40,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.roomselect.api.RoomSelectMode
 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
@@ -57,11 +55,10 @@ import io.element.android.libraries.designsystem.theme.components.SearchBarResul
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
-import io.element.android.libraries.designsystem.theme.roomListRoomMessage
-import io.element.android.libraries.designsystem.theme.roomListRoomName
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.ui.components.SelectedRoom
+import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 
@@ -221,13 +218,12 @@ private fun RoomSummaryView(
             .heightIn(56.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        val roomAlias = summary.canonicalAlias ?: summary.roomId.value
         Avatar(
             avatarData = AvatarData(
-                id = roomAlias,
+                id = summary.roomId.value,
                 name = summary.name,
                 url = summary.avatarURLString,
-                size = AvatarSize.ForwardRoomListItem,
+                size = AvatarSize.RoomSelectRoomListItem,
             ),
         )
         Column(
@@ -239,18 +235,20 @@ private fun RoomSummaryView(
             Text(
                 style = ElementTheme.typography.fontBodyLgRegular,
                 text = summary.name,
-                color = MaterialTheme.roomListRoomName(),
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-            // Id
-            Text(
-                text = roomAlias,
-                color = MaterialTheme.roomListRoomMessage(),
-                style = ElementTheme.typography.fontBodySmRegular,
+                color = ElementTheme.colors.textPrimary,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
+            // Alias
+            summary.canonicalAlias?.let { alias ->
+                Text(
+                    text = alias,
+                    color = ElementTheme.colors.textSecondary,
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
         }
         RadioButton(selected = isSelected, onClick = { onSelection(summary) })
     }