From da414b625ea35a89f71c73766c2b4dc1fdd2475d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 3 Apr 2025 17:11:23 +0200 Subject: [PATCH] Remove alias from room invite item (#4531) * Remove the potential room alias from invitation cells * Update screenshots --------- Co-authored-by: ElementBot --- .../features/roomlist/impl/components/RoomSummaryRow.kt | 6 ++---- ...es.roomlist.impl.components_RoomSummaryRow_Day_29_en.png | 4 ++-- ....roomlist.impl.components_RoomSummaryRow_Night_29_en.png | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt index 0fbd4d38fe..9ce03ab4cc 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt @@ -57,7 +57,6 @@ import io.element.android.libraries.designsystem.theme.roomListRoomMessage import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate import io.element.android.libraries.designsystem.theme.roomListRoomName import io.element.android.libraries.designsystem.theme.unreadIndicator -import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.matrix.ui.components.InviteSenderView import io.element.android.libraries.matrix.ui.model.InviteSender @@ -87,7 +86,7 @@ internal fun RoomSummaryRow( }, ) { InviteNameAndIndicatorRow(name = room.name) - InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender, canonicalAlias = room.canonicalAlias) + InviteSubtitle(isDm = room.isDm, inviteSender = room.inviteSender) if (!room.isDm && room.inviteSender != null) { Spacer(modifier = Modifier.height(4.dp)) InviteSenderView( @@ -232,13 +231,12 @@ private fun NameAndTimestampRow( private fun InviteSubtitle( isDm: Boolean, inviteSender: InviteSender?, - canonicalAlias: RoomAlias?, modifier: Modifier = Modifier ) { val subtitle = if (isDm) { inviteSender?.userId?.value } else { - canonicalAlias?.value + null } if (subtitle != null) { Text( diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Day_29_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Day_29_en.png index 96d500520c..9c35c6a4d6 100644 --- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Day_29_en.png +++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Day_29_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe7856a003131918100d8ce3da0e879f7c8d63de64e1b5889327738cb7a8f2f2 -size 23128 +oid sha256:f8f5508fc0509afed78f4259037c1f886b9c872d581756db947a11e688248c5a +size 20623 diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Night_29_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Night_29_en.png index 9287673872..8369441179 100644 --- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Night_29_en.png +++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Night_29_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e45e0dc5de85736bdbb3221f26c1cae3af78dd63acf0208fd12e023d91fa70e7 -size 23183 +oid sha256:480a8c2cb0c3ef6d30125cae576d9737b69b3ee55b8d0cb761562098c784ca83 +size 20476