mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 01:53:31 +00:00
Fix genre retrieval and filtering
This commit is contained in:
parent
37e45e7957
commit
fd4250b6f7
11 changed files with 139 additions and 73 deletions
|
|
@ -26,7 +26,7 @@ public class FilterViewModel extends AndroidViewModel {
|
|||
}
|
||||
|
||||
public LiveData<List<Genre>> getGenreList() {
|
||||
// allGenres = genreRepository.getListLiveGenres();
|
||||
allGenres = genreRepository.getGenres(false, -1);
|
||||
return allGenres;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ public class GenreCatalogueViewModel extends AndroidViewModel {
|
|||
}
|
||||
|
||||
public LiveData<List<Genre>> getGenreList() {
|
||||
// genreList = genreRepository.getListLiveGenres();
|
||||
return genreList;
|
||||
return genreRepository.getGenres(false, -1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,14 +40,9 @@ public class LibraryViewModel extends AndroidViewModel {
|
|||
|
||||
// Inizializzate all'interno del costruttore, in modo da rimanere immutabili per tutto il
|
||||
// ciclo di vita dell'applicazione
|
||||
// sampleAlbum = albumRepository.getListLiveSampleAlbum();
|
||||
// sampleArtist = artistRepository.getListLiveSampleArtist();
|
||||
// sampleGenres = genreRepository.getListLiveSampleGenre();
|
||||
// playlistSample = playlistRepository.getRandomSample(5);
|
||||
|
||||
sampleAlbum = albumRepository.getAlbums("random", 20);
|
||||
sampleArtist = artistRepository.getArtists(true, 20);
|
||||
sampleGenres = new MutableLiveData<>(new ArrayList<>());
|
||||
sampleGenres = genreRepository.getGenres(true, 15);
|
||||
playlistSample = playlistRepository.getPlaylists(true, 10);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,13 +58,13 @@ public class SongListPageViewModel extends AndroidViewModel {
|
|||
// songList = songRepository.getListLiveRecentlyAddedSampleSong(100);
|
||||
break;
|
||||
case Song.BY_GENRE:
|
||||
// songList = songRepository.getListLiveSongByGenre(genre.getId());
|
||||
songList = songList = songRepository.getSongsByGenre(genre.getId());
|
||||
break;
|
||||
case Song.BY_ARTIST:
|
||||
// songList = songRepository.getArtistListLiveTopSong(artist.getId());
|
||||
break;
|
||||
case Song.BY_GENRES:
|
||||
// songList = songRepository.getFilteredListLiveSong(filters);
|
||||
songList = songRepository.getSongsByGenres(filters);
|
||||
break;
|
||||
case Song.BY_YEAR:
|
||||
// songList = songRepository.getSongByYearListLive(year);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue