From ddfe10b869cb842faa12ac725040ff9e06167d50 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Fri, 29 Nov 2024 09:48:26 -0700 Subject: [PATCH] home: fix no music indicator --- .../java/org/oxycblt/auxio/home/list/AlbumListFragment.kt | 5 +++-- .../java/org/oxycblt/auxio/home/list/ArtistListFragment.kt | 6 ++++-- .../java/org/oxycblt/auxio/home/list/GenreListFragment.kt | 5 +++-- .../org/oxycblt/auxio/home/list/PlaylistListFragment.kt | 6 ++++-- .../java/org/oxycblt/auxio/home/list/SongListFragment.kt | 5 +++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt index dfa5aaf8f..d26c1983a 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt @@ -151,8 +151,9 @@ class AlbumListFragment : private fun updateAlbums(albums: List, indexingState: IndexingState?) { requireBinding().apply { - homeRecycler.isInvisible = indexingState == null || albums.isEmpty() - homeNoMusic.isInvisible = indexingState != null || albums.isNotEmpty() + homeRecycler.isInvisible = indexingState !is IndexingState.Completed || albums.isEmpty() + homeNoMusic.isInvisible = + indexingState !is IndexingState.Completed || albums.isNotEmpty() } albumAdapter.update(albums, homeModel.albumInstructions.consume()) } diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt index 2b62e1c1b..386ee1df7 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt @@ -127,8 +127,10 @@ class ArtistListFragment : private fun updateArtists(artists: List, indexingState: IndexingState?) { requireBinding().apply { - homeRecycler.isInvisible = indexingState == null || artists.isEmpty() - homeNoMusic.isInvisible = indexingState != null || artists.isNotEmpty() + homeRecycler.isInvisible = + indexingState !is IndexingState.Completed || artists.isEmpty() + homeNoMusic.isInvisible = + indexingState !is IndexingState.Completed || artists.isNotEmpty() } artistAdapter.update(artists, homeModel.artistInstructions.consume()) } diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt index 218764065..08953e580 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt @@ -126,8 +126,9 @@ class GenreListFragment : private fun updateGenres(genres: List, indexingState: IndexingState?) { requireBinding().apply { - homeRecycler.isInvisible = indexingState == null || genres.isEmpty() - homeNoMusic.isInvisible = indexingState != null || genres.isNotEmpty() + homeRecycler.isInvisible = indexingState !is IndexingState.Completed || genres.isEmpty() + homeNoMusic.isInvisible = + indexingState !is IndexingState.Completed || genres.isNotEmpty() } genreAdapter.update(genres, homeModel.genreInstructions.consume()) } diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt index a60c940ef..70b7e7e1b 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt @@ -124,8 +124,10 @@ class PlaylistListFragment : private fun updatePlaylists(playlists: List, indexingState: IndexingState?) { requireBinding().apply { - homeRecycler.isInvisible = indexingState == null || playlists.isEmpty() - homeNoMusic.isInvisible = indexingState != null || playlists.isNotEmpty() + homeRecycler.isInvisible = + indexingState !is IndexingState.Completed || playlists.isEmpty() + homeNoMusic.isInvisible = + indexingState !is IndexingState.Completed || playlists.isNotEmpty() } playlistAdapter.update(playlists, homeModel.playlistInstructions.consume()) } diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt index 0631b6ba9..36a24f20c 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt @@ -151,8 +151,9 @@ class SongListFragment : private fun updateSongs(songs: List, indexingState: IndexingState?) { requireBinding().apply { - homeRecycler.isInvisible = indexingState == null || songs.isEmpty() - homeNoMusic.isInvisible = indexingState != null || songs.isNotEmpty() + homeRecycler.isInvisible = indexingState !is IndexingState.Completed || songs.isEmpty() + homeNoMusic.isInvisible = + indexingState !is IndexingState.Completed || songs.isNotEmpty() } songAdapter.update(songs, homeModel.songInstructions.consume()) }