From fab78966fd7127007ef4f03a9872a518193804df Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Wed, 13 Mar 2024 15:57:50 -0700 Subject: [PATCH 1/2] Fix empty screen. --- .../example/jetcaster/ui/home/HomeViewModel.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt index d81092738b..aa2ddc1c73 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt @@ -60,14 +60,19 @@ class HomeViewModel( private val refreshing = MutableStateFlow(false) @OptIn(ExperimentalCoroutinesApi::class) - private val libraryEpisodes = podcastStore.followedPodcastsSortedByLastEpisode() + private val libraryEpisodes = + podcastStore.followedPodcastsSortedByLastEpisode() .flatMapLatest { followedPodcasts -> - combine( - followedPodcasts.map { p -> - episodeStore.episodesInPodcast(p.podcast.uri, 5) + if (followedPodcasts.isEmpty()) { + flowOf(emptyList()) + } else { + combine( + followedPodcasts.map { p -> + episodeStore.episodesInPodcast(p.podcast.uri, 5) + } + ) { allEpisodes -> + allEpisodes.toList().flatten().sortedByDescending { it.episode.published } } - ) { allEpisodes -> - allEpisodes.toList().flatten().sortedByDescending { it.episode.published } } } From 5d59c9b5d4e870a30b8a1b4ebac733eefd838ddb Mon Sep 17 00:00:00 2001 From: arriolac Date: Wed, 13 Mar 2024 23:17:16 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20Apply=20Spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetcaster/ui/home/HomeViewModel.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt index aa2ddc1c73..9240c54076 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt @@ -62,19 +62,19 @@ class HomeViewModel( @OptIn(ExperimentalCoroutinesApi::class) private val libraryEpisodes = podcastStore.followedPodcastsSortedByLastEpisode() - .flatMapLatest { followedPodcasts -> - if (followedPodcasts.isEmpty()) { - flowOf(emptyList()) - } else { - combine( - followedPodcasts.map { p -> - episodeStore.episodesInPodcast(p.podcast.uri, 5) + .flatMapLatest { followedPodcasts -> + if (followedPodcasts.isEmpty()) { + flowOf(emptyList()) + } else { + combine( + followedPodcasts.map { p -> + episodeStore.episodesInPodcast(p.podcast.uri, 5) + } + ) { allEpisodes -> + allEpisodes.toList().flatten().sortedByDescending { it.episode.published } } - ) { allEpisodes -> - allEpisodes.toList().flatten().sortedByDescending { it.episode.published } } } - } private val discover = combine( categoryStore.categoriesSortedByPodcastCount()