Merge pull request #5476 from element-hq/feature/fga/space_room_display_name

Space : makes sure to use SpaceRoom.displayName from sdk

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt

@@ -39,7 +39,7 @@ fun HomeSpacesView(
             is CurrentSpace.Space -> item {
                 SpaceHeaderView(
                     avatarData = space.spaceRoom.getAvatarData(AvatarSize.SpaceHeader),
-                    name = space.spaceRoom.name,
+                    name = space.spaceRoom.displayName,
                     topic = space.spaceRoom.topic,
                     visibility = space.spaceRoom.visibility,
                     heroes = space.spaceRoom.heroes.toImmutableList(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt

@@ -30,7 +30,6 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             roomId = RoomId("!spaceId1:example.com"),
         ),
         aSpaceRoom(
-            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
@@ -38,14 +37,5 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             roomId = RoomId("!spaceId2:example.com"),
             state = CurrentUserMembership.INVITED,
         ),
-        aSpaceRoom(
-            rawName = null,
-            numJoinedMembers = 5,
-            childrenCount = 10,
-            worldReadable = true,
-            avatarUrl = "anUrl",
-            roomId = RoomId("!spaceId3:example.com"),
-            state = CurrentUserMembership.INVITED,
-        ),
     )
 }

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt

@@ -41,7 +41,7 @@ fun RoomInfo.toInviteData(): InviteData {
 fun SpaceRoom.toInviteData(): InviteData {
     return InviteData(
         roomId = roomId,
-        roomName = name ?: roomId.value,
+        roomName = displayName,
         isDm = false,
     )
 }

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

@@ -277,7 +277,7 @@ private fun RoomPreviewInfo.toContentState(membershipDetails: RoomMembershipDeta
 private fun SpaceRoom.toContentState(): ContentState {
     return ContentState.Loaded(
         roomId = roomId,
-        name = name,
+        name = displayName,
         topic = topic,
         alias = canonicalAlias,
         numberOfMembers = numJoinedMembers.toLong(),

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt

@@ -129,7 +129,7 @@ class LeaveSpacePresenter(
         }
 
         return LeaveSpaceState(
-            spaceName = leaveSpaceRooms.dataOrNull()?.current?.spaceRoom?.name,
+            spaceName = leaveSpaceRooms.dataOrNull()?.current?.spaceRoom?.displayName,
             isLastAdmin = leaveSpaceRooms.dataOrNull()?.current?.isLastAdmin == true,
             selectableSpaceRooms = selectableSpaceRooms,
             leaveSpaceAction = leaveSpaceAction.value,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt

@@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
                     persistentListOf(
                         aSelectableSpaceRoom(
                             spaceRoom = aSpaceRoom(
-                                rawName = "A long space name that should be truncated",
+                                displayName = "A long space name that should be truncated",
                                 worldReadable = true,
                             ),
                             isLastAdmin = true,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt

@@ -276,13 +276,7 @@ private fun SpaceItem(
             Text(
                 modifier = Modifier
                     .padding(end = 16.dp),
-                text = room.name ?: stringResource(
+                text = room.displayName,
-                    if (room.isSpace) {
-                        CommonStrings.common_no_space_name
-                    } else {
-                        CommonStrings.common_no_room_name
-                    },
-                ),
                 color = ElementTheme.colors.textPrimary,
                 style = ElementTheme.typography.fontBodyLgMedium,
                 maxLines = 1,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt

@@ -37,7 +37,6 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
             ),
             aSpaceState(
                 parentSpace = aSpaceRoom(
-                    rawName = null,
                     numJoinedMembers = 5,
                     childrenCount = 10,
                     worldReadable = true,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt

@@ -132,7 +132,7 @@ private fun SpaceViewContent(
             item {
                 SpaceHeaderView(
                     avatarData = currentSpace.getAvatarData(AvatarSize.SpaceHeader),
-                    name = currentSpace.name,
+                    name = currentSpace.displayName,
                     topic = currentSpace.topic,
                     visibility = currentSpace.visibility,
                     heroes = currentSpace.heroes.toImmutableList(),
@@ -213,7 +213,7 @@ private fun SpaceViewTopBar(
         title = {
             if (currentSpace != null) {
                 SpaceAvatarAndNameRow(
-                    name = currentSpace.name,
+                    name = currentSpace.displayName,
                     avatarData = currentSpace.getAvatarData(AvatarSize.TimelineRoom),
                 )
             }

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt

@@ -29,7 +29,7 @@ import org.junit.Test
 class LeaveSpacePresenterTest {
     private val aSpace = aSpaceRoom(
         roomId = A_SPACE_ID,
-        rawName = A_SPACE_NAME,
+        displayName = A_SPACE_NAME,
     )
 
     @Test
@@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
 private fun aLeaveSpaceRoom(
     spaceRoom: SpaceRoom = aSpaceRoom(
         roomId = A_SPACE_ID,
-        rawName = A_SPACE_NAME,
+        displayName = A_SPACE_NAME,
     ),
     isLastAdmin: Boolean = false,
 ) = LeaveSpaceRoom(

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt

@@ -52,7 +52,7 @@ class SpaceViewTest {
 
     @Test
     fun `clicking on a room name invokes the expected callback`() {
-        val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, rawName = A_ROOM_NAME)
+        val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, displayName = A_ROOM_NAME)
         val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
         ensureCalledOnceWithParam(aSpaceRoom) {
             rule.setSpaceView(

gradle/libs.versions.toml

@@ -167,7 +167,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.10.2"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.10.7"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt

@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class SpaceRoom(
     val rawName: String?,
+    val displayName: String,
     val avatarUrl: String?,
     val canonicalAlias: RoomAlias?,
     val childrenCount: Int,
@@ -36,16 +37,5 @@ data class SpaceRoom(
 ) {
     val isSpace = roomType == RoomType.Space
 
-    /**
-     * Temporary logic to compute a name for direct rooms with no name.
-     * This will be replaced by sdk logic in the future.
-     */
-    val name = if (rawName == null && isDirect == true && heroes.size == 1) {
-        val dmRecipient = heroes.first()
-        dmRecipient.displayName
-    } else {
-        rawName
-    }
-
     val visibility = SpaceRoomVisibility.fromJoinRule(joinRule)
 }

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

@@ -24,7 +24,8 @@ class SpaceRoomMapper {
             guestCanJoin = spaceRoom.guestCanJoin,
             heroes = spaceRoom.heroes.orEmpty().map { it.map() },
             joinRule = spaceRoom.joinRule?.map(),
-            rawName = spaceRoom.name,
+            rawName = spaceRoom.rawName,
+            displayName = spaceRoom.displayName,
             numJoinedMembers = spaceRoom.numJoinedMembers.toInt(),
             roomId = RoomId(spaceRoom.roomId),
             roomType = spaceRoom.roomType.map(),

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt

@@ -19,7 +19,8 @@ fun aRustSpaceRoom(
     roomId: RoomId = A_ROOM_ID,
     isDirect: Boolean = false,
     canonicalAlias: String? = null,
-    name: String? = null,
+    rawName: String? = null,
+    displayName: String = "",
     topic: String? = null,
     avatarUrl: String? = null,
     roomType: RoomType = RoomType.Space,
@@ -34,7 +35,8 @@ fun aRustSpaceRoom(
     roomId = roomId.value,
     isDirect = isDirect,
     canonicalAlias = canonicalAlias,
-    name = name,
+    rawName = rawName,
+    displayName = displayName,
     topic = topic,
     avatarUrl = avatarUrl,
     roomType = roomType,

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

@@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -76,8 +75,7 @@ fun SpaceRoomItemView(
         trailingAction = trailingAction,
     ) {
         NameAndIndicatorRow(
-            isSpace = spaceRoom.isSpace,
+            name = spaceRoom.displayName,
-            name = spaceRoom.name,
             showIndicator = showUnreadIndicator
         )
         Spacer(modifier = Modifier.height(1.dp))
@@ -92,7 +90,6 @@ fun SpaceRoomItemView(
                 modifier = Modifier.weight(1f),
                 style = ElementTheme.typography.fontBodyMdRegular,
                 text = info,
-                fontStyle = FontStyle.Italic.takeIf { spaceRoom.name == null },
                 color = ElementTheme.colors.textSecondary,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
@@ -138,8 +135,7 @@ private fun SubtitleRow(
 
 @Composable
 private fun NameAndIndicatorRow(
-    isSpace: Boolean,
+    name: String,
-    name: String?,
     showIndicator: Boolean,
     modifier: Modifier = Modifier,
 ) {
@@ -151,8 +147,7 @@ private fun NameAndIndicatorRow(
         Text(
             modifier = Modifier.weight(1f),
             style = ElementTheme.typography.fontBodyLgMedium,
-            text = name ?: stringResource(id = if (isSpace) CommonStrings.common_no_space_name else CommonStrings.common_no_room_name),
+            text = name,
-            fontStyle = FontStyle.Italic.takeIf { name == null },
             color = ElementTheme.colors.textPrimary,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis

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

@@ -18,17 +18,16 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
     override val values: Sequence<SpaceRoom> = sequenceOf(
         aSpaceRoom(
             roomType = RoomType.Room,
-            rawName = "Room name with topic",
+            displayName = "Room name with topic",
             topic = "Room topic that is quite long and might be truncated"
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            rawName = "Room name no topic",
+            displayName = "Room name no topic",
             state = CurrentUserMembership.LEFT,
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            rawName = null,
             isDirect = true,
             heroes = listOf(aMatrixUser(displayName = "Alice")),
             state = CurrentUserMembership.JOINED,
@@ -36,13 +35,13 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            rawName = "Room name with topic",
+            displayName = "Room name with topic",
             topic = "Room topic that is quite long and might be truncated",
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            rawName = "Room name no topic",
+            displayName = "Room name no topic",
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
@@ -60,7 +59,6 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.LEFT,
         ),
         aSpaceRoom(
-            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
@@ -68,14 +66,5 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             roomId = RoomId("!spaceId2:example.com"),
             state = CurrentUserMembership.INVITED,
         ),
-        aSpaceRoom(
-            rawName = null,
-            numJoinedMembers = 5,
-            childrenCount = 10,
-            worldReadable = true,
-            avatarUrl = "anUrl",
-            roomId = RoomId("!spaceId3:example.com"),
-            state = CurrentUserMembership.INVITED,
-        ),
     )
 }

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

@@ -20,7 +20,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 
 fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(
     id = roomId.value,
-    name = name,
+    name = displayName,
     url = avatarUrl,
     size = size,
 )

libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 fun aSpaceRoom(
-    rawName: String? = "Space name",
+    rawName: String? = null,
+    displayName: String = "Space name",
     avatarUrl: String? = null,
     canonicalAlias: RoomAlias? = null,
     childrenCount: Int = 0,
@@ -33,6 +34,7 @@ fun aSpaceRoom(
     via: List<String> = emptyList(),
 ) = SpaceRoom(
     rawName = rawName,
+    displayName = displayName,
     avatarUrl = avatarUrl,
     canonicalAlias = canonicalAlias,
     childrenCount = childrenCount,

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec84bcc989b8f80e7e025e6d081dfe64165468f3298c3fb5ccd4a75211a4f7bb
+oid sha256:a6cee41aea25e78f820acf98f01722062ab8247dcc78652b8ac9a27e60f24249
-size 118364
+size 88723

tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49764c59842a7d3ef7ad9c552bb22e1602c273b0b21f4bc0d9ba79b4942bafe3
+oid sha256:5a56da5b32b6ee1ec6c21ec4a24420c219f1318b632fd91bb5e2d8e8d29f2b59
-size 116100
+size 86985

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:773eb018763a4f19f494043495a60636b5ef1c5fee5c94df7e2e545287725b06
+oid sha256:79d880a890173c6af166139e29b115d2bf658e75f18868137616af05f4db586d
-size 23111
+size 20647

tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7266aeb27353112291ef11d80732eae25ae5c936404af13a99c4572d30bae6a0
+oid sha256:c9f4963aa89b1f9811793f50033b004cb5659f7c91d6f16d5204e932c29b9d0a
-size 22670
+size 20271

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0145025b77b028a27a4f3dfc9e14a42faa26c55e056464f4b93b2513b16a699d
+oid sha256:a9aa3aa6fd58dbba3db9e568773770397dcb4a2a7ea4c4cf61b762a0c6ef513a
-size 9027
+size 10631

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef19b16146a20517f04e4fa516b2d48af8cacfb5d6f69aacc308656a883765be
+oid sha256:0f5425b12bc2902847c5b3b7e4b4e727e2e67f9a776cbf059ca6ba4777f81696
-size 39808
+size 38569

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef19b16146a20517f04e4fa516b2d48af8cacfb5d6f69aacc308656a883765be
-size 39808

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8454b2a9f7959ff981b5fee1b49926d3e22f7255ebadaa15731e494d2416d4c
+oid sha256:63dfdaf33475bcbf6c0c001b6c62c14fcbc5e84cf9d7f55c4b082dc359fbd7ea
-size 8930
+size 10515

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46fe78468ca13402a6cc78f2420ba72b8c5fe13a442e4e424c68eb74362acccb
+oid sha256:2b55a103be0ad883d0aaf31cceac1a5b33f1923dc4d96778c261ce98e5b0d435
-size 38488
+size 37334

tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46fe78468ca13402a6cc78f2420ba72b8c5fe13a442e4e424c68eb74362acccb
-size 38488