From 0d1f69d36e8c25b238aa364ee6cfda389855e192 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 23 Sep 2023 01:14:06 +0530 Subject: [PATCH] refactor(android): expose 'plain' `SavedPosts` list in VM --- .../dev/msfjarvis/claw/android/ui/LobstersApp.kt | 2 +- .../msfjarvis/claw/android/viewmodel/ClawViewModel.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index 04452f2c..34e9c895 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -97,7 +97,7 @@ fun LobstersApp( val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems() val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems() - val savedPosts by viewModel.savedPosts.collectAsState(persistentMapOf()) + val savedPosts by viewModel.savedPostsByMonth.collectAsState(persistentMapOf()) val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt index 90d121a9..324155b8 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt @@ -76,11 +76,11 @@ constructor( val newestPosts get() = newestPostsPager.flow - private val savedPostsFlow - get() = savedPostsRepository.savedPosts - val savedPosts - get() = savedPostsFlow.map(::mapSavedPosts) + get() = savedPostsRepository.savedPosts + + val savedPostsByMonth + get() = savedPosts.map(::mapSavedPosts) val searchResults get() = searchResultsPager.flow @@ -93,7 +93,7 @@ constructor( } suspend fun isPostSaved(post: SavedPost): Boolean { - return savedPostsFlow.first().any { savedPost -> savedPost.shortId == post.shortId } + return savedPosts.first().any { savedPost -> savedPost.shortId == post.shortId } } fun toggleSave(post: SavedPost) {