Merge pull request #28 from realOxy/m3

fix: replace some unstable parameters. upgrade: 1.13.0-alpha02 (75)
oxyroid · Nov 19, 2023 · f4e04f5 · f4e04f5
2 parents 4f04ca0 + 37c905f
commit f4e04f5
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 138 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.m3u.androidApp"
         minSdk = 26
         targetSdk = 33
-        versionCode = 74
-        versionName = "1.13.0-alpha01"
+        versionCode = 75
+        versionName = "1.13.0-alpha02"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["androidx.benchmark.profiling.mode"] = "MethodTracing"

diff --git a/androidApp/src/main/java/com/m3u/androidApp/components/AppNavigation.kt b/androidApp/src/main/java/com/m3u/androidApp/components/AppNavigation.kt
@@ -52,7 +52,7 @@ fun AppNavigation(
             ) {
                 Content(
                     navigate = navigate,
-                    destinations = destinations,
+                    destinationsFactory = { destinations },
                     rootDestination = rootDestination,
                     fob = fob,
                     selectedColor = selectedColor,
@@ -69,7 +69,7 @@ fun AppNavigation(
             ) {
                 Content(
                     navigate = navigate,
-                    destinations = destinations,
+                    destinationsFactory = { destinations },
                     rootDestination = rootDestination,
                     fob = fob,
                     selectedColor = selectedColor,
@@ -85,7 +85,7 @@ fun AppNavigation(
 @Composable
 private fun Content(
     navigate: Navigate,
-    destinations: List<Destination.Root>,
+    destinationsFactory: () -> List<Destination.Root>,
     rootDestination: Destination.Root?,
     fob: Fob?,
     selectedColor: Color,
@@ -94,6 +94,7 @@ private fun Content(
 ) {
     val relation = fob?.rootDestination
     val actualActiveDestination = rootDestination ?: relation
+    val destinations = destinationsFactory()
     destinations.forEach { default ->
         val fobbed = default == relation
         val selected = default == actualActiveDestination

diff --git a/features/live/src/main/java/com/m3u/features/live/LiveScreen.kt b/features/live/src/main/java/com/m3u/features/live/LiveScreen.kt
@@ -1,6 +1,5 @@
 package com.m3u.features.live
 
-import android.graphics.Rect
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.pager.VerticalPager
@@ -20,8 +19,6 @@ import androidx.compose.ui.util.lerp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.media3.common.PlaybackException
-import androidx.media3.common.Player
 import com.m3u.core.annotation.ClipMode
 import com.m3u.core.unspecified.UBoolean
 import com.m3u.core.unspecified.unspecifiable
@@ -114,13 +111,9 @@ internal fun LiveRoute(
         onFavourite = { viewModel.onEvent(LiveEvent.OnFavourite(it)) },
         onBackPressed = onBackPressed,
         maskState = maskState,
-        player = playerState.player,
-        playState = playerState.playState,
-        videoSize = playerState.videoSize,
-        playerError = playerState.playerError,
+        playerState = playerState,
         onInstallMedia = { viewModel.onEvent(LiveEvent.InstallMedia(it)) },
         onUninstallMedia = { viewModel.onEvent(LiveEvent.UninstallMedia) },
-        muted = playerState.muted,
         onMuted = { viewModel.onEvent(LiveEvent.OnMuted) },
         modifier = modifier
     )
@@ -138,13 +131,9 @@ private fun LiveScreen(
     onBackPressed: () -> Unit,
     maskState: MaskState,
     experimentalMode: Boolean,
-    player: Player?,
-    playState: @Player.State Int,
-    videoSize: Rect,
-    playerError: PlaybackException?,
+    playerState: LiveState.PlayerState,
     onInstallMedia: (String) -> Unit,
     onUninstallMedia: () -> Unit,
-    muted: Boolean,
     onMuted: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -155,10 +144,7 @@ private fun LiveScreen(
             val url = live?.url.orEmpty()
             val favourite = live?.favourite ?: false
             LiveFragment(
-                player = player,
-                playState = playState,
-                videoSize = videoSize,
-                playerError = playerError,
+                playerState = playerState,
                 title = init.live?.title ?: "--",
                 url = url,
                 cover = init.live?.cover.orEmpty(),
@@ -175,7 +161,6 @@ private fun LiveScreen(
                 onBackPressed = onBackPressed,
                 onInstallMedia = onInstallMedia,
                 onUninstallMedia = onUninstallMedia,
-                muted = muted,
                 onMuted = onMuted,
                 modifier = modifier
                     .fillMaxSize()
@@ -197,10 +182,7 @@ private fun LiveScreen(
                 val url = live.url
                 val favourite = live.favourite
                 LiveFragment(
-                    player = player,
-                    playState = playState,
-                    videoSize = videoSize,
-                    playerError = playerError,
+                    playerState = playerState,
                     title = live.title,
                     feedTitle = init.feed?.title.orEmpty(),
                     url = url,
@@ -217,7 +199,6 @@ private fun LiveScreen(
                     onBackPressed = onBackPressed,
                     onInstallMedia = onInstallMedia,
                     onUninstallMedia = onUninstallMedia,
-                    muted = muted,
                     onMuted = onMuted,
                     modifier = Modifier
                         .fillMaxSize()

diff --git a/features/live/src/main/java/com/m3u/features/live/LiveState.kt b/features/live/src/main/java/com/m3u/features/live/LiveState.kt
@@ -1,6 +1,7 @@
 package com.m3u.features.live
 
 import android.graphics.Rect
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 import androidx.media3.common.PlaybackException
@@ -32,6 +33,7 @@ data class LiveState(
         val initialIndex: Int = 0
     ) : Init()
 
+    @Immutable
     data class PlayerState(
         val playState: @Player.State Int = Player.STATE_IDLE,
         val videoSize: Rect = Rect(),

diff --git a/features/live/src/main/java/com/m3u/features/live/components/DlnaDeviceItem.kt b/features/live/src/main/java/com/m3u/features/live/components/DlnaDeviceItem.kt
@@ -18,7 +18,7 @@ import androidx.compose.material3.MaterialTheme
 
 @Composable
 internal fun DlnaDeviceItem(
-    device: Device<*, *, *>,
+    deviceFactory: () -> Device<*, *, *>,
     connected: Boolean,
     requestConnection: () -> Unit,
     loseConnection: () -> Unit,
@@ -29,7 +29,7 @@ internal fun DlnaDeviceItem(
 
     ListItem(
         headlineContent = {
-            Text(device.displayString)
+            Text(deviceFactory().displayString)
         },
         trailingContent = {
             Crossfade(connected, label = "icon") { connected ->

diff --git a/features/live/src/main/java/com/m3u/features/live/components/DlnaDevicesBottomSheet.kt b/features/live/src/main/java/com/m3u/features/live/components/DlnaDevicesBottomSheet.kt
@@ -86,7 +86,7 @@ fun DlnaDevicesBottomSheet(
             ) {
                 items(devices ?: emptyList()) { device ->
                     DlnaDeviceItem(
-                        device = device,
+                        deviceFactory = { device },
                         connected = device == connected,
                         requestConnection = { connectDlnaDevice(device) },
                         loseConnection = { disconnectDlnaDevice(device) }

diff --git a/features/live/src/main/java/com/m3u/features/live/fragments/LiveFragment.kt b/features/live/src/main/java/com/m3u/features/live/fragments/LiveFragment.kt
@@ -1,6 +1,5 @@
 package com.m3u.features.live.fragments
 
-import android.graphics.Rect
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
@@ -38,6 +37,7 @@ import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import com.m3u.core.annotation.ClipMode
 import com.m3u.core.util.basic.isNotEmpty
+import com.m3u.features.live.LiveState
 import com.m3u.features.live.components.CoverPlaceholder
 import com.m3u.features.live.components.LiveMask
 import com.m3u.i18n.R.string
@@ -53,10 +53,7 @@ import com.m3u.ui.rememberPlayerState
 
 @Composable
 internal fun LiveFragment(
-    player: Player?,
-    playState: @Player.State Int,
-    videoSize: Rect,
-    playerError: PlaybackException?,
+    playerState: LiveState.PlayerState,
     title: String,
     feedTitle: String,
     url: String,
@@ -73,7 +70,6 @@ internal fun LiveFragment(
     onBackPressed: () -> Unit,
     onInstallMedia: (String) -> Unit,
     onUninstallMedia: () -> Unit,
-    muted: Boolean,
     onMuted: () -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -85,7 +81,7 @@ internal fun LiveFragment(
         Box(modifier) {
             val helper = LocalHelper.current
             val state = rememberPlayerState(
-                player = player,
+                player = playerState.player,
                 url = url,
                 clipMode = clipMode,
                 onInstallMedia = onInstallMedia,
@@ -97,7 +93,7 @@ internal fun LiveFragment(
                 modifier = Modifier.fillMaxSize()
             )
 
-            val shouldShowPlaceholder = cover.isNotEmpty() && videoSize.isEmpty
+            val shouldShowPlaceholder = cover.isNotEmpty() && playerState.videoSize.isEmpty
 
             CoverPlaceholder(
                 visible = shouldShowPlaceholder,
@@ -117,12 +113,12 @@ internal fun LiveFragment(
                     Spacer(modifier = Modifier.weight(1f))
                     MaskButton(
                         state = maskState,
-                        icon = if (muted) Icons.AutoMirrored.Rounded.VolumeOff
+                        icon = if (playerState.muted) Icons.AutoMirrored.Rounded.VolumeOff
                         else Icons.AutoMirrored.Rounded.VolumeUp,
                         onClick = onMuted,
-                        contentDescription = if (muted) stringResource(string.feat_live_tooltip_unmute)
+                        contentDescription = if (playerState.muted) stringResource(string.feat_live_tooltip_unmute)
                         else stringResource(string.feat_live_tooltip_mute),
-                        tint = if (muted) theme.error else Color.Unspecified
+                        tint = if (playerState.muted) theme.error else Color.Unspecified
                     )
                     MaskButton(
                         state = maskState,
@@ -144,7 +140,7 @@ internal fun LiveFragment(
                             contentDescription = if (recording) stringResource(string.feat_live_tooltip_unrecord)
                             else stringResource(string.feat_live_tooltip_record)
                         )
-                        if (playState != Player.STATE_IDLE) {
+                        if (playerState.playState != Player.STATE_IDLE) {
                             MaskButton(
                                 state = maskState,
                                 icon = Icons.Rounded.Cast,
@@ -153,12 +149,12 @@ internal fun LiveFragment(
                             )
                         }
                     }
-                    if (videoSize.isNotEmpty) {
+                    if (playerState.videoSize.isNotEmpty) {
                         MaskButton(
                             state = maskState,
                             icon = Icons.Rounded.PictureInPicture,
                             onClick = {
-                                helper.enterPipMode(videoSize)
+                                helper.enterPipMode(playerState.videoSize)
                                 maskState.sleep()
                             },
                             contentDescription = stringResource(string.feat_live_tooltip_enter_pip_mode)
@@ -205,9 +201,9 @@ internal fun LiveFragment(
                             modifier = Modifier.basicMarquee()
                         )
                         val playStateDisplayText =
-                            LiveFragmentDefaults.playStateDisplayText(playState)
+                            LiveFragmentDefaults.playStateDisplayText(playerState.playState)
                         val exceptionDisplayText =
-                            LiveFragmentDefaults.playbackExceptionDisplayText(playerError)
+                            LiveFragmentDefaults.playbackExceptionDisplayText(playerState.playerError)
                         if (playStateDisplayText.isNotEmpty() || exceptionDisplayText.isNotEmpty()) {
                             Spacer(
                                 modifier = Modifier.height(spacing.small)
@@ -238,8 +234,8 @@ internal fun LiveFragment(
                     }
                 }
             )
-            LaunchedEffect(playerError) {
-                if (playerError != null) {
+            LaunchedEffect(playerState.playerError) {
+                if (playerState.playerError != null) {
                     maskState.active()
                 }
             }

diff --git a/features/main/src/main/java/com/m3u/features/main/components/FeedItem.kt b/features/main/src/main/java/com/m3u/features/main/components/FeedItem.kt
@@ -1,6 +1,5 @@
 package com.m3u.features.main.components
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
@@ -9,24 +8,22 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.DriveFileMove
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
+import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.m3u.material.components.OuterRow
-import com.m3u.material.ktx.animateColor
-import com.m3u.material.ktx.animateDp
 import com.m3u.material.ktx.animated
 import com.m3u.material.model.LocalSpacing
 
@@ -41,22 +38,11 @@ internal fun FeedItem(
 ) {
     val spacing = LocalSpacing.current
     val theme = MaterialTheme.colorScheme
-    val actualBackgroundColor by theme.surface.animated("FeedItemBackground")
     val actualContentColor by theme.onSurface.animated("FeedItemContent")
-    val actualBorderDp by animateDp("FeedItemBorder") {
-        if (local) spacing.extraSmall
-        else spacing.none
-    }
-    val actualBorderColor by animateColor("FeedItemBorderColor") {
-        if (local) Color.Black.copy(alpha = 0.12f)
-        else Color.Transparent
-    }
-    Surface(
+
+    OutlinedCard(
         shape = RoundedCornerShape(spacing.medium),
-        color = actualBackgroundColor,
-        contentColor = actualContentColor,
-        tonalElevation = spacing.none,
-        border = BorderStroke(actualBorderDp, actualBorderColor)
+        border = CardDefaults.outlinedCardBorder(local)
     ) {
         OuterRow(
             modifier = modifier