feat: Pause and Resume.

oxyroid · May 18, 2024 · b4c11fa · b4c11fa
1 parent 5772da4
commit b4c11fa
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 22 deletions.
diff --git a/data/src/main/java/com/m3u/data/service/PlayerManager.kt b/data/src/main/java/com/m3u/data/service/PlayerManager.kt
@@ -25,6 +25,7 @@ interface PlayerManager {
 
     val playbackState: StateFlow<@Player.State Int>
     val playbackException: StateFlow<PlaybackException?>
+    val isPlaying: StateFlow<Boolean>
 
     val tracksGroups: StateFlow<List<Tracks.Group>>
     val cacheSpace: Flow<Long>

diff --git a/data/src/main/java/com/m3u/data/service/internal/PlayerManagerImpl.kt b/data/src/main/java/com/m3u/data/service/internal/PlayerManagerImpl.kt
@@ -142,6 +142,7 @@ class PlayerManagerImpl @Inject constructor(
 
     override val playbackState = MutableStateFlow<@Player.State Int>(Player.STATE_IDLE)
     override val playbackException = MutableStateFlow<PlaybackException?>(null)
+    override val isPlaying = MutableStateFlow(false)
     override val tracksGroups = MutableStateFlow<List<Tracks.Group>>(emptyList())
 
     private var currentConnectTimeout = preferences.connectTimeout
@@ -434,9 +435,14 @@ class PlayerManagerImpl @Inject constructor(
 
     override fun onTracksChanged(tracks: Tracks) {
         super.onTracksChanged(tracks)
+        player.value?.isPlaying
         tracksGroups.value = tracks.groups
     }
 
+    override fun onIsPlayingChanged(isPlaying: Boolean) {
+        this.isPlaying.value = isPlaying
+    }
+
     override fun pauseOrContinue(value: Boolean) {
         player.value?.apply {
             if (!value) pause() else {

diff --git a/features/stream/src/main/java/com/m3u/features/stream/PlayerState.kt b/features/stream/src/main/java/com/m3u/features/stream/PlayerState.kt
@@ -10,5 +10,6 @@ internal data class PlayerState(
     val playState: @Player.State Int = Player.STATE_IDLE,
     val videoSize: Rect = Rect(),
     val playerError: PlaybackException? = null,
-    val player: Player? = null
+    val player: Player? = null,
+    val isPlaying: Boolean = false
 )
diff --git a/features/stream/src/main/java/com/m3u/features/stream/StreamMask.kt b/features/stream/src/main/java/com/m3u/features/stream/StreamMask.kt
@@ -9,8 +9,6 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.animateIntAsState
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -30,7 +28,9 @@ import androidx.compose.material.icons.rounded.Cast
 import androidx.compose.material.icons.rounded.DarkMode
 import androidx.compose.material.icons.rounded.HighQuality
 import androidx.compose.material.icons.rounded.LightMode
+import androidx.compose.material.icons.rounded.Pause
 import androidx.compose.material.icons.rounded.PictureInPicture
+import androidx.compose.material.icons.rounded.PlayArrow
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.ScreenRotationAlt
 import androidx.compose.material.icons.rounded.Star
@@ -65,6 +65,9 @@ import androidx.media3.common.Player
 import com.m3u.core.architecture.preferences.hiltPreferences
 import com.m3u.core.util.basic.isNotEmpty
 import com.m3u.data.television.model.RemoteDirection
+import com.m3u.features.stream.MaskCenterState.Pause
+import com.m3u.features.stream.MaskCenterState.Play
+import com.m3u.features.stream.MaskCenterState.Replay
 import com.m3u.features.stream.components.MaskTextButton
 import com.m3u.features.stream.components.PlayerMask
 import com.m3u.i18n.R.string
@@ -305,22 +308,20 @@ internal fun StreamMask(
                 }
             },
             body = {
-                AnimatedVisibility(
-                    visible = (!isPanelExpanded && preferences.alwaysShowReplay) || playerState.playState in arrayOf(
-                        Player.STATE_IDLE,
-                        Player.STATE_ENDED
-                    ) || playerState.playerError != null,
-                    enter = fadeIn() + scaleIn(initialScale = 0.85f),
-                    exit = fadeOut() + scaleOut(targetScale = 0.85f)
-                ) {
-                    MaskCircleButton(
-                        state = maskState,
-                        icon = Icons.Rounded.Refresh,
-                        onClick = {
-                            coroutineScope.launch { helper.replay() }
-                        }
-                    )
-                }
+                val maskCenterState = MaskCenterState.of(
+                    playerState.playState,
+                    playerState.isPlaying,
+                    preferences.alwaysShowReplay,
+                    isPanelExpanded,
+                    playerState.playerError
+                )
+                MaskCenterButton(
+                    maskCenterState = maskCenterState,
+                    maskState = maskState,
+                    onPlay = { playerState.player?.play() },
+                    onPause = { playerState.player?.pause() },
+                    onRetry = { coroutineScope.launch { helper.replay() } }
+                )
             },
             footer = {
                 if (preferences.fullInfoPlayer && cover.isNotEmpty()) {
@@ -497,3 +498,65 @@ internal fun StreamMask(
         )
     }
 }
+
+@Composable
+private fun MaskCenterButton(
+    maskCenterState: MaskCenterState?,
+    maskState: MaskState,
+    modifier: Modifier = Modifier,
+    onPlay: () -> Unit,
+    onPause: () -> Unit,
+    onRetry: () -> Unit
+) {
+    Box(modifier) {
+        when (maskCenterState) {
+            Replay -> {
+                MaskCircleButton(
+                    state = maskState,
+                    icon = Icons.Rounded.Refresh,
+                    onClick = onRetry
+                )
+            }
+
+            Play -> {
+                MaskCircleButton(
+                    state = maskState,
+                    icon = Icons.Rounded.PlayArrow,
+                    onClick = onPlay
+                )
+            }
+
+            Pause -> {
+                MaskCircleButton(
+                    state = maskState,
+                    icon = Icons.Rounded.Pause,
+                    onClick = onPause
+                )
+            }
+
+            else -> {}
+        }
+    }
+}
+
+private enum class MaskCenterState {
+    Replay, Play, Pause;
+
+    companion object {
+        fun of(
+            @Player.State playState: Int,
+            isPlaying: Boolean,
+            alwaysShowReplay: Boolean,
+            isPanelExpanded: Boolean,
+            playerError: Exception?
+        ): MaskCenterState? = when {
+            isPanelExpanded || playState == Player.STATE_BUFFERING -> null
+            alwaysShowReplay || playState in arrayOf(
+                Player.STATE_IDLE,
+                Player.STATE_ENDED
+            ) || playerError != null -> Replay
+
+            else -> if (!isPlaying) Play else Pause
+        }
+    }
+}
diff --git a/features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt b/features/stream/src/main/java/com/m3u/features/stream/StreamViewModel.kt
@@ -132,13 +132,15 @@ class StreamViewModel @Inject constructor(
         playerManager.player,
         playerManager.playbackState,
         playerManager.size,
-        playerManager.playbackException
-    ) { player, playState, videoSize, playbackException ->
+        playerManager.playbackException,
+        playerManager.isPlaying
+    ) { player, playState, videoSize, playbackException, isPlaying ->
         PlayerState(
             playState = playState,
             videoSize = videoSize,
             playerError = playbackException,
-            player = player
+            player = player,
+            isPlaying = isPlaying
         )
     }
         .stateIn(