From 1c819e5774eddf0b8b66c94c1abd369f682a8638 Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 6 Oct 2025 16:17:02 +0200 Subject: [PATCH] feature(space): introduce SpaceRoomVisibility and remove room count --- .../home/impl/spaces/HomeSpacesView.kt | 9 +--- .../features/joinroom/impl/JoinRoomView.kt | 7 +-- .../space/impl/root/SpaceStateProvider.kt | 12 +++++ .../features/space/impl/root/SpaceView.kt | 3 +- .../libraries/matrix/api/spaces/SpaceRoom.kt | 2 + .../matrix/api/spaces/SpaceRoomVisibility.kt | 26 ++++++++++ .../ui/components/SpaceHeaderRootView.kt | 4 +- .../matrix/ui/components/SpaceHeaderView.kt | 15 ++---- .../matrix/ui/components/SpaceInfoRow.kt | 49 +++++++---------- .../matrix/ui/components/SpaceRoomItemView.kt | 52 ++++++++----------- .../matrix/ui/model/SpaceExtension.kt | 28 ++++++++++ .../src/main/res/values/localazy.xml | 3 ++ 12 files changed, 122 insertions(+), 88 deletions(-) create mode 100644 libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt index 36e0bbc56a..09604c0d94 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt @@ -33,11 +33,7 @@ fun HomeSpacesView( when (space) { CurrentSpace.Root -> { item { - SpaceHeaderRootView( - numberOfSpaces = state.spaceRooms.size, - // TODO - numberOfRooms = 0, - ) + SpaceHeaderRootView(numberOfSpaces = state.spaceRooms.size) } } is CurrentSpace.Space -> item { @@ -45,10 +41,9 @@ fun HomeSpacesView( 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, ) } } diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt index 6da7aadfe7..38d084c7d3 100644 --- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt +++ b/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) diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt index 4f9ec4c561..b165e9d9ca 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt +++ b/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 @@ -23,6 +25,16 @@ open class SpaceStateProvider : PreviewParameterProvider { override val values: Sequence get() = sequenceOf( aSpaceState(), + aSpaceState( + parentSpace = aSpaceRoom( + joinRule = JoinRule.Public + ) + ), + aSpaceState( + parentSpace = aSpaceRoom( + joinRule = JoinRule.Restricted(persistentListOf()) + ) + ), aSpaceState( parentSpace = aSpaceRoom( rawName = null, diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt index 25d4e69b9c..a4615ffc9d 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt +++ b/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, ) } } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt index c06bbcc723..587cfbcab1 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt @@ -46,4 +46,6 @@ data class SpaceRoom( } else { rawName } + + val visibility = SpaceRoomVisibility.fromJoinRule(joinRule) } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt new file mode 100644 index 0000000000..98afa1d508 --- /dev/null +++ b/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 + } + } +} diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt index 22ef102946..9f41171dd9 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt +++ b/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, ) } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt index 6dbe7ebf72..e59049f9f2 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt +++ b/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, 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, ) } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt index 3d973d97ae..d0d14bcdd4 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt +++ b/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 ) } } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt index 1abf0ad95e..2477dd89fd 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt +++ b/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 } } diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt index e4b056fdea..779f813aba 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt +++ b/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) + } + } diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 527745898a..9b254127ee 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -94,6 +94,7 @@ "Forgot password?" "Forward" "Go back" + "Go to settings" "Ignore" "Invite" "Invite people" @@ -319,6 +320,7 @@ Reason: %1$s." "Settings" "Share space" "Shared location" + "Shared space" "Signing out" "Something went wrong" "We encountered an issue. Please try again." @@ -427,6 +429,7 @@ Are you sure you want to continue?" "Remove %1$s" "Settings" "Enable thread replies" + "Restarting the app is required to apply changes" "Try out our latest ideas in development. These features are not finalised; they may be unstable, may change." "Feeling experimental?" "Labs"