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 09604c0d94..b18e732b42 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 @@ -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(), diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt index fa296edc1c..9f826ac228 100644 --- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt +++ b/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, ) } diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt index f7e154acf0..89ff702c1a 100644 --- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt +++ b/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(), diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt index ffaca68a67..31271104a3 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt +++ b/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, diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt index ebf4bd178a..9c8f13405a 100644 --- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt +++ b/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( - if (room.isSpace) { - CommonStrings.common_no_space_name - } else { - CommonStrings.common_no_room_name - }, - ), + text = room.displayName, color = ElementTheme.colors.textPrimary, style = ElementTheme.typography.fontBodyLgMedium, maxLines = 1, 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 a4615ffc9d..ad2a34a848 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 @@ -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), ) } 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 09ec316ffb..64ac04fedd 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 @@ -37,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) } 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 2477dd89fd..e1bff25538 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 @@ -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.name, + name = spaceRoom.displayName, 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), - fontStyle = FontStyle.Italic.takeIf { name == null }, + text = name, color = ElementTheme.colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis 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 779f813aba..1c3111a2a2 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 @@ -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, )