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

Merge pull request #4075 from element-hq/feature/bma/galleryFix

Browse source 
Fix rendering issue in the toolbar.
This commit is contained in:
Benoit Marty 2024-12-20 10:40:04 +01:00 • committed by GitHub
commit e44672a403
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt
View file

@ -41,8 +41,8 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
) )
}, },
aVideoMediaInfo( aVideoMediaInfo(
senderName = "Sally Sanderson", senderName = "A very long name so that it will be truncated and will not be displayed on multiple lines",
dateSent = "21 NOV, 2024", dateSent = "A very very long date that will be truncated and will not be displayed on multiple lines",
caption = "A caption", caption = "A caption",
).let { ).let {
aMediaViewerState( aMediaViewerState(

4
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
View file

@ -336,11 +336,15 @@ private fun MediaViewerTopBar(
text = senderName, text = senderName,
style = ElementTheme.typography.fontBodyMdMedium, style = ElementTheme.typography.fontBodyMdMedium,
color = ElementTheme.colors.textPrimary, color = ElementTheme.colors.textPrimary,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
) )
Text( Text(
text = dateSent, text = dateSent,
style = ElementTheme.typography.fontBodySmRegular, style = ElementTheme.typography.fontBodySmRegular,
color = ElementTheme.colors.textPrimary, color = ElementTheme.colors.textPrimary,
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
} }

4
tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_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:77913c010877d13d82196182d32e19168e77102d2f245ab321c2224a7108768a oid sha256:d10cb9be5b5139f0fdfdfb11cc3d3eca1955297180e5db8142bfea6250f20d73
size 21874 size 25811