FreshRSS/ReadYou
1
0
Fork 0
mirror of https://github.com/Ashinch/ReadYou.git synced 2025-02-07 23:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix/round bottom group (#533)

Browse Source
This commit is contained in:
kid1412621 2024-01-16 22:25:35 +08:00 committed by GitHub
parent 98934d1bab
commit dfceef6c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/me/ash/reader/domain/model/group/Group.kt
View File

@ -23,4 +23,10 @@ data class Group(
*/ */
@Ignore @Ignore
var important: Int? = 0 var important: Int? = 0
/**
* number of feeds within a group
* */
@Ignore
var feeds: Int = 0
} }

2
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt
View File

@ -228,7 +228,7 @@ fun FeedsPage(
group = groupWithFeed.group, group = groupWithFeed.group,
alpha = groupAlpha, alpha = groupAlpha,
indicatorAlpha = groupIndicatorAlpha, indicatorAlpha = groupIndicatorAlpha,
roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.important == 0 }, roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.feeds == 0 },
onExpanded = { onExpanded = {
groupsVisible[groupWithFeed.group.id] = groupsVisible.getOrPut( groupsVisible[groupWithFeed.group.id] = groupsVisible.getOrPut(
groupWithFeed.group.id, groupWithFeed.group.id,

1
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt
View File

@ -76,6 +76,7 @@ class FeedsViewModel @Inject constructor(
while (feedIterator.hasNext()) { while (feedIterator.hasNext()) {
val feed = feedIterator.next() val feed = feedIterator.next()
val feedImportant = importantMap[feed.id] ?: 0 val feedImportant = importantMap[feed.id] ?: 0
groupWithFeed.group.feeds++
if ((isStarred || isUnread) && feedImportant == 0) { if ((isStarred || isUnread) && feedImportant == 0) {
feedIterator.remove() feedIterator.remove()
continue continue