From 5a8aabdb4deded29137f4b5788767f55c28c6cb7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 6 Dec 2024 10:19:19 +0100 Subject: [PATCH] MediaViewer: Show divider above the caption only if there is a caption and the media is video (to have a divider with the video controller) --- .../libraries/mediaviewer/impl/viewer/MediaViewerView.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 d802aac778..3a468eb0f5 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 @@ -51,6 +51,7 @@ import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.core.mimetype.MimeTypes +import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.RetryDialog import io.element.android.libraries.designsystem.preview.ElementPreviewDark @@ -125,6 +126,7 @@ fun MediaViewerView( ) MediaViewerBottomBar( modifier = Modifier.align(Alignment.BottomCenter), + showDivider = state.mediaInfo.mimeType.isMimeTypeVideo(), caption = state.mediaInfo.caption, onHeightChange = { bottomPaddingInPixels = it }, ) @@ -360,6 +362,7 @@ private fun MediaViewerTopBar( @Composable private fun MediaViewerBottomBar( caption: String?, + showDivider: Boolean, onHeightChange: (Int) -> Unit, modifier: Modifier = Modifier, ) { @@ -371,8 +374,10 @@ private fun MediaViewerBottomBar( onHeightChange(it.height) }, ) { - HorizontalDivider() if (caption != null) { + if (showDivider) { + HorizontalDivider() + } Text( modifier = Modifier .fillMaxWidth()