Long Press programme to see detail.

oxyroid · Jul 20, 2024 · ebd7f26 · ebd7f26
1 parent d821a42
commit ebd7f26
Show file tree

Hide file tree

Showing 6 changed files with 312 additions and 60 deletions.
diff --git a/data/src/main/java/com/m3u/data/repository/programme/ProgrammeRepositoryImpl.kt b/data/src/main/java/com/m3u/data/repository/programme/ProgrammeRepositoryImpl.kt
@@ -134,7 +134,9 @@ internal class ProgrammeRepositoryImpl @Inject constructor(
         val url = response.request.url
         val contentType = response.header("Content-Type").orEmpty()
 
-        val isGzip = "gzip" in contentType || url.pathSegments.lastOrNull()?.endsWith(".gz") == true
+        val isGzip = "gzip" in contentType ||
+                // soft rule, cover the situation which with wrong MIME_TYPE(text, octect etc.)
+                url.pathSegments.lastOrNull()?.endsWith(".gz") == true
 
         response
             .body

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/ChannelMask.kt b/feature/channel/src/main/java/com/m3u/feature/channel/ChannelMask.kt
@@ -3,6 +3,7 @@ package com.m3u.feature.channel
 import android.content.pm.ActivityInfo
 import android.view.KeyEvent
 import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.animateIntAsState
@@ -84,6 +85,7 @@ import com.m3u.material.components.mask.MaskButton
 import com.m3u.material.components.mask.MaskCircleButton
 import com.m3u.material.components.mask.MaskPanel
 import com.m3u.material.components.mask.MaskState
+import com.m3u.material.effects.currentBackStackEntry
 import com.m3u.material.ktx.leanback
 import com.m3u.material.ktx.thenIf
 import com.m3u.material.model.LocalSpacing
@@ -113,7 +115,6 @@ internal fun ChannelMask(
     isPanelExpanded: Boolean,
     hasTrack: Boolean,
     onFavourite: () -> Unit,
-    onBackPressed: () -> Unit,
     openDlnaDevices: () -> Unit,
     openChooseFormat: () -> Unit,
     openOrClosePanel: () -> Unit,
@@ -129,6 +130,10 @@ internal fun ChannelMask(
     val leanback = leanback()
     val coroutineScope = rememberCoroutineScope()
 
+    val onBackPressedDispatcher = checkNotNull(
+        LocalOnBackPressedDispatcherOwner.current
+    ).onBackPressedDispatcher
+
     var gesture: MaskGesture? by remember { mutableStateOf(null) }
 
     // because they will be updated frequently,
@@ -224,10 +229,11 @@ internal fun ChannelMask(
         PlayerMask(
             state = maskState,
             header = {
+                val backStackEntry by currentBackStackEntry()
                 MaskButton(
                     state = maskState,
-                    icon = Icons.AutoMirrored.Rounded.ArrowBack,
-                    onClick = onBackPressed,
+                    icon = backStackEntry?.navigationIcon ?: Icons.AutoMirrored.Rounded.ArrowBack,
+                    onClick = { onBackPressedDispatcher.onBackPressed() },
                     contentDescription = stringResource(string.feat_channel_tooltip_on_back_pressed)
                 )
                 Spacer(modifier = Modifier.weight(1f))

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/ChannelScreen.kt b/feature/channel/src/main/java/com/m3u/feature/channel/ChannelScreen.kt
@@ -53,7 +53,6 @@ import kotlin.time.Duration.Companion.milliseconds
 @Composable
 fun ChannelRoute(
     modifier: Modifier = Modifier,
-    onBackPressed: () -> Unit,
     viewModel: ChannelViewModel = hiltViewModel(),
 ) {
     val openInExternalPlayerString = stringResource(string.feat_channel_open_in_external_app)
@@ -200,7 +199,6 @@ fun ChannelRoute(
                         }
                     },
                     onFavourite = viewModel::onFavourite,
-                    onBackPressed = onBackPressed,
                     maskState = maskState,
                     playerState = playerState,
                     playlist = playlist,
@@ -266,7 +264,6 @@ private fun ChannelPlayer(
     volume: Float,
     brightness: Float,
     onFavourite: () -> Unit,
-    onBackPressed: () -> Unit,
     openDlnaDevices: () -> Unit,
     openChooseFormat: () -> Unit,
     openOrClosePanel: () -> Unit,
@@ -319,7 +316,6 @@ private fun ChannelPlayer(
                 hasTrack = hasTrack,
                 isPanelExpanded = isPanelExpanded,
                 onFavourite = onFavourite,
-                onBackPressed = onBackPressed,
                 openDlnaDevices = openDlnaDevices,
                 openChooseFormat = openChooseFormat,
                 openOrClosePanel = openOrClosePanel,

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/PlayerActivity.kt b/feature/channel/src/main/java/com/m3u/feature/channel/PlayerActivity.kt
@@ -50,7 +50,6 @@ class PlayerActivity : ComponentActivity() {
                 alwaysUseDarkTheme = true
             ) {
                 ChannelRoute(
-                    onBackPressed = { finish() },
                     viewModel = viewModel
                 )
             }