From eaeebf9e75bcbc07cb241583b0aebd6cbc9b165a Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Mon, 29 Apr 2024 19:26:58 +0200 Subject: [PATCH] User display name overflows in timeline messages (#2767) * User display name overflows in timeline messages * Update screenshots --------- Co-authored-by: ElementBot --- changelog.d/2761.bugfix | 1 + .../android/features/messages/impl/sender/SenderName.kt | 2 ++ .../messages/impl/timeline/components/TimelineItemEventRow.kt | 1 + ...elineItemEventRowLongSenderName_0_null,NEXUS_5,1.0,en].png | 4 ++-- ...ll_TimelineItemEventRow-Day-17_17_null,NEXUS_5,1.0,en].png | 4 ++-- ..._TimelineItemEventRow-Night-17_18_null,NEXUS_5,1.0,en].png | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 changelog.d/2761.bugfix diff --git a/changelog.d/2761.bugfix b/changelog.d/2761.bugfix new file mode 100644 index 0000000000..d5afb55597 --- /dev/null +++ b/changelog.d/2761.bugfix @@ -0,0 +1 @@ +User display name overflows in timeline messages when it's way too long. diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/sender/SenderName.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/sender/SenderName.kt index 5142c00bdf..9daa95198e 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/sender/SenderName.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/sender/SenderName.kt @@ -93,6 +93,7 @@ private fun RowScope.MainText( text = text, style = style, color = color, + maxLines = 1, overflow = TextOverflow.Ellipsis, ) } @@ -117,6 +118,7 @@ private fun RowScope.SecondaryText( text = text, style = style, color = MaterialTheme.colorScheme.secondary, + maxLines = 1, overflow = TextOverflow.Ellipsis, ) } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt index b5c60bb2af..716474de26 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt @@ -701,6 +701,7 @@ internal fun TimelineItemEventRowPreview() = ElementPreview { sequenceOf(false, true).forEach { isMine -> ATimelineItemEventRow( event = aTimelineItemEvent( + senderDisplayName = "Sender with a super long name that should ellipsize", isMine = isMine, content = aTimelineItemTextContent().copy( body = "A long text which will be displayed on several lines and" + diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_null_TimelineItemEventRowLongSenderName_0_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_null_TimelineItemEventRowLongSenderName_0_null,NEXUS_5,1.0,en].png index 680eb66108..b9ae14e82a 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_null_TimelineItemEventRowLongSenderName_0_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_null_TimelineItemEventRowLongSenderName_0_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d509d8fb7fe67e7ee2e04794608f5e4c9b1ec5ea309384ca25eaa0600416be5f -size 23064 +oid sha256:777209b58d18b92e86d4ac90cb741d477793caa84bb1b2b19a3b459675bae244 +size 18276 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Day-17_17_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Day-17_17_null,NEXUS_5,1.0,en].png index 2d6f419f93..31c731f020 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Day-17_17_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Day-17_17_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38d438ae9245b5e7819c3f8c741f89b395956fbb357ddf7570bc457a88a36739 -size 183329 +oid sha256:6a221ada168ff38af4e6227170ed42e3765d7fdc99f410f72a30680f006cd7f7 +size 187751 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Night-17_18_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Night-17_18_null,NEXUS_5,1.0,en].png index 84ef400fc4..b442b8d2fb 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Night-17_18_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_TimelineItemEventRow_null_TimelineItemEventRow-Night-17_18_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf66a1b76b39b8055875344db3aee4a638df738cb8f6991b55f057c7da05a1be -size 180936 +oid sha256:57f411b632ea16f41e56eefbc6f37059f8053469fecfa4f5aaccc6edd467c10b +size 185075