Merge pull request #1096 from DimensionDev/bugfix/video_playback

Bugfix video playback

Author: Tlaster

desktopApp/src/main/kotlin/dev/dimension/flare/ui/screen/home/ProfileScreen.kt

@@ -14,6 +14,7 @@ import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridS
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -39,6 +40,8 @@ import dev.dimension.flare.profile_tab_media
 import dev.dimension.flare.profile_tab_timeline
 import dev.dimension.flare.profile_tab_timeline_with_reply
 import dev.dimension.flare.ui.common.items
+import dev.dimension.flare.ui.component.ComponentAppearance
+import dev.dimension.flare.ui.component.LocalComponentAppearance
 import dev.dimension.flare.ui.component.ProfileHeader
 import dev.dimension.flare.ui.component.ProfileMenu
 import dev.dimension.flare.ui.component.platform.isBigScreen
@@ -198,19 +201,25 @@ internal fun ProfileScreen(
                                     }
                                 },
                             ) { item ->
-                                val media = item.media
-                                MediaItem(
-                                    media = media,
-                                    showCountdown = false,
-                                    modifier =
-                                        Modifier
-                                            .clip(FluentTheme.shapes.control)
-                                            .padding(
-                                                vertical = 4.dp,
-                                            ).clipToBounds()
-                                            .clickable {
-                                                val content = item.status.content
-                                                if (content is UiTimeline.ItemContent.Status) {
+                                CompositionLocalProvider(
+                                    LocalComponentAppearance provides
+                                        LocalComponentAppearance.current.copy(
+                                            videoAutoplay = ComponentAppearance.VideoAutoplay.NEVER,
+                                        ),
+                                ) {
+                                    val media = item.media
+                                    MediaItem(
+                                        media = media,
+                                        showCountdown = false,
+                                        modifier =
+                                            Modifier
+                                                .clip(FluentTheme.shapes.control)
+                                                .padding(
+                                                    vertical = 4.dp,
+                                                ).clipToBounds()
+                                                .clickable {
+                                                    val content = item.status.content
+                                                    if (content is UiTimeline.ItemContent.Status) {
 //                                                onItemClicked(
 //                                                    content.statusKey,
 //                                                    item.index,
@@ -221,9 +230,10 @@ internal fun ProfileScreen(
 //                                                        else -> null
 //                                                    },
 //                                                )
-                                                }
-                                            },
-                                )
+                                                    }
+                                                },
+                                    )
+                                }
                             }
                         }
                         is ProfileState.Tab.Timeline -> {

shared/ui/component/src/androidMain/kotlin/dev/dimension/flare/ui/component/VideoPlayer.kt

@@ -32,7 +32,6 @@ import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.compose.PlayerSurface
-import androidx.media3.ui.compose.SURFACE_TYPE_TEXTURE_VIEW
 import androidx.media3.ui.compose.modifiers.resizeWithContentScale
 import androidx.media3.ui.compose.state.rememberPresentationState
 import kotlinx.coroutines.CoroutineScope
@@ -112,9 +111,12 @@ public fun VideoPlayer(
             remember(uri) {
                 playerPool
                     .get(uri)
+                    .apply {
+                        volume = if (muted) 0f else 1f
+                    }
             }
         val state = rememberPresentationState(player)
-        LaunchedEffect(muted) {
+        LaunchedEffect(muted, player) {
             player.volume = if (muted) 0f else 1f
             if (muted) {
                 player.setAudioAttributes(audioAttributes, false)
@@ -136,12 +138,6 @@ public fun VideoPlayer(
                 delay(500)
             }
         }
-        DisposableEffect(uri) {
-            onDispose {
-                player.setAudioAttributes(audioAttributes, false)
-                playerPool.release(uri)
-            }
-        }
         val isActive = rememberSurfaceBinding(uri)
         val playerModifier =
             Modifier
@@ -150,14 +146,6 @@ public fun VideoPlayer(
                     contentScale = contentScale,
                     sourceSizeDp = state.videoSizeDp,
                 ).let {
-                    if (aspectRatio != null) {
-                        it.aspectRatio(
-                            aspectRatio,
-                        )
-                    } else {
-                        it
-                    }
-                }.let {
                     if (onClick != null) {
                         it.combinedClickable(
                             onClick = onClick,
@@ -171,7 +159,6 @@ public fun VideoPlayer(
             PlayerSurface(
                 player = player,
                 modifier = playerModifier,
-                surfaceType = SURFACE_TYPE_TEXTURE_VIEW,
             )
         } else {
             loadingPlaceholder.invoke(this)
@@ -181,6 +168,13 @@ public fun VideoPlayer(
         } else {
             remainingTimeContent?.invoke(this, remainingTime)
         }
+        DisposableEffect(uri) {
+            onDispose {
+                player.volume = 0f
+                player.setAudioAttributes(audioAttributes, false)
+                playerPool.release(uri)
+            }
+        }
     }
 }