- Removed middle layer of abstraction for subsonic classes
- Used kotlin for classes
This commit is contained in:
@@ -6,11 +6,12 @@ import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.AndroidViewModel;
|
||||
import androidx.lifecycle.LiveData;
|
||||
|
||||
import com.cappielloantonio.play.model.Album;
|
||||
import com.cappielloantonio.play.model.Artist;
|
||||
import com.cappielloantonio.play.model.Media;
|
||||
import com.cappielloantonio.play.repository.AlbumRepository;
|
||||
import com.cappielloantonio.play.repository.ArtistRepository;
|
||||
import com.cappielloantonio.play.subsonic.models.AlbumID3;
|
||||
import com.cappielloantonio.play.subsonic.models.ArtistID3;
|
||||
import com.cappielloantonio.play.subsonic.models.ArtistInfo2;
|
||||
import com.cappielloantonio.play.subsonic.models.Child;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -18,7 +19,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
|
||||
private final AlbumRepository albumRepository;
|
||||
private final ArtistRepository artistRepository;
|
||||
|
||||
private Artist artist;
|
||||
private ArtistID3 artist;
|
||||
|
||||
public ArtistPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
@@ -27,23 +28,23 @@ public class ArtistPageViewModel extends AndroidViewModel {
|
||||
artistRepository = new ArtistRepository(application);
|
||||
}
|
||||
|
||||
public LiveData<List<Album>> getAlbumList() {
|
||||
public LiveData<List<AlbumID3>> getAlbumList() {
|
||||
return albumRepository.getArtistAlbums(artist.getId());
|
||||
}
|
||||
|
||||
public LiveData<Artist> getArtistInfo(String id) {
|
||||
public LiveData<ArtistInfo2> getArtistInfo(String id) {
|
||||
return artistRepository.getArtistFullInfo(id);
|
||||
}
|
||||
|
||||
public LiveData<List<Media>> getArtistTopSongList(int count) {
|
||||
public LiveData<List<Child>> getArtistTopSongList(int count) {
|
||||
return artistRepository.getTopSongs(artist.getName(), count);
|
||||
}
|
||||
|
||||
public Artist getArtist() {
|
||||
public ArtistID3 getArtist() {
|
||||
return artist;
|
||||
}
|
||||
|
||||
public void setArtist(Artist artist) {
|
||||
public void setArtist(ArtistID3 artist) {
|
||||
this.artist = artist;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user