Fix Programme Reminder Item Icon mistake.

oxyroid · Jul 21, 2024 · 8d51a52 · 8d51a52
1 parent c8ea7b2
commit 8d51a52
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
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
@@ -82,7 +82,7 @@ fun ChannelRoute(
     val programmes = viewModel.programmes.collectAsLazyPagingItems()
     val programmeRange by viewModel.programmeRange.collectAsStateWithLifecycle()
 
-    val programmeIdsInReminder by viewModel.programmeIdsInReminder.collectAsStateWithLifecycle()
+    val programmeReminderIds by viewModel.programmeReminderIds.collectAsStateWithLifecycle()
 
     var brightness by remember { mutableFloatStateOf(helper.brightness) }
     var isPipMode by remember { mutableStateOf(false) }
@@ -180,7 +180,7 @@ fun ChannelRoute(
                     channels = channels,
                     programmes = programmes,
                     programmeRange = programmeRange,
-                    programmeIdsInReminder = programmeIdsInReminder,
+                    programmeReminderIds = programmeReminderIds,
                     onRemindProgramme = viewModel::onRemindProgramme,
                     onCancelRemindProgramme = viewModel::onCancelRemindProgramme
                 )

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/ChannelViewModel.kt b/feature/channel/src/main/java/com/m3u/feature/channel/ChannelViewModel.kt
@@ -240,7 +240,7 @@ class ChannelViewModel @Inject constructor(
         playerManager.pauseOrContinue(isContinued)
     }
 
-    internal val programmeIdsInReminder: StateFlow<List<Int>> = workManager.getWorkInfosFlow(
+    internal val programmeReminderIds: StateFlow<List<Int>> = workManager.getWorkInfosFlow(
         WorkQuery.fromStates(
             WorkInfo.State.ENQUEUED
         )

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/components/PlayerPanel.kt b/feature/channel/src/main/java/com/m3u/feature/channel/components/PlayerPanel.kt
@@ -106,7 +106,7 @@ internal fun PlayerPanel(
     programmes: LazyPagingItems<Programme>,
     programmeRange: ProgrammeRange,
     modifier: Modifier = Modifier,
-    programmeIdsInReminder: List<Int>,
+    programmeReminderIds: List<Int>,
     onRemindProgramme: (Programme) -> Unit,
     onCancelRemindProgramme: (Programme) -> Unit,
 ) {
@@ -134,6 +134,7 @@ internal fun PlayerPanel(
             channels = channels,
             programmes = programmes,
             programmeRange = programmeRange,
+            programmeReminderIds = programmeReminderIds,
             onProgrammePressed = {
                 programme = it
                 animProgramme = it
@@ -203,9 +204,7 @@ internal fun PlayerPanel(
                                 ) {
                                     Text(
                                         text = "${start.formatEOrSh(false)} - ${
-                                            end.formatEOrSh(
-                                                false
-                                            )
+                                            end.formatEOrSh(false)
                                         }",
                                         maxLines = 1,
                                         overflow = TextOverflow.Ellipsis,
@@ -224,9 +223,9 @@ internal fun PlayerPanel(
                                 val isReminderShowing = Clock.System.now()
                                     .toEpochMilliseconds() < currentProgramme.start
                                 if (isReminderShowing) {
-                                    val inReminder = currentProgramme.id in programmeIdsInReminder
+                                    val inReminder = currentProgramme.id in programmeReminderIds
                                     IconButton(
-                                        icon = if (inReminder) Icons.Outlined.Notifications
+                                        icon = if (!inReminder) Icons.Outlined.Notifications
                                         else Icons.Rounded.NotificationsActive,
                                         contentDescription = null,
                                         onClick = {
@@ -281,6 +280,7 @@ fun PlayerPanelImpl(
     channels: LazyPagingItems<Channel>,
     programmes: LazyPagingItems<Programme>,
     programmeRange: ProgrammeRange,
+    programmeReminderIds: List<Int>,
     modifier: Modifier = Modifier,
     onProgrammePressed: (Programme) -> Unit
 ) {
@@ -335,6 +335,7 @@ fun PlayerPanelImpl(
                 isPanelExpanded = isPanelExpanded,
                 programmes = programmes,
                 range = programmeRange,
+                programmeReminderIds = programmeReminderIds,
                 onProgrammePressed = onProgrammePressed,
                 modifier = Modifier
                     .fillMaxWidth()

diff --git a/feature/channel/src/main/java/com/m3u/feature/channel/components/ProgrammeGuide.kt b/feature/channel/src/main/java/com/m3u/feature/channel/components/ProgrammeGuide.kt
@@ -1,5 +1,6 @@
 package com.m3u.feature.channel.components
 
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
@@ -97,6 +98,7 @@ internal fun ProgramGuide(
     isPanelExpanded: Boolean,
     programmes: LazyPagingItems<Programme>,
     range: ProgrammeRange,
+    programmeReminderIds: List<Int>,
     modifier: Modifier = Modifier,
     minaBoxState: MinaBoxState = rememberMinaBoxState(),
     height: Float = 256f,
@@ -186,6 +188,7 @@ internal fun ProgramGuide(
                 if (programme != null) {
                     ProgrammeCell(
                         programme = programme,
+                        inReminder = programme.id in programmeReminderIds,
                         onPressed = { onProgrammePressed(programme) }
                     )
                 } else {
@@ -299,6 +302,7 @@ private fun TimelineCell(
 @Composable
 private fun ProgrammeCell(
     programme: Programme,
+    inReminder: Boolean,
     modifier: Modifier = Modifier,
     onPressed: () -> Unit
 ) {
@@ -354,8 +358,19 @@ private fun ProgrammeCell(
                 stiffness = Spring.StiffnessMediumLow
             )
         )
+        val currentColor by animateColorAsState(
+            targetValue = if(inReminder) MaterialTheme.colorScheme.tertiary
+            else MaterialTheme.colorScheme.tertiaryContainer,
+            label = "programme-cell-color"
+        )
+        val currentContentColor by animateColorAsState(
+            targetValue = if(inReminder) MaterialTheme.colorScheme.onTertiary
+            else MaterialTheme.colorScheme.onTertiaryContainer,
+            label = "programme-cell-color"
+        )
         Surface(
-            color = MaterialTheme.colorScheme.tertiaryContainer,
+            color = currentColor,
+            contentColor = currentContentColor,
             border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
             shape = AbsoluteRoundedCornerShape(4.dp),
             modifier = Modifier

diff --git a/feature/foryou/src/main/java/com/m3u/feature/foryou/components/recommend/RecommendItem.kt b/feature/foryou/src/main/java/com/m3u/feature/foryou/components/recommend/RecommendItem.kt
@@ -259,7 +259,8 @@ private fun NewReleaseContent(spec: Recommend.NewRelease) {
                     maxLines = 5,
                     overflow = TextOverflow.Ellipsis,
                     style = MaterialTheme.typography.bodySmall,
-                    fontFamily = FontFamilies.LexendExa
+                    fontFamily = FontFamilies.LexendExa,
+                    modifier = Modifier.weight(1f)
                 )
                 Row(
                     verticalAlignment = Alignment.CenterVertically,