Fix/round bottom group (#533)

Ashinch · Jan 16, 2024 · dfceef6 · dfceef6
1 parent 98934d1
commit dfceef6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/me/ash/reader/domain/model/group/Group.kt b/app/src/main/java/me/ash/reader/domain/model/group/Group.kt
@@ -23,4 +23,10 @@ data class Group(
      */
     @Ignore
     var important: Int? = 0
+
+    /**
+     * number of feeds within a group
+     * */
+    @Ignore
+    var feeds: Int = 0
 }
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
@@ -228,7 +228,7 @@ fun FeedsPage(
                                 group = groupWithFeed.group,
                                 alpha = groupAlpha,
                                 indicatorAlpha = groupIndicatorAlpha,
-                                roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.important == 0 },
+                                roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.feeds == 0 },
                                 onExpanded = {
                                     groupsVisible[groupWithFeed.group.id] = groupsVisible.getOrPut(
                                         groupWithFeed.group.id,

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt
@@ -76,6 +76,7 @@ class FeedsViewModel @Inject constructor(
                         while (feedIterator.hasNext()) {
                             val feed = feedIterator.next()
                             val feedImportant = importantMap[feed.id] ?: 0
+                            groupWithFeed.group.feeds++
                             if ((isStarred || isUnread) && feedImportant == 0) {
                                 feedIterator.remove()
                                 continue