Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature(space): use SpaceRoom.displayName from sdk

Browse source
This commit is contained in:
ganfra 2025-10-07 20:15:46 +02:00
parent d475d948d6
commit 44c6ce01dc
9 changed files with 11 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
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,

8
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
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,

4
features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
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),
)
}