From f95caea809208b6c11477c7efbe82f20d3bf8087 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 20 Dec 2024 10:15:40 +0100
Subject: [PATCH 1/2] 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<MediaViewerState>
                 )
             },
             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
                     )
                 }
             }

From 70d983ceaf837b1b184f26de6f3ee48aa5ed0c20 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Fri, 20 Dec 2024 09:28:11 +0000
Subject: [PATCH 2/2] Update screenshots

---
 ...libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
index 6b0463bba7..d94989c757 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77913c010877d13d82196182d32e19168e77102d2f245ab321c2224a7108768a
-size 21874
+oid sha256:d10cb9be5b5139f0fdfdfb11cc3d3eca1955297180e5db8142bfea6250f20d73
+size 25811