Skip to content

Commit 5a8aabd

Browse files
committed
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)
1 parent 9c02c4c commit 5a8aabd

File tree

1 file changed

+6
-1
lines changed
  • libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import io.element.android.compound.theme.ElementTheme
5151
import io.element.android.compound.tokens.generated.CompoundIcons
5252
import io.element.android.libraries.architecture.AsyncData
5353
import io.element.android.libraries.core.mimetype.MimeTypes
54+
import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
5455
import io.element.android.libraries.designsystem.components.button.BackButton
5556
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
5657
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@@ -125,6 +126,7 @@ fun MediaViewerView(
125126
)
126127
MediaViewerBottomBar(
127128
modifier = Modifier.align(Alignment.BottomCenter),
129+
showDivider = state.mediaInfo.mimeType.isMimeTypeVideo(),
128130
caption = state.mediaInfo.caption,
129131
onHeightChange = { bottomPaddingInPixels = it },
130132
)
@@ -360,6 +362,7 @@ private fun MediaViewerTopBar(
360362
@Composable
361363
private fun MediaViewerBottomBar(
362364
caption: String?,
365+
showDivider: Boolean,
363366
onHeightChange: (Int) -> Unit,
364367
modifier: Modifier = Modifier,
365368
) {
@@ -371,8 +374,10 @@ private fun MediaViewerBottomBar(
371374
onHeightChange(it.height)
372375
},
373376
) {
374-
HorizontalDivider()
375377
if (caption != null) {
378+
if (showDivider) {
379+
HorizontalDivider()
380+
}
376381
Text(
377382
modifier = Modifier
378383
.fillMaxWidth()

0 commit comments

Comments
 (0)