Move to ScreenModel

mihonapp · Sep 28, 2024 · 59fa07a · 59fa07a
1 parent 04f2609
commit 59fa07a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt b/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt
@@ -72,6 +72,7 @@ fun UpcomingScreenContent(
                 setSelectedYearMonth = setSelectedYearMonth,
                 onClickDay = { onClickDay(it, 0) },
                 onClickUpcoming = onClickUpcoming,
+                mangaCountMap = state.mangaCountMap,
             )
         } else {
             UpcomingScreenSmallImpl(
@@ -83,6 +84,7 @@ fun UpcomingScreenContent(
                 setSelectedYearMonth = setSelectedYearMonth,
                 onClickDay = { onClickDay(it, 1) },
                 onClickUpcoming = onClickUpcoming,
+                mangaCountMap = state.mangaCountMap,
             )
         }
     }
@@ -144,6 +146,7 @@ private fun UpcomingScreenSmallImpl(
     setSelectedYearMonth: (YearMonth) -> Unit,
     onClickDay: (LocalDate) -> Unit,
     onClickUpcoming: (manga: Manga) -> Unit,
+    mangaCountMap: ImmutableMap<LocalDate, Int>,
 ) {
     FastScrollLazyColumn(
         contentPadding = paddingValues,
@@ -175,8 +178,7 @@ private fun UpcomingScreenSmallImpl(
                     )
                 }
                 is UpcomingUIModel.Header -> {
-                    val mangaCount = items.filterIsInstance<UpcomingUIModel.Item>()
-                        .count { it.manga.expectedNextUpdate?.toLocalDate() == item.date }
+                    val mangaCount = mangaCountMap[item.date] ?: 0
 
                     DateHeading(
                         date = item.date,
@@ -198,6 +200,7 @@ private fun UpcomingScreenLargeImpl(
     setSelectedYearMonth: (YearMonth) -> Unit,
     onClickDay: (LocalDate) -> Unit,
     onClickUpcoming: (manga: Manga) -> Unit,
+    mangaCountMap: ImmutableMap<LocalDate, Int>,
 ) {
     TwoPanelBox(
         modifier = Modifier.padding(paddingValues),
@@ -229,8 +232,7 @@ private fun UpcomingScreenLargeImpl(
                             )
                         }
                         is UpcomingUIModel.Header -> {
-                            val mangaCount = items.filterIsInstance<UpcomingUIModel.Item>()
-                                .count { it.manga.expectedNextUpdate?.toLocalDate() == item.date }
+                            val mangaCount = mangaCountMap[item.date] ?: 0
 
                             DateHeading(
                                 date = item.date,

diff --git a/app/src/main/java/mihon/feature/upcoming/UpcomingScreenModel.kt b/app/src/main/java/mihon/feature/upcoming/UpcomingScreenModel.kt
@@ -28,13 +28,17 @@ class UpcomingScreenModel(
 
     init {
         screenModelScope.launch {
-            getUpcomingManga.subscribe().collectLatest {
+            getUpcomingManga.subscribe().collectLatest { mangaList ->
                 mutableState.update { state ->
-                    val upcomingItems = it.toUpcomingUIModels()
+                    val upcomingItems = mangaList.toUpcomingUIModels()
+                    val mangaCountMap = mangaList.groupBy { it.expectedNextUpdate?.toLocalDate() ?: LocalDate.MAX }
+                        .mapValues { it.value.size }
+                        .toImmutableMap()
                     state.copy(
                         items = upcomingItems,
-                        events = it.toEvents(),
+                        events = mangaList.toEvents(),
                         headerIndexes = upcomingItems.getHeaderIndexes(),
+                        mangaCountMap = mangaCountMap
                     )
                 }
             }
@@ -83,5 +87,6 @@ class UpcomingScreenModel(
         val items: ImmutableList<UpcomingUIModel> = persistentListOf(),
         val events: ImmutableMap<LocalDate, Int> = persistentMapOf(),
         val headerIndexes: ImmutableMap<LocalDate, Int> = persistentMapOf(),
+        val mangaCountMap: ImmutableMap<LocalDate, Int> = persistentMapOf(),
     )
 }