feature(space): use SpaceRoom.displayName from sdk

This commit is contained in:
ganfra
2025-10-07 20:15:46 +02:00
parent 365116a40a
commit dde6dd0ed5
9 changed files with 11 additions and 33 deletions

View File

@@ -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(),

View File

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

View File

@@ -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(),

View File

@@ -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,

View File

@@ -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,

View File

@@ -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),
)
}