From ad841222850c0567628beed4cc38b2de32a4b8cf Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 29 Jun 2026 11:21:02 +0200 Subject: [PATCH] Revert change on TimelineItemVideoView, it was dead code. --- .../components/event/TimelineItemVideoView.kt | 89 +++---------------- 1 file changed, 13 insertions(+), 76 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt index 35cdc9e6c3..8d1ef18f39 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt @@ -14,19 +14,14 @@ import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue @@ -36,13 +31,13 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.semantics.hideFromAccessibility +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage @@ -61,6 +56,7 @@ import io.element.android.features.messages.impl.timeline.protection.ProtectedVi import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction +import io.element.android.libraries.designsystem.modifiers.roundedBackground import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_HEIGHT @@ -69,7 +65,6 @@ import io.element.android.libraries.matrix.ui.media.MediaRequestData import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.utils.a11y.isTalkbackActive -import io.element.android.libraries.ui.utils.time.formatShort import io.element.android.wysiwyg.compose.EditorStyledText import io.element.android.wysiwyg.link.Link @@ -84,7 +79,6 @@ fun TimelineItemVideoView( onLinkLongClick: (Link) -> Unit, onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit, modifier: Modifier = Modifier, - isGalleryVideo: Boolean = false, ) { val isTalkbackActive = isTalkbackActive() val a11yLabel = stringResource(CommonStrings.common_video) @@ -136,71 +130,16 @@ fun TimelineItemVideoView( onState = { isLoaded = it is AsyncImagePainter.State.Success }, ) - if (isGalleryVideo) { - Box(modifier = Modifier.fillMaxSize()) { - Box( - modifier = Modifier - .fillMaxSize() - .align(Alignment.BottomCenter) - .background( - brush = Brush.verticalGradient( - colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.6f)) - ) - ) - ) - Row( - modifier = Modifier - .fillMaxWidth() - .align(Alignment.BottomCenter) - .padding(8.dp), - verticalAlignment = Alignment.CenterVertically - ) { - Box( - modifier = Modifier - .size(28.dp) - .clip(CircleShape) - .background(Color.Black.copy(alpha = 0.5f)), - contentAlignment = Alignment.Center - ) { - Image( - imageVector = CompoundIcons.VideoCallSolid(), - contentDescription = null, - colorFilter = ColorFilter.tint(Color.White), - modifier = Modifier.size(16.dp) - ) - } - Spacer(modifier = Modifier.weight(1f)) - Box( - modifier = Modifier - .clip(RoundedCornerShape(4.dp)) - .background(Color.Black.copy(alpha = 0.5f)) - .padding(horizontal = 6.dp, vertical = 2.dp) - ) { - Text( - text = content.duration.formatShort(), - color = Color.White, - style = ElementTheme.typography.fontBodyXsRegular, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - } - } - } - } else { - Box( - modifier = Modifier - .size(48.dp) - .clip(CircleShape) - .background(Color.Black.copy(alpha = 0.6f)), - contentAlignment = Alignment.Center, - ) { - Image( - imageVector = CompoundIcons.PlaySolid(), - contentDescription = stringResource(id = CommonStrings.a11y_play), - colorFilter = ColorFilter.tint(Color.White), - modifier = Modifier.size(24.dp) - ) - } + Box( + modifier = Modifier.roundedBackground(), + contentAlignment = Alignment.Center, + ) { + Image( + imageVector = CompoundIcons.PlaySolid(), + contentDescription = stringResource(id = CommonStrings.a11y_play), + colorFilter = ColorFilter.tint(Color.White), + modifier = Modifier.semantics { hideFromAccessibility() } + ) } } } @@ -245,7 +184,6 @@ internal fun TimelineItemVideoViewPreview(@PreviewParameter(TimelineItemVideoCon onLinkClick = {}, onLinkLongClick = {}, onContentLayoutChange = {}, - isGalleryVideo = false, ) } @@ -261,7 +199,6 @@ internal fun TimelineItemVideoViewHideMediaContentPreview() = ElementPreview { onLinkClick = {}, onLinkLongClick = {}, onContentLayoutChange = {}, - isGalleryVideo = false, ) }