feature(space): introduce SpaceRoomVisibility and remove room count

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

@@ -31,7 +31,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SpaceHeaderRootView(
     numberOfSpaces: Int,
-    numberOfRooms: Int,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -52,7 +51,7 @@ fun SpaceHeaderRootView(
         )
         SpaceInfoRow(
             leftText = numberOfSpaces(numberOfSpaces),
-            rightText = numberOfRooms(numberOfRooms),
+            rightText = null,
         )
         Text(
             text = stringResource(CommonStrings.screen_space_list_description),
@@ -68,6 +67,5 @@ fun SpaceHeaderRootView(
 internal fun SpaceHeaderRootViewPreview() = ElementPreview {
     SpaceHeaderRootView(
         numberOfSpaces = 3,
-        numberOfRooms = 10,
     )
 }

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

@@ -24,7 +24,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-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.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
@@ -38,10 +38,9 @@ fun SpaceHeaderView(
     avatarData: AvatarData,
     name: String?,
     topic: String?,
-    joinRule: JoinRule?,
+    visibility: SpaceRoomVisibility,
     heroes: ImmutableList<MatrixUser>,
     numberOfMembers: Int,
-    numberOfRooms: Int,
     modifier: Modifier = Modifier,
     topicMaxLines: Int = Int.MAX_VALUE,
 ) {
@@ -64,12 +63,7 @@ fun SpaceHeaderView(
             }
         },
         subtitle = {
-            if (joinRule != null) {
-                SpaceInfoRow(
-                    joinRule = joinRule,
-                    numberOfRooms = numberOfRooms,
-                )
-            }
+            SpaceInfoRow(visibility = visibility)
         },
         description = if (topic.isNullOrBlank()) {
             null
@@ -97,7 +91,7 @@ internal fun SpaceHeaderViewPreview() = ElementPreview {
         name = "Space name",
         topic = "Space topic: " + LoremIpsum(40).values.first(),
         topicMaxLines = 2,
-        joinRule = JoinRule.Public,
+        visibility = SpaceRoomVisibility.Public,
         heroes = persistentListOf(
             aMatrixUser(id = "@1:d", displayName = "Alice", avatarUrl = "aUrl"),
             aMatrixUser(id = "@2:d", displayName = "Bob"),
@@ -105,6 +99,5 @@ internal fun SpaceHeaderViewPreview() = ElementPreview {
             aMatrixUser(id = "@4:d", displayName = "Dave"),
         ),
         numberOfMembers = 999,
-        numberOfRooms = 10,
     )
 }

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

@@ -27,14 +27,16 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
-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.model.icon
+import io.element.android.libraries.matrix.ui.model.label
 import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun SpaceInfoRow(
     leftText: String,
-    rightText: String,
+    rightText: String?,
     modifier: Modifier = Modifier,
     iconVector: ImageVector? = null,
 ) {
@@ -51,7 +53,11 @@ fun SpaceInfoRow(
                 tint = ElementTheme.colors.iconTertiary,
             )
         }
-        val text = stringResource(id = CommonStrings.screen_space_list_details, leftText, rightText)
+        val text = if (rightText != null) {
+            stringResource(id = CommonStrings.screen_space_list_details, leftText, rightText)
+        } else {
+            leftText
+        }
         Text(
             text = text,
             style = ElementTheme.typography.fontBodyLgRegular,
@@ -63,34 +69,14 @@ fun SpaceInfoRow(
 
 @Composable
 fun SpaceInfoRow(
-    joinRule: JoinRule,
-    numberOfRooms: Int,
+    visibility: SpaceRoomVisibility,
     modifier: Modifier = Modifier,
 ) {
-    val (leftText, rightText, icon) = when (joinRule) {
-        JoinRule.Public -> Triple(
-            stringResource(id = CommonStrings.common_public_space),
-            numberOfRooms(numberOfRooms),
-            CompoundIcons.Public(),
-        )
-        // TODO External space
-        // JoinRule.Private -> Triple(
-        //     stringResource(id = CommonStrings.common_external_space),
-        //     numberOfRooms(numberOfRooms),
-        //     CompoundIcons.Guest(),
-        // )
-        // JoinRule.Private,
-        else -> Triple(
-            stringResource(id = CommonStrings.common_private_space),
-            numberOfRooms(numberOfRooms),
-            CompoundIcons.Lock(),
-        )
-    }
     SpaceInfoRow(
-        leftText = leftText,
-        rightText = rightText,
+        leftText = visibility.label,
+        rightText = null,
         modifier = modifier,
-        iconVector = icon,
+        iconVector = visibility.icon,
     )
 }
 
@@ -124,12 +110,13 @@ internal fun SpaceInfoRowPreview() = ElementPreview {
             iconVector = CompoundIcons.Workspace(),
         )
         SpaceInfoRow(
-            joinRule = JoinRule.Private,
-            numberOfRooms = 4,
+            visibility = SpaceRoomVisibility.Private,
         )
         SpaceInfoRow(
-            joinRule = JoinRule.Public,
-            numberOfRooms = 10,
+            visibility = SpaceRoomVisibility.Public
+        )
+        SpaceInfoRow(
+            visibility = SpaceRoomVisibility.Restricted
         )
     }
 }

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

@@ -34,7 +34,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.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.atomic.molecules.InviteButtonsRowMolecule
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -48,9 +47,11 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.unreadIndicator
 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.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.matrix.ui.model.icon
+import io.element.android.libraries.matrix.ui.model.label
 import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -117,8 +118,8 @@ private fun SubtitleRow(
         if (visibilityIcon != null) {
             Icon(
                 modifier = Modifier
-                    .size(16.dp)
-                    .padding(end = 4.dp),
+                        .size(16.dp)
+                        .padding(end = 4.dp),
                 imageVector = visibilityIcon,
                 contentDescription = null,
                 tint = ElementTheme.colors.iconTertiary,
@@ -176,20 +177,20 @@ private fun SpaceRoomItemScaffold(
     content: @Composable ColumnScope.() -> Unit,
 ) {
     val clickModifier = Modifier
-        .combinedClickable(
-            onClick = onClick,
-            onLongClick = onLongClick,
-            onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
-            indication = ripple(),
-            interactionSource = remember { MutableInteractionSource() }
-        )
-        .onKeyboardContextMenuAction { onLongClick }
+            .combinedClickable(
+                    onClick = onClick,
+                    onLongClick = onLongClick,
+                    onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                    indication = ripple(),
+                    interactionSource = remember { MutableInteractionSource() }
+            )
+            .onKeyboardContextMenuAction { onLongClick }
     Row(
         modifier = modifier
-            .fillMaxWidth()
-            .then(clickModifier)
-            .padding(horizontal = 16.dp, vertical = 8.dp)
-            .height(IntrinsicSize.Min),
+                .fillMaxWidth()
+                .then(clickModifier)
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .height(IntrinsicSize.Min),
     ) {
         Avatar(
             avatarData = avatarData,
@@ -212,11 +213,7 @@ private fun SpaceRoomItemScaffold(
 @ReadOnlyComposable
 private fun SpaceRoom.subtitle(): String {
     return if (isSpace) {
-        if (joinRule == JoinRule.Public) {
-            stringResource(CommonStrings.common_public_space)
-        } else {
-            stringResource(CommonStrings.common_private_space)
-        }
+        visibility.label
     } else {
         pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers)
     }
@@ -226,11 +223,7 @@ private fun SpaceRoom.subtitle(): String {
 @ReadOnlyComposable
 private fun SpaceRoom.info(): String {
     return if (isSpace) {
-        stringResource(
-            CommonStrings.screen_space_list_details,
-            pluralStringResource(CommonPlurals.common_rooms, childrenCount, childrenCount),
-            pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers),
-        )
+        pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers)
     } else {
         topic.orEmpty()
     }
@@ -238,10 +231,11 @@ private fun SpaceRoom.info(): String {
 
 @Composable
 private fun SpaceRoom.visibilityIcon(): ImageVector? {
-    return if (joinRule == JoinRule.Public) {
-        CompoundIcons.Public()
+    // Don't show any icon for restricted rooms as it's the default and would add noise
+    return if (visibility == SpaceRoomVisibility.Restricted) {
+        null
     } else {
-        CompoundIcons.LockSolid()
+        visibility.icon
     }
 }
 

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

@@ -7,9 +7,16 @@
 
 package io.element.android.libraries.matrix.ui.model
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import io.element.android.compound.tokens.generated.CompoundIcons
 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.spaces.SpaceRoom
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
+import io.element.android.libraries.ui.strings.CommonStrings
 
 fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(
     id = roomId.value,
@@ -17,3 +24,24 @@ fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(
     url = avatarUrl,
     size = size,
 )
+
+val SpaceRoomVisibility.icon: ImageVector
+    @Composable
+    get() {
+        return when (this) {
+            SpaceRoomVisibility.Private -> CompoundIcons.LockSolid()
+            SpaceRoomVisibility.Public -> CompoundIcons.Public()
+            SpaceRoomVisibility.Restricted -> CompoundIcons.Workspace()
+        }
+    }
+
+val SpaceRoomVisibility.label: String
+    @Composable
+    @ReadOnlyComposable
+    get() {
+        return when (this) {
+            SpaceRoomVisibility.Private -> stringResource(CommonStrings.common_private_space)
+            SpaceRoomVisibility.Public -> stringResource(CommonStrings.common_public_space)
+            SpaceRoomVisibility.Restricted -> stringResource(CommonStrings.common_shared_space)
+        }
+    }