Merge pull request #5468 from element-hq/feature/fga/space_tweaks

Spaces : some tweaks around ui

Author: ganfra

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

@@ -33,22 +33,17 @@ fun HomeSpacesView(
         when (space) {
             CurrentSpace.Root -> {
                 item {
-                    SpaceHeaderRootView(
-                        numberOfSpaces = state.spaceRooms.size,
-                        // TODO
-                        numberOfRooms = 0,
-                    )
+                    SpaceHeaderRootView(numberOfSpaces = state.spaceRooms.size)
                 }
             }
             is CurrentSpace.Space -> item {
                 SpaceHeaderView(
                     avatarData = space.spaceRoom.getAvatarData(AvatarSize.SpaceHeader),
                     name = space.spaceRoom.name,
                     topic = space.spaceRoom.topic,
-                    joinRule = space.spaceRoom.joinRule,
+                    visibility = space.spaceRoom.visibility,
                     heroes = space.spaceRoom.heroes.toImmutableList(),
                     numberOfMembers = space.spaceRoom.numJoinedMembers,
-                    numberOfRooms = space.spaceRoom.childrenCount,
                 )
             }
         }

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

@@ -30,7 +30,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             roomId = RoomId("!spaceId1:example.com"),
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
@@ -39,7 +39,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,

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

@@ -74,7 +74,7 @@ import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.theme.placeholderBackground
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
-import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.ui.components.SpaceInfoRow
 import io.element.android.libraries.matrix.ui.components.SpaceMembersView
 import io.element.android.libraries.matrix.ui.model.InviteSender
@@ -567,10 +567,7 @@ private fun DefaultLoadedContent(
         subtitle = {
             when {
                 contentState.details is LoadedDetails.Space -> {
-                    SpaceInfoRow(
-                        joinRule = contentState.joinRule ?: JoinRule.Public,
-                        numberOfRooms = contentState.details.childrenCount,
-                    )
+                    SpaceInfoRow(visibility = SpaceRoomVisibility.fromJoinRule(contentState.joinRule))
                 }
                 contentState.alias != null -> {
                     RoomPreviewSubtitleAtom(contentState.alias.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(
-                                name = "A long space name that should be truncated",
+                                rawName = "A long space name that should be truncated",
                                 worldReadable = true,
                             ),
                             isLastAdmin = true,

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

@@ -13,8 +13,10 @@ import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInvit
 import io.element.android.libraries.architecture.AsyncAction
 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.join.JoinRule
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.previewutils.room.aSpaceRoom
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toImmutableSet
@@ -25,7 +27,17 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
             aSpaceState(),
             aSpaceState(
                 parentSpace = aSpaceRoom(
-                    name = null,
+                    joinRule = JoinRule.Public
+                )
+            ),
+            aSpaceState(
+                parentSpace = aSpaceRoom(
+                    joinRule = JoinRule.Restricted(persistentListOf())
+                )
+            ),
+            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

@@ -134,10 +134,9 @@ private fun SpaceViewContent(
                     avatarData = currentSpace.getAvatarData(AvatarSize.SpaceHeader),
                     name = currentSpace.name,
                     topic = currentSpace.topic,
-                    joinRule = currentSpace.joinRule,
+                    visibility = currentSpace.visibility,
                     heroes = currentSpace.heroes.toImmutableList(),
                     numberOfMembers = currentSpace.numJoinedMembers,
-                    numberOfRooms = currentSpace.childrenCount,
                 )
             }
         }

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,
-        name = A_SPACE_NAME,
+        rawName = A_SPACE_NAME,
     )
 
     @Test
@@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
 private fun aLeaveSpaceRoom(
     spaceRoom: SpaceRoom = aSpaceRoom(
         roomId = A_SPACE_ID,
-        name = A_SPACE_NAME,
+        rawName = 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, name = A_ROOM_NAME)
+        val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, rawName = A_ROOM_NAME)
         val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
         ensureCalledOnceWithParam(aSpaceRoom) {
             rule.setSpaceView(

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

@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class SpaceRoom(
-    val name: String?,
+    val rawName: String?,
     val avatarUrl: String?,
     val canonicalAlias: RoomAlias?,
     val childrenCount: Int,
@@ -32,6 +32,20 @@ data class SpaceRoom(
      * The via parameters of the room.
      */
     val via: List<String>,
+    val isDirect: Boolean?,
 ) {
     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/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.spaces
+
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.matrix.api.room.join.JoinRule
+@Immutable
+sealed interface SpaceRoomVisibility {
+    data object Private : SpaceRoomVisibility
+    data object Public : SpaceRoomVisibility
+    data object Restricted : SpaceRoomVisibility
+
+    companion object {
+        fun fromJoinRule(joinRule: JoinRule?): SpaceRoomVisibility = when (joinRule) {
+            JoinRule.Public -> Public
+            is JoinRule.Restricted, is JoinRule.KnockRestricted -> Restricted
+            // Else fallback to Private
+            else -> Private
+        }
+    }
+}