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

Remove alias from room invite item (#4531)

Browse source 
* Remove the potential room alias from invitation cells

* Update screenshots

---------

Co-authored-by: ElementBot <android@element.io>
This commit is contained in:
Benoit Marty 2025-04-03 17:11:23 +02:00 • committed by GitHub
parent 8639adb7b9
commit da414b625e
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
View file

@ -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.roomListRoomMessageDate
import io.element.android.libraries.designsystem.theme.roomListRoomName import io.element.android.libraries.designsystem.theme.roomListRoomName
import io.element.android.libraries.designsystem.theme.unreadIndicator 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.api.room.RoomNotificationMode
import io.element.android.libraries.matrix.ui.components.InviteSenderView import io.element.android.libraries.matrix.ui.components.InviteSenderView
import io.element.android.libraries.matrix.ui.model.InviteSender import io.element.android.libraries.matrix.ui.model.InviteSender
@ -87,7 +86,7 @@ internal fun RoomSummaryRow(
}, },
) { ) {
InviteNameAndIndicatorRow(name = room.name) 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) { if (!room.isDm && room.inviteSender != null) {
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
InviteSenderView( InviteSenderView(
@ -232,13 +231,12 @@ private fun NameAndTimestampRow(
private fun InviteSubtitle( private fun InviteSubtitle(
isDm: Boolean, isDm: Boolean,
inviteSender: InviteSender?, inviteSender: InviteSender?,
canonicalAlias: RoomAlias?,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val subtitle = if (isDm) { val subtitle = if (isDm) {
inviteSender?.userId?.value inviteSender?.userId?.value
} else { } else {
canonicalAlias?.value null
} }
if (subtitle != null) { if (subtitle != null) {
Text( Text(

4
tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Day_29_en.png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:fe7856a003131918100d8ce3da0e879f7c8d63de64e1b5889327738cb7a8f2f2 oid sha256:f8f5508fc0509afed78f4259037c1f886b9c872d581756db947a11e688248c5a
size 23128 size 20623

4
tests/uitests/src/test/snapshots/images/features.roomlist.impl.components_RoomSummaryRow_Night_29_en.png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e45e0dc5de85736bdbb3221f26c1cae3af78dd63acf0208fd12e023d91fa70e7 oid sha256:480a8c2cb0c3ef6d30125cae576d9737b69b3ee55b8d0cb761562098c784ca83
size 23183 size 20476