do not display default group if it is empty (#756)

Ashinch · Jun 19, 2024 · 384684e · 384684e
1 parent 9324511
commit 384684e
Showing 1 changed file with 33 additions and 24 deletions.
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
@@ -66,6 +66,7 @@ import me.ash.reader.ui.ext.collectAsStateValue
 import me.ash.reader.ui.ext.currentAccountId
 import me.ash.reader.ui.ext.findActivity
 import me.ash.reader.ui.ext.getCurrentVersion
+import me.ash.reader.ui.ext.getDefaultGroupId
 import me.ash.reader.ui.page.common.RouteName
 import me.ash.reader.ui.page.home.FilterState
 import me.ash.reader.ui.page.home.HomeViewModel
@@ -232,6 +233,7 @@ fun FeedsPage(
  )
  }
  }
+
  item {
  Spacer(modifier = Modifier.height(24.dp))
  Subtitle(
@@ -240,38 +242,45 @@ fun FeedsPage(
  )
  Spacer(modifier = Modifier.height(8.dp))
  }
+
+ val defaultGroupId = context.currentAccountId.getDefaultGroupId()
+
  itemsIndexed(groupWithFeedList) { index, groupWithFeed ->
  when (groupWithFeed) {
  is GroupFeedsView.Group -> {
  if (index != 0) {
  Spacer(modifier = Modifier.height(16.dp))
  }
- GroupItem(
- isExpanded = {
- groupsVisible.getOrPut(
- groupWithFeed.group.id,
- groupListExpand::value
+
+ if (groupWithFeed.group.id != defaultGroupId || groupWithFeed.group.feeds > 0) {
+ GroupItem(
+ isExpanded = {
+ groupsVisible.getOrPut(
+ groupWithFeed.group.id,
+ groupListExpand::value
+ )
+ },
+ group = groupWithFeed.group,
+ alpha = groupAlpha,
+ indicatorAlpha = groupIndicatorAlpha,
+ roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.feeds == 0 },
+ onExpanded = {
+ groupsVisible[groupWithFeed.group.id] =
+ groupsVisible.getOrPut(
+ groupWithFeed.group.id,
+ groupListExpand::value
+ ).not()
+ }
+ ) {
+ filterChange(
+ navController = navController,
+ homeViewModel = homeViewModel,
+ filterState = filterUiState.copy(
+ group = groupWithFeed.group,
+ feed = null,
+ )
  )
- },
- group = groupWithFeed.group,
- alpha = groupAlpha,
- indicatorAlpha = groupIndicatorAlpha,
- roundedBottomCorner = { index == groupWithFeedList.lastIndex || groupWithFeed.group.feeds == 0 },
- onExpanded = {
- groupsVisible[groupWithFeed.group.id] = groupsVisible.getOrPut(
- groupWithFeed.group.id,
- groupListExpand::value
- ).not()
  }
- ) {
- filterChange(
- navController = navController,
- homeViewModel = homeViewModel,
- filterState = filterUiState.copy(
- group = groupWithFeed.group,
- feed = null,
- )
- )
  }
  }