From aa9422fd5656a09583b5dd6572f660f98e8a4d95 Mon Sep 17 00:00:00 2001 From: antonio Date: Sat, 11 Mar 2023 18:43:47 +0100 Subject: [PATCH] Removed custom parameter from CustomGlideRequest builder and added cross fade transition to image --- .../play/glide/CustomGlideRequest.java | 10 ++++------ .../cappielloantonio/play/ui/adapter/AlbumAdapter.java | 4 +++- .../ui/adapter/AlbumArtistPageOrSimilarAdapter.java | 4 +++- .../play/ui/adapter/AlbumCatalogueAdapter.java | 4 +++- .../play/ui/adapter/AlbumHorizontalAdapter.java | 4 +++- .../play/ui/adapter/ArtistAdapter.java | 4 +++- .../play/ui/adapter/ArtistCatalogueAdapter.java | 4 +++- .../play/ui/adapter/ArtistHorizontalAdapter.java | 4 +++- .../play/ui/adapter/ArtistSimilarAdapter.java | 4 +++- .../play/ui/adapter/DiscoverSongAdapter.java | 4 +++- .../play/ui/adapter/GridTrackAdapter.java | 4 +++- .../play/ui/adapter/PlayerSongQueueAdapter.java | 4 +++- .../adapter/PlaylistDialogSongHorizontalAdapter.java | 4 +++- .../play/ui/adapter/PodcastEpisodeAdapter.java | 4 +++- .../play/ui/adapter/SimilarTrackAdapter.java | 4 +++- .../play/ui/adapter/SongHorizontalAdapter.java | 4 +++- .../play/ui/fragment/AlbumPageFragment.java | 4 +++- .../play/ui/fragment/ArtistPageFragment.java | 9 +++------ .../play/ui/fragment/PlayerBottomSheetFragment.java | 4 +++- .../play/ui/fragment/PlayerCoverFragment.java | 4 +++- .../play/ui/fragment/PlaylistPageFragment.java | 4 +++- .../bottomsheetdialog/AlbumBottomSheetDialog.java | 4 +++- .../bottomsheetdialog/ArtistBottomSheetDialog.java | 4 +++- .../bottomsheetdialog/PodcastBottomSheetDialog.java | 4 +++- .../bottomsheetdialog/SongBottomSheetDialog.java | 4 +++- 25 files changed, 76 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java index 667b4553..16ebe9b1 100644 --- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java +++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java @@ -68,14 +68,12 @@ public class CustomGlideRequest { private final RequestManager requestManager; private final Object item; - private Builder(Context context, String item, String category, String custom) { + private Builder(Context context, String item, String category) { this.requestManager = Glide.with(context); if (Preferences.isDataSavingMode()) { this.item = MusicUtil.getDefaultPicPerCategory(category); - } else if (custom != null && !Preferences.isDataSavingMode()) { - this.item = custom; - } else if (item != null && !Preferences.isDataSavingMode()) { + } else if (item != null) { this.item = createUrl(item, Preferences.getImageSize()); } else { this.item = MusicUtil.getDefaultPicPerCategory(category); @@ -85,8 +83,8 @@ public class CustomGlideRequest { requestManager.applyDefaultRequestOptions(createRequestOptions(item, drawable)); } - public static Builder from(Context context, String item, String category, String custom) { - return new Builder(context, item, category, custom); + public static Builder from(Context context, String item, String category) { + return new Builder(context, item, category); } public BitmapBuilder bitmap() { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java index b8877f1e..49ba0ec8 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.cappielloantonio.play.databinding.ItemLibraryAlbumBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.interfaces.ClickCallback; @@ -44,8 +45,9 @@ public class AlbumAdapter extends RecyclerView.Adapter holder.item.artistNameLabel.setText(MusicUtil.getReadableString(album.getArtist())); CustomGlideRequest.Builder - .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC, null) + .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC) .build() + .transition(DrawableTransitionOptions.withCrossFade()) .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(holder.item.albumCoverImageView); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java index 503fd847..f8b7c645 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.cappielloantonio.play.databinding.ItemLibraryArtistPageOrSimilarAlbumBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.interfaces.ClickCallback; @@ -44,8 +45,9 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter