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

This commit is contained in:
2026-05-07 19:51:28 +02:00
parent 56fe574940
commit dc5c324962
8 changed files with 48 additions and 48 deletions

View File

@@ -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
)
}
}

View File

@@ -22,40 +22,31 @@ 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,
modifier = Modifier
.padding(1.dp)
.matchParentSize()
)
}
Icon(
imageVector = Icons.Outlined.Check,
contentDescription = "Check",
tint = watchedColor,
modifier = Modifier
.padding(1.dp)
.matchParentSize()
)
}
}
@@ -65,15 +56,12 @@ private fun WatchStateBadgePreview() {
Column {
WatchStateBadge(
watched = false,
started = false
)
WatchStateBadge(
watched = true,
started = false
)
WatchStateBadge(
watched = false,
started = true
)
}
}