antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 09:53:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implementation of download navigation for artists and albums

Browse source
This commit is contained in:
CappielloAntonio 2021-08-30 12:38:43 +02:00
parent c5f39cf9ee
commit 86d46f7537
16 changed files with 98 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumListPageViewModel.java
View file

@ -9,16 +9,21 @@ import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.AlbumRepository;
import com.cappielloantonio.play.repository.DownloadRepository;
import com.cappielloantonio.play.util.MappingUtil;
import java.util.ArrayList;
import java.util.List;
public class AlbumListPageViewModel extends AndroidViewModel {
private AlbumRepository albumRepository;
private DownloadRepository downloadRepository;
public String title;
public Artist artist;
private MutableLiveData<List<Album>> albumList;
@ -26,30 +31,41 @@ public class AlbumListPageViewModel extends AndroidViewModel {
super(application);
albumRepository = new AlbumRepository(application);
downloadRepository = new DownloadRepository(application);
}
public LiveData<List<Album>> getAlbumList(FragmentActivity activity) {
albumList = new MutableLiveData<>(new ArrayList<>());
switch (title) {
case Song.RECENTLY_PLAYED:
case Album.RECENTLY_PLAYED:
albumRepository.getAlbums("recent", 500).observe(activity, albums -> {
albumList.setValue(albums);
});
break;
case Song.MOST_PLAYED:
case Album.MOST_PLAYED:
albumRepository.getAlbums("frequent", 500).observe(activity, albums -> {
albumList.setValue(albums);
});
break;
case Song.RECENTLY_ADDED:
case Album.RECENTLY_ADDED:
albumRepository.getAlbums("newest", 500).observe(activity, albums -> {
albumList.setValue(albums);
});
break;
case Song.STARRED:
case Album.STARRED:
albumList = albumRepository.getStarredAlbums();
break;
case Album.DOWNLOADED:
downloadRepository.getLiveDownload().observe(activity, downloads -> {
albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads));
});
break;
case Album.FROM_ARTIST:
downloadRepository.getLiveDownloadFromArtist(artist.getId()).observe(activity, downloads -> {
albumList.setValue(MappingUtil.mapDownloadToAlbum(downloads));
});
break;
}
return albumList;

16
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistListPageViewModel.java
View file

@ -3,19 +3,25 @@ package com.cappielloantonio.play.viewmodel;
import android.app.Application;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.model.Download;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.ArtistRepository;
import com.cappielloantonio.play.repository.DownloadRepository;
import com.cappielloantonio.play.util.MappingUtil;
import java.util.ArrayList;
import java.util.List;
public class ArtistListPageViewModel extends AndroidViewModel {
private ArtistRepository artistRepository;
private DownloadRepository downloadRepository;
public String title;
@ -25,15 +31,21 @@ public class ArtistListPageViewModel extends AndroidViewModel {
super(application);
artistRepository = new ArtistRepository(application);
downloadRepository = new DownloadRepository(application);
}
public LiveData<List<Artist>> getArtistList() {
public LiveData<List<Artist>> getArtistList(FragmentActivity activity) {
artistList = new MutableLiveData<>(new ArrayList<>());
switch (title) {
case Song.STARRED:
case Artist.STARRED:
artistList = artistRepository.getStarredArtists();
break;
case Artist.DOWNLOADED:
downloadRepository.getLiveDownload().observe(activity, downloads -> {
artistList.setValue(MappingUtil.mapDownloadToArtist(downloads));
});
break;
}
return artistList;

18
app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java
View file

@ -4,10 +4,12 @@ import android.app.Application;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Artist;
import com.cappielloantonio.play.model.Genre;
import com.cappielloantonio.play.model.Song;
@ -27,6 +29,9 @@ public class SongListPageViewModel extends AndroidViewModel {
public String title;
public Genre genre;
public Artist artist;
public Album album;
private MutableLiveData<List<Song>> songList;
public ArrayList<String> filters = new ArrayList<>();
public ArrayList<String> filterNames = new ArrayList<>();
@ -41,8 +46,8 @@ public class SongListPageViewModel extends AndroidViewModel {
downloadRepository = new DownloadRepository(application);
}
public LiveData<List<Song>> getSongList() {
MutableLiveData<List<Song>> songList = new MutableLiveData<>(new ArrayList<>());
public LiveData<List<Song>> getSongList(FragmentActivity activity) {
songList = new MutableLiveData<>(new ArrayList<>());
switch (title) {
case Song.RECENTLY_PLAYED:
@ -70,7 +75,14 @@ public class SongListPageViewModel extends AndroidViewModel {
songList = songRepository.getStarredSongs(false, -1);
break;
case Song.DOWNLOADED:
songList.setValue(MappingUtil.mapDownloadToSong(downloadRepository.getLiveDownload()));
downloadRepository.getLiveDownload().observe(activity, downloads -> {
songList.setValue(MappingUtil.mapDownloadToSong(downloads));
});
break;
case Song.FROM_ALBUM:
downloadRepository.getLiveDownloadFromAlbum(album.getId()).observe(activity, downloads -> {
songList.setValue(MappingUtil.mapDownloadToSong(downloads));
});
break;
}