From a72ee95d48c22b5b41028a94bdc3a2ebf154c775 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 20 Dec 2024 10:15:40 +0100 Subject: [PATCH] Fix rendering issue in the toolbar. --- .../mediaviewer/impl/viewer/MediaViewerStateProvider.kt | 4 ++-- .../libraries/mediaviewer/impl/viewer/MediaViewerView.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt index 63c82be7ba..863c996b9d 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt @@ -41,8 +41,8 @@ open class MediaViewerStateProvider : PreviewParameterProvider ) }, aVideoMediaInfo( - senderName = "Sally Sanderson", - dateSent = "21 NOV, 2024", + senderName = "A very long name so that it will be truncated and will not be displayed on multiple lines", + dateSent = "A very very long date that will be truncated and will not be displayed on multiple lines", caption = "A caption", ).let { aMediaViewerState( diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt index d3347b9812..4a15f95cea 100644 --- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt +++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt @@ -336,11 +336,15 @@ private fun MediaViewerTopBar( text = senderName, style = ElementTheme.typography.fontBodyMdMedium, color = ElementTheme.colors.textPrimary, + maxLines = 1, + overflow = TextOverflow.Ellipsis, ) Text( text = dateSent, style = ElementTheme.typography.fontBodySmRegular, color = ElementTheme.colors.textPrimary, + maxLines = 1, + overflow = TextOverflow.Ellipsis ) } }