Removed unused methods

This commit is contained in:
CappielloAntonio 2021-04-19 14:44:30 +02:00
parent 78333d56d4
commit fc240c273f
12 changed files with 5 additions and 50 deletions

View file

@ -99,9 +99,6 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
activity.isBottomSheetInPeek(true);
activity.setBottomSheetMusicInfo(mix.get(0));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
MusicPlayerRemote.openQueue(mix, 0, true);
}
}, SyncUtil.SONG, songs.get(getBindingAdapterPosition()).getId(), PreferenceUtil.getInstance(context).getInstantMixSongNumber());

View file

@ -94,9 +94,6 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
mainActivity.isBottomSheetInPeek(true);
mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
}

View file

@ -99,9 +99,6 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter<SongResultSear
mainActivity.isBottomSheetInPeek(true);
mainActivity.setBottomSheetMusicInfo(songs.get(getBindingAdapterPosition()));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(mainActivity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(songs.get(getBindingAdapterPosition()));
MusicPlayerRemote.openQueue(songs.subList(getBindingAdapterPosition(), songs.size()), 0, true);
}

View file

@ -235,7 +235,6 @@ public class SongRepository {
}
public void increasePlayCount(Song song) {
Log.i(TAG, "increasePlayCount: " + song.getId());
boolean isIncreased = song.nowPlaying();
if(isIncreased) {

View file

@ -262,8 +262,6 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
}
private void setSongInfo(Song song) {
playerBottomSheetViewModel.setNowPlayingSong(song);
bind.playerBodyLayout.playerSongTitleLabel.setText(song.getTitle());
bind.playerBodyLayout.playerArtistNameLabel.setText(song.getArtistName());

View file

@ -101,9 +101,6 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
activity.isBottomSheetInPeek(true);
activity.setBottomSheetMusicInfo(mix.get(0));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
MusicPlayerRemote.openQueue(mix, 0, true);
}
}, SyncUtil.SONG, album.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());

View file

@ -90,9 +90,6 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
activity.isBottomSheetInPeek(true);
activity.setBottomSheetMusicInfo(mix.get(0));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
MusicPlayerRemote.openQueue(mix, 0, true);
}
}, SyncUtil.SONG, artist.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());

View file

@ -108,9 +108,6 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
activity.isBottomSheetInPeek(true);
activity.setBottomSheetMusicInfo(mix.get(0));
PlayerBottomSheetViewModel playerBottomSheetViewModel = new ViewModelProvider(activity).get(PlayerBottomSheetViewModel.class);
playerBottomSheetViewModel.setNowPlayingSong(mix.get(0));
MusicPlayerRemote.openQueue(mix, 0, true);
}
}, SyncUtil.SONG, song.getId(), PreferenceUtil.getInstance(requireContext()).getInstantMixSongNumber());

View file

@ -27,8 +27,6 @@ public class LibraryViewModel extends AndroidViewModel {
private LiveData<List<Album>> sampleAlbum;
private LiveData<List<Artist>> sampleArtist;
private LiveData<List<Genre>> sampleGenres;
private LiveData<List<Genre>> allGenres;
private LiveData<List<Playlist>> allPlaylist;
public LibraryViewModel(@NonNull Application application) {
@ -44,17 +42,13 @@ public class LibraryViewModel extends AndroidViewModel {
sampleAlbum = albumRepository.getListLiveSampleAlbum();
sampleArtist = artistRepository.getListLiveSampleArtist();
sampleGenres = genreRepository.getListLiveSampleGenre();
allPlaylist = playlistRepository.getListLivePlaylists();
}
public LiveData<List<Playlist>> getPlaylistList() {
allPlaylist = playlistRepository.getListLivePlaylists();
return allPlaylist;
}
public List<Genre> getGenreList() {
return genreRepository.getListGenre();
}
public LiveData<List<Album>> getAlbumSample() {
return sampleAlbum;
}

View file

@ -24,8 +24,4 @@ public class MainViewModel extends AndroidViewModel {
return true;
}
public void deleteQueue(){
queueRepository.deleteAll();
}
}

View file

@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import com.cappielloantonio.play.helper.MusicPlayerRemote;
import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.repository.SongRepository;
@ -14,11 +15,11 @@ import java.util.List;
public class PlayerBottomSheetViewModel extends AndroidViewModel {
private static final String TAG = "PlayerBottomSheetViewModel";
private SongRepository songRepository;
private QueueRepository queueRepository;
private LiveData<List<Song>> queueSong;
private Song song;
public PlayerBottomSheetViewModel(@NonNull Application application) {
super(application);
@ -33,23 +34,12 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
return queueSong;
}
public void setNowPlayingSong(Song song) {
this.song = song;
}
public void setFavorite() {
Song song = MusicPlayerRemote.getCurrentSong();
song.setFavorite(!song.isFavorite());
songRepository.setFavoriteStatus(song);
}
public Song getSong() {
return song;
}
public void setSong(Song song) {
this.song = song;
}
public void orderSongAfterSwap(List<Song> songs) {
queueRepository.insertAllAndStartNew(songs);
}

View file

@ -36,11 +36,7 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
}
public void setFavorite() {
if(song.isFavorite())
song.setFavorite(false);
else
song.setFavorite(true);
song.setFavorite(!song.isFavorite());
songRepository.setFavoriteStatus(song);
}