ros/tempo
1
0
Fork 0
mirror of https://github.com/CappielloAntonio/tempo.git synced 2026-02-01 23:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused database references

Browse Source
This commit is contained in:
CappielloAntonio
2021-07-28 15:28:32 +02:00
parent ca1831d23c
commit ce79bda976
46 changed files with 182 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumBottomSheetViewModel.java
View File

@@ -29,6 +29,7 @@ public class AlbumBottomSheetViewModel extends AndroidViewModel {
}
public Artist getArtist() {
return artistRepository.getArtistByID(album.getArtistId());
// return artistRepository.getArtistByID(album.getArtistId());
return null;
}
}

8
app/src/main/java/com/cappielloantonio/play/viewmodel/AlbumPageViewModel.java
View File

@@ -30,12 +30,13 @@ public class AlbumPageViewModel extends AndroidViewModel {
}
public LiveData<List<Song>> getAlbumSongLiveList() {
songLiveList = songRepository.getAlbumListLiveSong(album.getId());
// songLiveList = songRepository.getAlbumListLiveSong(album.getId());
return songLiveList;
}
public List<Song> getAlbumSongList() {
return songRepository.getAlbumListSong(album.getId(), false);
// return songRepository.getAlbumListSong(album.getId(), false);
return null;
}
public Album getAlbum() {
@@ -47,6 +48,7 @@ public class AlbumPageViewModel extends AndroidViewModel {
}
public Artist getArtist() {
return artistRepository.getArtistByID(album.getArtistId());
// return artistRepository.getArtistByID(album.getArtistId());
return null;
}
}

2
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistCatalogueViewModel.java
View File

@@ -23,7 +23,7 @@ public class ArtistCatalogueViewModel extends AndroidViewModel {
}
public LiveData<List<Artist>> getArtistList() {
artistList = artistRepository.getListLiveArtists();
// artistList = artistRepository.getListLiveArtists();
return artistList;
}
}

6
app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
View File

@@ -32,17 +32,17 @@ public class ArtistPageViewModel extends AndroidViewModel {
}
public LiveData<List<Album>> getAlbumList() {
albumList = albumRepository.getArtistListLiveAlbums(artist.id);
// albumList = albumRepository.getArtistListLiveAlbums(artist.id);
return albumList;
}
public List<Song> getArtistRandomSongList() {
randomList = songRepository.getArtistListLiveRandomSong(artist.id);
// randomList = songRepository.getArtistListLiveRandomSong(artist.id);
return randomList;
}
public LiveData<List<Song>> getArtistTopSongList() {
songList = songRepository.getArtistListLiveTopSongSample(artist.id);
// songList = songRepository.getArtistListLiveTopSongSample(artist.id);
return songList;
}

2
app/src/main/java/com/cappielloantonio/play/viewmodel/FilterViewModel.java
View File

@@ -26,7 +26,7 @@ public class FilterViewModel extends AndroidViewModel {
}
public LiveData<List<Genre>> getGenreList() {
allGenres = genreRepository.getListLiveGenres();
// allGenres = genreRepository.getListLiveGenres();
return allGenres;
}

2
app/src/main/java/com/cappielloantonio/play/viewmodel/GenreCatalogueViewModel.java
View File

@@ -23,7 +23,7 @@ public class GenreCatalogueViewModel extends AndroidViewModel {
}
public LiveData<List<Genre>> getGenreList() {
genreList = genreRepository.getListLiveGenres();
// genreList = genreRepository.getListLiveGenres();
return genreList;
}
}

10
app/src/main/java/com/cappielloantonio/play/viewmodel/HomeViewModel.java
View File

