antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Primary -> coverArtId && favorite -> starred

Browse source
This commit is contained in:
CappielloAntonio 2022-02-07 17:36:12 +01:00
parent bf09a581b9
commit 59bb2e6b03
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
View file

@ -52,7 +52,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtistName()), MusicUtil.getReadableDurationString(song.getDuration(), false))); holder.songSubtitle.setText(context.getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtistName()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC, null) .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
.build() .build()
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(holder.cover); .into(holder.cover);

2
app/src/main/java/com/cappielloantonio/play/adapter/PlaylistDialogSongHorizontalAdapter.java
View file

@ -48,7 +48,7 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter<Pl
holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false)); holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC, null) .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
.build() .build()
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(holder.cover); .into(holder.cover);

2
app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
View file

@ -60,7 +60,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
holder.textTitle.setText(MusicUtil.getReadableString(song.getTitle())); holder.textTitle.setText(MusicUtil.getReadableString(song.getTitle()));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC, null) .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
.build() .build()
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(holder.cover); .into(holder.cover);

2
app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
View file

@ -68,7 +68,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
} }
if (isCoverVisible) CustomGlideRequest.Builder if (isCoverVisible) CustomGlideRequest.Builder
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC, null) .from(context, song.getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
.build() .build()
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(holder.cover); .into(holder.cover);

8
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
View file

@ -184,28 +184,28 @@ public class PlaylistPageFragment extends Fragment {
// Pic top-left // Pic top-left
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(requireContext(), songs.size() > 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() .build()
.transform(new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0)) .transform(new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0))
.into(bind.playlistCoverImageViewTopLeft); .into(bind.playlistCoverImageViewTopLeft);
// Pic top-right // Pic top-right
CustomGlideRequest.Builder 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() .build()
.transform(new GranularRoundedCorners(0, CustomGlideRequest.CORNER_RADIUS, 0, 0)) .transform(new GranularRoundedCorners(0, CustomGlideRequest.CORNER_RADIUS, 0, 0))
.into(bind.playlistCoverImageViewTopRight); .into(bind.playlistCoverImageViewTopRight);
// Pic bottom-left // Pic bottom-left
CustomGlideRequest.Builder 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() .build()
.transform(new GranularRoundedCorners(0, 0, 0, CustomGlideRequest.CORNER_RADIUS)) .transform(new GranularRoundedCorners(0, 0, 0, CustomGlideRequest.CORNER_RADIUS))
.into(bind.playlistCoverImageViewBottomLeft); .into(bind.playlistCoverImageViewBottomLeft);
// Pic bottom-right // Pic bottom-right
CustomGlideRequest.Builder 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() .build()
.transform(new GranularRoundedCorners(0, 0, CustomGlideRequest.CORNER_RADIUS, 0)) .transform(new GranularRoundedCorners(0, 0, CustomGlideRequest.CORNER_RADIUS, 0))
.into(bind.playlistCoverImageViewBottomRight); .into(bind.playlistCoverImageViewBottomRight);

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
View file

@ -78,7 +78,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
private void init(View view) { private void init(View view) {
ImageView coverSong = view.findViewById(R.id.song_cover_image_view); ImageView coverSong = view.findViewById(R.id.song_cover_image_view);
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(requireContext(), songBottomSheetViewModel.getSong().getPrimary(), CustomGlideRequest.SONG_PIC, null) .from(requireContext(), songBottomSheetViewModel.getSong().getCoverArtId(), CustomGlideRequest.SONG_PIC, null)
.build() .build()
.transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))
.into(coverSong); .into(coverSong);
@ -92,7 +92,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtistName())); artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtistName()));
ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite); ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
favoriteToggle.setChecked(songBottomSheetViewModel.getSong().isFavorite()); favoriteToggle.setChecked(songBottomSheetViewModel.getSong().isStarred());
favoriteToggle.setOnClickListener(v -> { favoriteToggle.setOnClickListener(v -> {
songBottomSheetViewModel.setFavorite(requireContext()); songBottomSheetViewModel.setFavorite(requireContext());
dismissBottomSheet(); dismissBottomSheet();

6
app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
View file

@ -41,12 +41,12 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
} }
public void setFavorite(Context context) { public void setFavorite(Context context) {
if (song.isFavorite()) { if (song.isStarred()) {
songRepository.unstar(song.getId()); songRepository.unstar(song.getId());
song.setFavorite(false); song.setStarred(false);
} else { } else {
songRepository.star(song.getId()); songRepository.star(song.getId());
song.setFavorite(true); song.setStarred(true);
if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) { if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
DownloadUtil.getDownloadTracker(context).download( DownloadUtil.getDownloadTracker(context).download(