From e076379729445f17cc06656312fef518ae17c709 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:46:57 +0000 Subject: [PATCH 1/4] Update plugin paparazzi to v1.3.3 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28eb250b08..9729cc2c94 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -218,7 +218,7 @@ ktlint = "org.jlleitschuh.gradle.ktlint:12.1.0" dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12" dependencycheck = "org.owasp.dependencycheck:9.0.9" dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" } -paparazzi = "app.cash.paparazzi:1.3.2" +paparazzi = "app.cash.paparazzi:1.3.3" kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" } From 7b1e57c9f48a063ce1f00924d2b31cb06de863cf Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 1 Mar 2024 18:25:26 +0100 Subject: [PATCH 2/4] Fix preview error of MediaVideoView. --- .../mediaviewer/api/local/LocalMediaView.kt | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt index 24143b5a95..fbf9e3c55d 100644 --- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt +++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt @@ -31,6 +31,7 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.GraphicEq @@ -57,7 +58,6 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.lifecycle.Lifecycle import androidx.media3.common.MediaItem import androidx.media3.common.Player -import androidx.media3.common.util.UnstableApi import androidx.media3.ui.AspectRatioFrameLayout import androidx.media3.ui.PlayerView import io.element.android.compound.theme.ElementTheme @@ -80,7 +80,6 @@ import io.element.android.libraries.ui.strings.CommonStrings import me.saket.telephoto.zoomable.coil.ZoomableAsyncImage import me.saket.telephoto.zoomable.rememberZoomableImageState -@SuppressLint("UnsafeOptInUsageError") @Composable fun LocalMediaView( localMedia: LocalMedia?, @@ -147,13 +146,37 @@ private fun MediaImageView( } } -@UnstableApi @Composable private fun MediaVideoView( localMediaViewState: LocalMediaViewState, localMedia: LocalMedia?, onClick: () -> Unit, modifier: Modifier = Modifier, +) { + if (LocalInspectionMode.current) { + Text( + modifier = modifier + .background(ElementTheme.colors.bgSubtlePrimary) + .wrapContentSize(), + text = "A Video Player will render here", + ) + } else { + ExoPlayerMediaVideoView( + localMediaViewState = localMediaViewState, + localMedia = localMedia, + onClick = onClick, + modifier = modifier, + ) + } +} + +@SuppressLint("UnsafeOptInUsageError") +@Composable +private fun ExoPlayerMediaVideoView( + localMediaViewState: LocalMediaViewState, + localMedia: LocalMedia?, + onClick: () -> Unit, + modifier: Modifier, ) { var playableState: PlayableState.Playable by remember { mutableStateOf(PlayableState.Playable(isPlaying = false, isShowingControls = false)) From 2ae50c24859361b6f00613d31f758add5cf5b3a2 Mon Sep 17 00:00:00 2001 From: ElementBot Date: Fri, 1 Mar 2024 17:33:04 +0000 Subject: [PATCH 3/4] Update screenshots --- ...ewerView_null_MediaViewerView_0_null_4,NEXUS_5,1.0,en].png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[l.mediaviewer.api.viewer_MediaViewerView_null_MediaViewerView_0_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[l.mediaviewer.api.viewer_MediaViewerView_null_MediaViewerView_0_null_4,NEXUS_5,1.0,en].png index 2f2ac0e0c0..4151813e5d 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[l.mediaviewer.api.viewer_MediaViewerView_null_MediaViewerView_0_null_4,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[l.mediaviewer.api.viewer_MediaViewerView_null_MediaViewerView_0_null_4,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3764d8bd7dc2783a8af43aad65a217d7e533ed17c4d4367b7994470bf35b62b0 -size 4462 +oid sha256:799d91a091afdcdff165f3be10ee0832e0619b510c949a062d3be748f6ebea59 +size 12058 From c6c00a60d4ec071aabb8af30a766b826baa3eda4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 1 Mar 2024 18:42:48 +0100 Subject: [PATCH 4/4] Need a default value for Modifier. --- .../android/libraries/mediaviewer/api/local/LocalMediaView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt index fbf9e3c55d..2f3e580f09 100644 --- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt +++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/local/LocalMediaView.kt @@ -176,7 +176,7 @@ private fun ExoPlayerMediaVideoView( localMediaViewState: LocalMediaViewState, localMedia: LocalMedia?, onClick: () -> Unit, - modifier: Modifier, + modifier: Modifier = Modifier, ) { var playableState: PlayableState.Playable by remember { mutableStateOf(PlayableState.Playable(isPlaying = false, isShowingControls = false))