@@ -5,6 +5,7 @@ import android.app.Application;
import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.cappielloantonio.play.interfaces.MediaCallback;
import com.cappielloantonio.play.model.Album;
@@ -43,9 +44,12 @@ public class HomeViewModel extends AndroidViewModel {
albumRepository = new AlbumRepository(application);
artistRepository = new ArtistRepository(application);
favoritesSongSample = songRepository.getListLiveFavoritesSampleSong(20);
downloadedSongSample = songRepository.getListLiveDownloadedSampleSong(20);
years = songRepository.getYearList();
// favoritesSongSample = songRepository.getListLiveFavoritesSampleSong(20);
// downloadedSongSample = songRepository.getListLiveDownloadedSampleSong(20);
// years = songRepository.getYearList();
downloadedSongSample = new MutableLiveData<>();
years = new ArrayList<>();
mostPlayedAlbumSample = albumRepository.getListLiveAlbums("frequent", 20);
recentlyAddedAlbumSample = albumRepository.getListLiveAlbums("newest", 20);

10
app/src/main/java/com/cappielloantonio/play/viewmodel/LibraryViewModel.java
View File

@@ -38,15 +38,15 @@ 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.getListLiveSampleAlbum();
// sampleArtist = artistRepository.getListLiveSampleArtist();
// sampleGenres = genreRepository.getListLiveSampleGenre();
// playlistSample = playlistRepository.getRandomSample(5);
}
public List<Playlist> getPlaylistSample() {
if (playlistSample.isEmpty()) {
playlistSample = playlistRepository.getRandomSample(5);
// playlistSample = playlistRepository.getRandomSample(5);
}
return playlistSample;

7
app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
View File

@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.model.Queue;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
@@ -19,7 +20,7 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
private SongRepository songRepository;
private QueueRepository queueRepository;
private LiveData<List<Song>> queueSong;
private LiveData<List<Queue>> queueSong;
public PlayerBottomSheetViewModel(@NonNull Application application) {
super(application);
@@ -30,14 +31,14 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
queueSong = queueRepository.getLiveQueue();
}
public LiveData<List<Song>> getQueueSong() {
public LiveData<List<Queue>> getQueueSong() {
return queueSong;
}
public void setFavorite() {
Song song = MusicPlayerRemote.getCurrentSong();
song.setFavorite(!song.isFavorite());
songRepository.setFavoriteStatus(song);
// songRepository.setFavoriteStatus(song);
}
public void orderSongAfterSwap(List<Song> songs) {

2
app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistCatalogueViewModel.java
View File

@@ -23,7 +23,7 @@ public class PlaylistCatalogueViewModel extends AndroidViewModel {
}
public LiveData<List<Playlist>> getPlaylistList() {
playlistList = playlistRepository.getListLivePlaylists();
// playlistList = playlistRepository.getListLivePlaylists();
return playlistList;
}
}

5
app/src/main/java/com/cappielloantonio/play/viewmodel/PlaylistPageViewModel.java
View File

@@ -28,12 +28,13 @@ public class PlaylistPageViewModel extends AndroidViewModel {
}
public LiveData<List<Song>> getPlaylistSongLiveList() {
songLiveList = songRepository.getPlaylistLiveSong(playlist.getId());
// songLiveList = songRepository.getPlaylistLiveSong(playlist.getId());
return songLiveList;
}
public List<Song> getPlaylistSongList() {
return songRepository.getPlaylistSong(playlist.getId());
// return songRepository.getPlaylistSong(playlist.getId());
return null;
}
public Playlist getPlaylist() {

16
app/src/main/java/com/cappielloantonio/play/viewmodel/SearchViewModel.java
View File

@@ -62,22 +62,22 @@ public class SearchViewModel extends AndroidViewModel {
}
public LiveData<List<Song>> searchSong(String title, Context context) {
searchSong = songRepository.searchListLiveSong(title, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
// searchSong = songRepository.searchListLiveSong(title, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
return searchSong;
}
public LiveData<List<Album>> searchAlbum(String name, Context context) {
searchAlbum = albumRepository.searchListLiveAlbum(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
// searchAlbum = albumRepository.searchListLiveAlbum(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
return searchAlbum;
}
public LiveData<List<Artist>> searchArtist(String name, Context context) {
searchArtist = artistRepository.searchListLiveArtist(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
// searchArtist = artistRepository.searchListLiveArtist(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
return searchArtist;
}
public LiveData<List<Genre>> searchGenre(String name, Context context) {
searchGenre = genreRepository.searchListLiveGenre(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
// searchGenre = genreRepository.searchListLiveGenre(name, PreferenceUtil.getInstance(context).getSearchElementPerCategory());
return searchGenre;
}
@@ -91,10 +91,10 @@ public class SearchViewModel extends AndroidViewModel {
public List<String> getSearchSuggestion(String query) {
ArrayList<String> suggestions = new ArrayList<>();
suggestions.addAll(songRepository.getSearchSuggestion(query));
suggestions.addAll(albumRepository.getSearchSuggestion(query));
suggestions.addAll(artistRepository.getSearchSuggestion(query));
suggestions.addAll(genreRepository.getSearchSuggestion(query));
// suggestions.addAll(songRepository.getSearchSuggestion(query));
// suggestions.addAll(albumRepository.getSearchSuggestion(query));
// suggestions.addAll(artistRepository.getSearchSuggestion(query));
// suggestions.addAll(genreRepository.getSearchSuggestion(query));
LinkedHashSet<String> hashSet = new LinkedHashSet<>(suggestions);
ArrayList<String> suggestionsWithoutDuplicates = new ArrayList<>(hashSet);

8
app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
View File

@@ -37,14 +37,16 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
public void setFavorite() {
song.setFavorite(!song.isFavorite());
songRepository.setFavoriteStatus(song);
// songRepository.setFavoriteStatus(song);
}
public Album getAlbum() {
return albumRepository.getAlbumByID(song.getAlbumId());
// return albumRepository.getAlbumByID(song.getAlbumId());
return null;
}
public Artist getArtist() {
return artistRepository.getArtistByID(song.getArtistId());
// return artistRepository.getArtistByID(song.getArtistId());
return null;
}
}

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

@@ -34,31 +34,31 @@ public class SongListPageViewModel extends AndroidViewModel {
public LiveData<List<Song>> getSongList() {
switch (title) {
case Song.RECENTLY_PLAYED:
songList = songRepository.getListLiveRecentlyPlayedSampleSong(100);
// songList = songRepository.getListLiveRecentlyPlayedSampleSong(100);
break;
case Song.MOST_PLAYED:
songList = songRepository.getListLiveMostPlayedSampleSong(100);
// songList = songRepository.getListLiveMostPlayedSampleSong(100);
break;
case Song.RECENTLY_ADDED:
songList = songRepository.getListLiveRecentlyAddedSampleSong(100);
// songList = songRepository.getListLiveRecentlyAddedSampleSong(100);
break;
case Song.BY_GENRE:
songList = songRepository.getListLiveSongByGenre(genre.getId());
// songList = songRepository.getListLiveSongByGenre(genre.getId());
break;
case Song.BY_ARTIST:
songList = songRepository.getArtistListLiveTopSong(artist.getId());
// songList = songRepository.getArtistListLiveTopSong(artist.getId());
break;
case Song.BY_GENRES:
songList = songRepository.getFilteredListLiveSong(filters);
// songList = songRepository.getFilteredListLiveSong(filters);
break;
case Song.BY_YEAR:
songList = songRepository.getSongByYearListLive(year);
// songList = songRepository.getSongByYearListLive(year);
break;
case Song.IS_FAVORITE:
songList = songRepository.getListLiveFavoritesSong();
// songList = songRepository.getListLiveFavoritesSong();
break;
case Song.DOWNLOADED:
songList = songRepository.getListLiveDownloadedSong();
// songList = songRepository.getListLiveDownloadedSong();
break;
}

21
app/src/main/java/com/cappielloantonio/play/viewmodel/SyncViewModel.java
View File

@@ -12,24 +12,17 @@ import com.cappielloantonio.play.repository.AlbumRepository;
import com.cappielloantonio.play.repository.ArtistRepository;
import com.cappielloantonio.play.repository.GenreRepository;
import com.cappielloantonio.play.repository.PlaylistRepository;
import com.cappielloantonio.play.repository.PlaylistSongRepository;
import com.cappielloantonio.play.repository.SongRepository;
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.subsonic.models.Genre;
import com.cappielloantonio.play.util.MappingUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class SyncViewModel extends AndroidViewModel {
private static final String TAG = "SyncViewModel";
private boolean syncAlbum = false;
private boolean syncArtist = false;
private boolean syncGenres = false;
@@ -47,7 +40,6 @@ public class SyncViewModel extends AndroidViewModel {
private ArtistRepository artistRepository;
private PlaylistRepository playlistRepository;
private GenreRepository genreRepository;
private PlaylistSongRepository playlistSongRepository;
public SyncViewModel(@NonNull Application application) {
super(application);
@@ -57,7 +49,6 @@ public class SyncViewModel extends AndroidViewModel {
artistRepository = new ArtistRepository(application);
playlistRepository = new PlaylistRepository(application);
genreRepository = new GenreRepository(application);
playlistSongRepository = new PlaylistSongRepository(application);
}
public void setArguemnts(Bundle bundle) {
@@ -131,14 +122,4 @@ public class SyncViewModel extends AndroidViewModel {
public void addToSongList(ArrayList<Song> songList) {
this.songList.addAll(songList);
}
public Map<Integer, Song> getCatalogue() {
Map<Integer, Song> map = new HashMap<>();
for (Song song : songRepository.getCatalogue()) {
map.put(song.hashCode(), song);
}
return map;
}
}