feat: add UnwatchedEpisodeBadge and remove 'started' parameter from WatchStateBadge

2026-07-23 19:26:50 +00:00 · 2026-05-07 19:51:28 +02:00
parent 56fe574940
commit dc5c324962
8 changed files with 48 additions and 48 deletions
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
@@ -29,12 +29,13 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.common.badge.WatchStateBadge
-import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.core.model.EpisodeUiModel
 import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.core.model.MovieUiModel
 import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeBadge
+import hu.bbara.purefin.ui.common.badge.WatchStateBadge
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import java.util.UUID

@Composable
@@ -134,10 +135,17 @@ fun PosterCardContent(
                            .align(Alignment.TopEnd)
                            .padding(indicatorPadding),
                        watched = model.watched,
-                        started = (model.progress ?: 0f) > 0f
                    )
                }
-                else -> Unit
+                is SeriesUiModel -> {
+                    UnwatchedEpisodeBadge(
+                        unwatchedCount = model.unwatchedEpisodeCount,
+                        size = 26,
+                        modifier = Modifier
+                            .align(Alignment.TopEnd)
+                            .padding(indicatorPadding),
+                    )
+                }
            }
        }
        Column(
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt
@@ -304,7 +304,6 @@ private fun TvEpisodeCard(
            } else {
                WatchStateBadge(
                    watched = episode.watched,
-                    started = (episode.progress ?: 0.0) > 0.0,
                    modifier = Modifier
                        .align(Alignment.TopEnd)
                        .padding(8.dp)
--- a/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
@@ -117,7 +117,6 @@ fun PosterCardContent(
                            .align(Alignment.TopEnd)
                            .padding(indicatorPadding),
                        watched = model.watched,
-                        started = (model.progress ?: 0f) > 0f
                    )
                }
                else -> Unit
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt
@@ -6,13 +6,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeBadge
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.core.model.EpisodeUiModel
-import hu.bbara.purefin.core.model.MediaUiModel
-import hu.bbara.purefin.core.model.MovieUiModel

@Composable
 internal fun HomeBrowseCard(
@@ -42,10 +44,16 @@ internal fun HomeBrowseCard(
                        .align(Alignment.TopEnd)
                        .padding(8.dp),
                    watched = uiModel.watched,
-                    started = (uiModel.progress ?: 0f) > 0f
                )
            }
-            else -> Unit
+            is SeriesUiModel -> {
+                UnwatchedEpisodeBadge(
+                    unwatchedCount = uiModel.unwatchedEpisodeCount,
+                    modifier = Modifier
+                        .align(Alignment.TopEnd)
+                        .padding(8.dp)
+                )
+            }
        }
    }
 }
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt
@@ -20,13 +20,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.core.feature.browse.library.LibraryViewModel
-import hu.bbara.purefin.core.navigation.LibraryDto
-import hu.bbara.purefin.ui.common.badge.WatchStateBadge
-import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.core.model.EpisodeUiModel
 import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.core.model.MovieUiModel
 import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.ui.common.badge.WatchStateBadge
+import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.screen.library.components.LibraryTopBar

@Composable
@@ -98,7 +98,6 @@ internal fun LibraryPosterGrid(
                                    .align(Alignment.TopEnd)
                                    .padding(8.dp),
                                watched = item.watched,
-                                started = (item.progress ?: 0f) > 0f
                            )
                        }
                        else -> Unit
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
@@ -59,13 +59,13 @@ import hu.bbara.purefin.core.download.DownloadState
 import hu.bbara.purefin.core.feature.content.series.SeriesViewModel
 import hu.bbara.purefin.core.image.ArtworkKind
 import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
@@ -376,7 +376,6 @@ private fun EpisodeCard(
            } else {
                WatchStateBadge(
                    watched = episode.watched,
-                    started = (episode.progress ?: 0.0) > 0.0,
                    modifier = Modifier
                        .align(Alignment.TopEnd)
                        .padding(8.dp)
--- a/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt
+++ b/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt
@@ -21,7 +21,7 @@ fun UnwatchedEpisodeBadge(
    unwatchedCount: Int,
    foregroundColor: Color = MaterialTheme.colorScheme.onPrimary,
    backgroundColor: Color = MaterialTheme.colorScheme.primary,
-    size: Int = 24,
+    size: Int = 28,
    modifier: Modifier = Modifier
 ) {
    if (unwatchedCount == 0) {
@@ -31,16 +31,16 @@ fun UnwatchedEpisodeBadge(
    Box(
        contentAlignment = Alignment.Center,
        modifier = modifier
-            .border(1.dp, backgroundColor.copy(alpha = 0.8f), CircleShape)
-            .background(backgroundColor.copy(alpha = 0.8f), CircleShape)
+            .border(1.dp, backgroundColor, CircleShape)
+            .background(backgroundColor, CircleShape)
            .size(size.dp)
            .clip(CircleShape)
    ) {
        Text(
-            text = if (unwatchedCount > 9) "9+" else unwatchedCount.toString(),
-            color = foregroundColor.copy(alpha = 0.8f),
-            fontWeight = FontWeight.W900,
-            fontSize = 15.sp
+            text = if (unwatchedCount > 99) "99+" else unwatchedCount.toString(),
+            color = foregroundColor,
+            fontWeight = FontWeight.Bold,
+            fontSize = 13.sp
        )
    }
 }
--- a/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt
+++ b/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt
@@ -22,41 +22,32 @@ import androidx.compose.ui.unit.dp
@Composable
 fun WatchStateBadge(
    watched: Boolean,
-    started: Boolean,
    watchedColor: Color = MaterialTheme.colorScheme.onPrimary,
    watchedBackgroundColor: Color = MaterialTheme.colorScheme.primary,
-    startedColor: Color = MaterialTheme.colorScheme.onSecondary,
-    startedBackgroundColor: Color = MaterialTheme.colorScheme.secondary,
    size: Int = 24,
    modifier: Modifier = Modifier
 ) {
-    if (!watched && !started) {
+    if (!watched) {
        return
    }

-    val foregroundColor = if (watched) watchedColor.copy(alpha = 0.8f) else startedColor.copy(alpha = 0.3f)
-    val backgroundColor = if (watched) watchedBackgroundColor.copy(alpha = 0.8f) else startedBackgroundColor.copy(alpha = 0.3f)
-    val borderColor = if (watched) watchedBackgroundColor.copy(alpha = 0.8f) else startedBackgroundColor.copy(alpha = 0.8f)
-
    Box(
        contentAlignment = Alignment.Center,
        modifier = modifier
-            .border(1.dp, borderColor, CircleShape)
-            .background(backgroundColor, CircleShape)
+            .border(1.dp, watchedBackgroundColor, CircleShape)
+            .background(watchedBackgroundColor, CircleShape)
            .size(size.dp)
            .clip(CircleShape)
    ) {
-        if (watched) {
        Icon(
            imageVector = Icons.Outlined.Check,
            contentDescription = "Check",
-                tint = foregroundColor,
+            tint = watchedColor,
            modifier = Modifier
                .padding(1.dp)
                .matchParentSize()
        )
    }
-    }
 }

@Preview
@@ -65,15 +56,12 @@ private fun WatchStateBadgePreview() {
    Column {
        WatchStateBadge(
            watched = false,
-            started = false
        )
        WatchStateBadge(
            watched = true,
-            started = false
        )
        WatchStateBadge(
            watched = false,
-            started = true
        )
    }
 }