From 73cfcfa318ab2f0fa942c36376b778d58b83dc1a Mon Sep 17 00:00:00 2001 From: aalbert Date: Wed, 12 Jun 2024 15:24:13 +0200 Subject: [PATCH] add important number to group --- .../ash/reader/ui/page/home/feeds/FeedsPage.kt | 1 + .../ash/reader/ui/page/home/feeds/GroupItem.kt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt index 18ca3c527..8842897b4 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt @@ -255,6 +255,7 @@ fun FeedsPage( }, group = groupWithFeed.group, alpha = groupAlpha, + badgeAlpha = feedBadgeAlpha, indicatorAlpha = groupIndicatorAlpha, roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.feeds == 0 }, onExpanded = { diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt index f22a42a24..1203fa193 100644 --- a/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt +++ b/app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.ExpandLess import androidx.compose.material.icons.rounded.ExpandMore +import androidx.compose.material3.Badge import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -34,6 +35,7 @@ import me.ash.reader.ui.theme.ShapeTop32 fun GroupItem( group: Group, alpha: Float = 1f, + badgeAlpha: Float = 1f, indicatorAlpha: Float = 1f, roundedBottomCorner: () -> Boolean, isExpanded: () -> Boolean, @@ -77,6 +79,21 @@ fun GroupItem( maxLines = 1, overflow = TextOverflow.Ellipsis, ) + if ((group.important ?: 0) != 0) { + Badge( + containerColor = MaterialTheme.colorScheme.surfaceTint.copy( + alpha = badgeAlpha + ), + contentColor = MaterialTheme.colorScheme.outline, + content = { + Text( + text = group.important.toString(), + style = MaterialTheme.typography.labelSmall + ) + }, + ) + } + Spacer(modifier = Modifier.width(12.dp)) Row( modifier = Modifier .padding(end = 20.dp) @@ -94,6 +111,7 @@ fun GroupItem( ) } } + Spacer(modifier = Modifier.height(22.dp)) } }