Skip to content

Commit 4c358ae

Browse files
authored
Merge pull request #5476 from element-hq/feature/fga/space_room_display_name
Space : makes sure to use SpaceRoom.displayName from sdk
2 parents 59ef782 + d73573f commit 4c358ae

File tree

29 files changed

+46
-90
lines changed

29 files changed

+46
-90
lines changed

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fun HomeSpacesView(
3939
is CurrentSpace.Space -> item {
4040
SpaceHeaderView(
4141
avatarData = space.spaceRoom.getAvatarData(AvatarSize.SpaceHeader),
42-
name = space.spaceRoom.name,
42+
name = space.spaceRoom.displayName,
4343
topic = space.spaceRoom.topic,
4444
visibility = space.spaceRoom.visibility,
4545
heroes = space.spaceRoom.heroes.toImmutableList(),

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,12 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
3030
roomId = RoomId("!spaceId1:example.com"),
3131
),
3232
aSpaceRoom(
33-
rawName = null,
3433
numJoinedMembers = 5,
3534
childrenCount = 10,
3635
worldReadable = true,
3736
avatarUrl = "anUrl",
3837
roomId = RoomId("!spaceId2:example.com"),
3938
state = CurrentUserMembership.INVITED,
4039
),
41-
aSpaceRoom(
42-
rawName = null,
43-
numJoinedMembers = 5,
44-
childrenCount = 10,
45-
worldReadable = true,
46-
avatarUrl = "anUrl",
47-
roomId = RoomId("!spaceId3:example.com"),
48-
state = CurrentUserMembership.INVITED,
49-
),
5040
)
5141
}

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fun RoomInfo.toInviteData(): InviteData {
4141
fun SpaceRoom.toInviteData(): InviteData {
4242
return InviteData(
4343
roomId = roomId,
44-
roomName = name ?: roomId.value,
44+
roomName = displayName,
4545
isDm = false,
4646
)
4747
}

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ private fun RoomPreviewInfo.toContentState(membershipDetails: RoomMembershipDeta
277277
private fun SpaceRoom.toContentState(): ContentState {
278278
return ContentState.Loaded(
279279
roomId = roomId,
280-
name = name,
280+
name = displayName,
281281
topic = topic,
282282
alias = canonicalAlias,
283283
numberOfMembers = numJoinedMembers.toLong(),

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class LeaveSpacePresenter(
129129
}
130130

131131
return LeaveSpaceState(
132-
spaceName = leaveSpaceRooms.dataOrNull()?.current?.spaceRoom?.name,
132+
spaceName = leaveSpaceRooms.dataOrNull()?.current?.spaceRoom?.displayName,
133133
isLastAdmin = leaveSpaceRooms.dataOrNull()?.current?.isLastAdmin == true,
134134
selectableSpaceRooms = selectableSpaceRooms,
135135
leaveSpaceAction = leaveSpaceAction.value,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
3030
persistentListOf(
3131
aSelectableSpaceRoom(
3232
spaceRoom = aSpaceRoom(
33-
rawName = "A long space name that should be truncated",
33+
displayName = "A long space name that should be truncated",
3434
worldReadable = true,
3535
),
3636
isLastAdmin = true,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,7 @@ private fun SpaceItem(
276276
Text(
277277
modifier = Modifier
278278
.padding(end = 16.dp),
279-
text = room.name ?: stringResource(
280-
if (room.isSpace) {
281-
CommonStrings.common_no_space_name
282-
} else {
283-
CommonStrings.common_no_room_name
284-
},
285-
),
279+
text = room.displayName,
286280
color = ElementTheme.colors.textPrimary,
287281
style = ElementTheme.typography.fontBodyLgMedium,
288282
maxLines = 1,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
3737
),
3838
aSpaceState(
3939
parentSpace = aSpaceRoom(
40-
rawName = null,
4140
numJoinedMembers = 5,
4241
childrenCount = 10,
4342
worldReadable = true,

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private fun SpaceViewContent(
132132
item {
133133
SpaceHeaderView(
134134
avatarData = currentSpace.getAvatarData(AvatarSize.SpaceHeader),
135-
name = currentSpace.name,
135+
name = currentSpace.displayName,
136136
topic = currentSpace.topic,
137137
visibility = currentSpace.visibility,
138138
heroes = currentSpace.heroes.toImmutableList(),
@@ -213,7 +213,7 @@ private fun SpaceViewTopBar(
213213
title = {
214214
if (currentSpace != null) {
215215
SpaceAvatarAndNameRow(
216-
name = currentSpace.name,
216+
name = currentSpace.displayName,
217217
avatarData = currentSpace.getAvatarData(AvatarSize.TimelineRoom),
218218
)
219219
}

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.junit.Test
2929
class LeaveSpacePresenterTest {
3030
private val aSpace = aSpaceRoom(
3131
roomId = A_SPACE_ID,
32-
rawName = A_SPACE_NAME,
32+
displayName = A_SPACE_NAME,
3333
)
3434

3535
@Test
@@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
198198
private fun aLeaveSpaceRoom(
199199
spaceRoom: SpaceRoom = aSpaceRoom(
200200
roomId = A_SPACE_ID,
201-
rawName = A_SPACE_NAME,
201+
displayName = A_SPACE_NAME,
202202
),
203203
isLastAdmin: Boolean = false,
204204
) = LeaveSpaceRoom(

0 commit comments

Comments
 (0)