From 59bb2e6b036d6985eb5bb17f1d4c9670daf55c50 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Mon, 7 Feb 2022 17:36:12 +0100 Subject: [PATCH] Primary -> coverArtId && favorite -> starred --- .../play/adapter/PlayerSongQueueAdapter.java | 2 +- .../play/adapter/PlaylistDialogSongHorizontalAdapter.java | 2 +- .../play/adapter/SimilarTrackAdapter.java | 2 +- .../play/adapter/SongHorizontalAdapter.java | 2 +- .../play/ui/fragment/PlaylistPageFragment.java | 8 ++++---- .../fragment/bottomsheetdialog/SongBottomSheetDialog.java | 4 ++-- .../play/viewmodel/SongBottomSheetViewModel.java | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java index 8c9a5ff0..bebe9f50 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java @@ -52,7 +52,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter 0 ? songs.get(0).getPrimary() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) + .from(requireContext(), songs.size() > 0 ? songs.get(0).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) .build() .transform(new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0)) .into(bind.playlistCoverImageViewTopLeft); // Pic top-right CustomGlideRequest.Builder - .from(requireContext(), songs.size() > 1 ? songs.get(1).getPrimary() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) + .from(requireContext(), songs.size() > 1 ? songs.get(1).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) .build() .transform(new GranularRoundedCorners(0, CustomGlideRequest.CORNER_RADIUS, 0, 0)) .into(bind.playlistCoverImageViewTopRight); // Pic bottom-left CustomGlideRequest.Builder - .from(requireContext(), songs.size() > 2 ? songs.get(2).getPrimary() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) + .from(requireContext(), songs.size() > 2 ? songs.get(2).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) .build() .transform(new GranularRoundedCorners(0, 0, 0, CustomGlideRequest.CORNER_RADIUS)) .into(bind.playlistCoverImageViewBottomLeft); // Pic bottom-right CustomGlideRequest.Builder - .from(requireContext(), songs.size() > 3 ? songs.get(3).getPrimary() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) + .from(requireContext(), songs.size() > 3 ? songs.get(3).getCoverArtId() : playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null) .build() .transform(new GranularRoundedCorners(0, 0, CustomGlideRequest.CORNER_RADIUS, 0)) .into(bind.playlistCoverImageViewBottomRight); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java index 643b532d..374a12ff 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java @@ -78,7 +78,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements private void init(View view) { ImageView coverSong = view.findViewById(R.id.song_cover_image_view); CustomGlideRequest.Builder - .from(requireContext(), songBottomSheetViewModel.getSong().getPrimary(), CustomGlideRequest.SONG_PIC, null) + .from(requireContext(), songBottomSheetViewModel.getSong().getCoverArtId(), CustomGlideRequest.SONG_PIC, null) .build() .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(coverSong); @@ -92,7 +92,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtistName())); ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite); - favoriteToggle.setChecked(songBottomSheetViewModel.getSong().isFavorite()); + favoriteToggle.setChecked(songBottomSheetViewModel.getSong().isStarred()); favoriteToggle.setOnClickListener(v -> { songBottomSheetViewModel.setFavorite(requireContext()); dismissBottomSheet(); diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java index 9b146586..36684869 100644 --- a/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java +++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java @@ -41,12 +41,12 @@ public class SongBottomSheetViewModel extends AndroidViewModel { } public void setFavorite(Context context) { - if (song.isFavorite()) { + if (song.isStarred()) { songRepository.unstar(song.getId()); - song.setFavorite(false); + song.setStarred(false); } else { songRepository.star(song.getId()); - song.setFavorite(true); + song.setStarred(true); if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) { DownloadUtil.getDownloadTracker(context).download(