mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-01 01:53:31 +00:00
Code decontextualization
This commit is contained in:
parent
f16650a74b
commit
a4b31a9c02
108 changed files with 569 additions and 952 deletions
|
|
@ -25,8 +25,8 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
|
|||
public AlbumBottomSheetViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
}
|
||||
|
||||
public AlbumID3 getAlbum() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.cappielloantonio.play.viewmodel;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.AndroidViewModel;
|
||||
|
|
@ -12,7 +11,6 @@ import com.cappielloantonio.play.App;
|
|||
import com.cappielloantonio.play.interfaces.MediaCallback;
|
||||
import com.cappielloantonio.play.subsonic.base.ApiResponse;
|
||||
import com.cappielloantonio.play.subsonic.models.AlbumID3;
|
||||
import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -33,8 +31,8 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
|
|||
return albumList;
|
||||
}
|
||||
|
||||
public void loadAlbums(Context context, int size) {
|
||||
retrieveAlbums(context, new MediaCallback() {
|
||||
public void loadAlbums(int size) {
|
||||
retrieveAlbums(new MediaCallback() {
|
||||
@Override
|
||||
public void onError(Exception exception) {
|
||||
}
|
||||
|
|
@ -49,15 +47,15 @@ public class AlbumCatalogueViewModel extends AndroidViewModel {
|
|||
albumList.setValue(liveAlbum);
|
||||
|
||||
if (media.size() == size) {
|
||||
loadAlbums(context, size);
|
||||
loadAlbums(size);
|
||||
}
|
||||
}
|
||||
}, size, size * page++);
|
||||
}
|
||||
|
||||
|
||||
private void retrieveAlbums(Context context, MediaCallback callback, int size, int offset) {
|
||||
App.getSubsonicClientInstance(context, false)
|
||||
private void retrieveAlbums(MediaCallback callback, int size, int offset) {
|
||||
App.getSubsonicClientInstance(false)
|
||||
.getAlbumSongListClient()
|
||||
.getAlbumList2("alphabeticalByName", size, offset, null, null)
|
||||
.enqueue(new Callback<ApiResponse>() {
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ public class AlbumListPageViewModel extends AndroidViewModel {
|
|||
public AlbumListPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<AlbumID3>> getAlbumList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ public class AlbumPageViewModel extends AndroidViewModel {
|
|||
public AlbumPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getAlbumSongLiveList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class ArtistBottomSheetViewModel extends AndroidViewModel {
|
|||
public ArtistBottomSheetViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
}
|
||||
|
||||
public ArtistID3 getArtist() {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.cappielloantonio.play.viewmodel;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.AndroidViewModel;
|
||||
|
|
@ -12,7 +11,6 @@ import com.cappielloantonio.play.App;
|
|||
import com.cappielloantonio.play.subsonic.base.ApiResponse;
|
||||
import com.cappielloantonio.play.subsonic.models.ArtistID3;
|
||||
import com.cappielloantonio.play.subsonic.models.IndexID3;
|
||||
import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
|
@ -31,8 +29,8 @@ public class ArtistCatalogueViewModel extends AndroidViewModel {
|
|||
return artistList;
|
||||
}
|
||||
|
||||
public void loadArtists(Context context) {
|
||||
App.getSubsonicClientInstance(context, false)
|
||||
public void loadArtists() {
|
||||
App.getSubsonicClientInstance(false)
|
||||
.getBrowsingClient()
|
||||
.getArtists()
|
||||
.enqueue(new Callback<ApiResponse>() {
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ public class ArtistListPageViewModel extends AndroidViewModel {
|
|||
public ArtistListPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
artistRepository = new ArtistRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
artistRepository = new ArtistRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<ArtistID3>> getArtistList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ public class ArtistPageViewModel extends AndroidViewModel {
|
|||
public ArtistPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<AlbumID3>> getAlbumList() {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import com.cappielloantonio.play.repository.DownloadRepository;
|
|||
import com.cappielloantonio.play.subsonic.models.AlbumID3;
|
||||
import com.cappielloantonio.play.subsonic.models.ArtistID3;
|
||||
import com.cappielloantonio.play.subsonic.models.Child;
|
||||
import com.cappielloantonio.play.util.MappingUtil;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -31,7 +30,7 @@ public class DownloadViewModel extends AndroidViewModel {
|
|||
public DownloadViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getDownloadedTracks(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public class FilterViewModel extends AndroidViewModel {
|
|||
public FilterViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
genreRepository = new GenreRepository(application);
|
||||
genreRepository = new GenreRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Genre>> getGenreList() {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public class GenreCatalogueViewModel extends AndroidViewModel {
|
|||
public GenreCatalogueViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
genreRepository = new GenreRepository(application);
|
||||
genreRepository = new GenreRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Genre>> getGenreList() {
|
||||
|
|
|
|||
|
|
@ -60,12 +60,12 @@ public class HomeViewModel extends AndroidViewModel {
|
|||
public HomeViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
podcastRepository = new PodcastRepository(application);
|
||||
chronologyRepository = new ChronologyRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
playlistRepository = new PlaylistRepository();
|
||||
podcastRepository = new PodcastRepository();
|
||||
chronologyRepository = new ChronologyRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getDiscoverSongSample(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@ public class LibraryViewModel extends AndroidViewModel {
|
|||
public LibraryViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
genreRepository = new GenreRepository(application);
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
genreRepository = new GenreRepository();
|
||||
playlistRepository = new PlaylistRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<AlbumID3>> getAlbumSample(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public class LoginViewModel extends AndroidViewModel {
|
|||
public LoginViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
serverRepository = new ServerRepository(application);
|
||||
serverRepository = new ServerRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Server>> getServerList() {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ public class MainViewModel extends AndroidViewModel {
|
|||
super(application);
|
||||
this.application = application;
|
||||
|
||||
systemRepository = new SystemRepository(application);
|
||||
systemRepository = new SystemRepository();
|
||||
}
|
||||
|
||||
public boolean isQueueLoaded() {
|
||||
QueueRepository queueRepository = new QueueRepository(application);
|
||||
QueueRepository queueRepository = new QueueRepository();
|
||||
return queueRepository.count() != 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
|
|||
public PlayerBottomSheetViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
queueRepository = new QueueRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
queueRepository = new QueueRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Queue>> getQueueSong() {
|
||||
|
|
@ -62,7 +62,7 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
|
|||
// TODO
|
||||
/* if (Preferences.isStarredSyncEnabled()) {
|
||||
DownloadUtil.getDownloadTracker(context).download(
|
||||
MappingUtil.mapMediaItem(context, media, false),
|
||||
MappingUtil.mapMediaItem(media, false),
|
||||
MappingUtil.mapDownload(media, null, null)
|
||||
);
|
||||
} */
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ public class PlaylistCatalogueViewModel extends AndroidViewModel {
|
|||
public PlaylistCatalogueViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
playlistRepository = new PlaylistRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Playlist>> getPlaylistList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class PlaylistChooserViewModel extends AndroidViewModel {
|
|||
public PlaylistChooserViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
playlistRepository = new PlaylistRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Playlist>> getPlaylistList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public class PlaylistEditorViewModel extends AndroidViewModel {
|
|||
public PlaylistEditorViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
playlistRepository = new PlaylistRepository();
|
||||
}
|
||||
|
||||
public void createPlaylist(String name) {
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ public class PlaylistPageViewModel extends AndroidViewModel {
|
|||
public PlaylistPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
playlistRepository = new PlaylistRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
playlistRepository = new PlaylistRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getPlaylistSongLiveList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public class PodcastBottomSheetViewModel extends AndroidViewModel {
|
|||
public PodcastBottomSheetViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
podcastRepository = new PodcastRepository(application);
|
||||
podcastRepository = new PodcastRepository();
|
||||
}
|
||||
|
||||
public PodcastEpisode getPodcast() {
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ public class RatingViewModel extends AndroidViewModel {
|
|||
public RatingViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
}
|
||||
|
||||
public Child getSong() {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class SearchViewModel extends AndroidViewModel {
|
|||
public SearchViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
searchingRepository = new SearchingRepository(application);
|
||||
searchingRepository = new SearchingRepository();
|
||||
}
|
||||
|
||||
public String getQuery() {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public class SettingViewModel extends AndroidViewModel {
|
|||
public SettingViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
scanRepository = new ScanRepository(application);
|
||||
scanRepository = new ScanRepository();
|
||||
}
|
||||
|
||||
public void launchScan(ScanCallback callback) {
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
|
|||
public SongBottomSheetViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
albumRepository = new AlbumRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
albumRepository = new AlbumRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
}
|
||||
|
||||
public Child getSong() {
|
||||
|
|
@ -61,7 +61,7 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
|
|||
|
||||
if (Preferences.isStarredSyncEnabled()) {
|
||||
DownloadUtil.getDownloadTracker(context).download(
|
||||
MappingUtil.mapMediaItem(context, song, false),
|
||||
MappingUtil.mapMediaItem(song, false),
|
||||
new Download(song)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import com.cappielloantonio.play.subsonic.models.Genre;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class SongListPageViewModel extends AndroidViewModel {
|
||||
private final SongRepository songRepository;
|
||||
|
|
@ -43,9 +42,9 @@ public class SongListPageViewModel extends AndroidViewModel {
|
|||
public SongListPageViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
artistRepository = new ArtistRepository(application);
|
||||
downloadRepository = new DownloadRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
artistRepository = new ArtistRepository();
|
||||
downloadRepository = new DownloadRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getSongList(LifecycleOwner owner) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public class StarredSyncViewModel extends AndroidViewModel {
|
|||
public StarredSyncViewModel(@NonNull Application application) {
|
||||
super(application);
|
||||
|
||||
songRepository = new SongRepository(application);
|
||||
songRepository = new SongRepository();
|
||||
}
|
||||
|
||||
public LiveData<List<Child>> getStarredTracks(LifecycleOwner owner) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue