Removed category parameter from CustomGlideRequest builder

app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java

@@ -1,7 +1,6 @@
 package com.cappielloantonio.play.glide;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
@@ -14,7 +13,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.signature.ObjectKey;
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.util.MusicUtil;
+import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.util.Preferences;
 
 import java.util.Map;
@@ -22,11 +21,6 @@ import java.util.Map;
 public class CustomGlideRequest {
     private static final String TAG = "CustomGlideRequest";
 
-    public static final String SONG_PIC = "SONG";
-    public static final String ALBUM_PIC = "ALBUM";
-    public static final String ARTIST_PIC = "ARTIST";
-    public static final String PLAYLIST_PIC = "PLAYLIST";
-
     public static final int CORNER_RADIUS = 12;
 
     public static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
@@ -40,71 +34,60 @@ public class CustomGlideRequest {
     }
 
     public static String createUrl(String item, int size) {
-        String url = App.getSubsonicClientInstance(false).getUrl();
         Map<String, String> params = App.getSubsonicClientInstance(false).getParams();
 
-        url = url + "getCoverArt" +
+        StringBuilder uri = new StringBuilder();
-                "?u=" + params.get("u") +
-                "&s=" + params.get("s") +
-                "&t=" + params.get("t") +
-                "&v=" + params.get("v") +
-                "&c=" + params.get("c") +
-                "&id=" + item;
 
-        if (size != -1) {
+        uri.append(App.getSubsonicClientInstance(false).getUrl());
-            url = url + "&size=" + size;
+        uri.append("getCoverArt");
-        }
 
-        if (params.get("p") != null) {
+        if (params.containsKey("u") && params.get("u") != null)
-            url = url + "&p=" + params.get("p");
+            uri.append("?u=").append(params.get("u"));
-        }
+        if (params.containsKey("p") && params.get("p") != null)
+            uri.append("&p=").append(params.get("p"));
+        if (params.containsKey("s") && params.get("s") != null)
+            uri.append("&s=").append(params.get("s"));
+        if (params.containsKey("t") && params.get("t") != null)
+            uri.append("&t=").append(params.get("t"));
+        if (params.containsKey("v") && params.get("v") != null)
+            uri.append("&v=").append(params.get("v"));
+        if (params.containsKey("c") && params.get("c") != null)
+            uri.append("&c=").append(params.get("c"));
+        if (size != -1)
+            uri.append("&size=").append(size);
 
-        Log.d(TAG, "createUrl() " + url);
+        uri.append("&id=").append(item);
 
-        return url;
+        Log.d(TAG, "createUrl() " + uri);
+
+        return uri.toString();
     }
 
     public static class Builder {
         private final RequestManager requestManager;
         private final Object item;
 
-        private Builder(Context context, String item, String category) {
+        private Builder(Context context, String item) {
             this.requestManager = Glide.with(context);
 
             if (Preferences.isDataSavingMode()) {
-                this.item = MusicUtil.getDefaultPicPerCategory(category);
+                this.item = R.drawable.default_album_art;
             } else if (item != null) {
                 this.item = createUrl(item, Preferences.getImageSize());
             } else {
-                this.item = MusicUtil.getDefaultPicPerCategory(category);
+                this.item = R.drawable.default_album_art;
             }
 
-            Drawable drawable = ResourcesCompat.getDrawable(context.getResources(), MusicUtil.getDefaultPicPerCategory(category), null);
+            Drawable drawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.default_album_art, null);
             requestManager.applyDefaultRequestOptions(createRequestOptions(item, drawable));
         }
 
-        public static Builder from(Context context, String item, String category) {
+        public static Builder from(Context context, String item) {
-            return new Builder(context, item, category);
+            return new Builder(context, item);
-        }
-
-        public BitmapBuilder bitmap() {
-            return new BitmapBuilder(this);
         }
 
         public RequestBuilder<Drawable> build() {
             return requestManager.load(item);
         }
     }
-
-    public static class BitmapBuilder {
-        private final Builder builder;
-
-        public BitmapBuilder(Builder builder) {
-            this.builder = builder;
-        }
-
-        public RequestBuilder<Bitmap> build() {
-            return builder.requestManager.asBitmap().load(builder.item);
-        }
-    }
 }

app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java

@@ -45,7 +45,7 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(holder.itemView.getContext(), album.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java

@@ -45,7 +45,7 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(holder.itemView.getContext(), album.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumCatalogueAdapter.java

@@ -80,7 +80,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(holder.itemView.getContext(), album.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumHorizontalAdapter.java

@@ -47,7 +47,7 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
         holder.item.albumArtistTextView.setText(MusicUtil.getReadableString(album.getArtist()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(holder.itemView.getContext(), album.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/ArtistAdapter.java

@@ -50,7 +50,7 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(artist.getName()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC)
+                .from(holder.itemView.getContext(), artist.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/ArtistCatalogueAdapter.java

@@ -80,7 +80,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(artist.getName()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC)
+                .from(holder.itemView.getContext(), artist.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/ArtistHorizontalAdapter.java

@@ -51,7 +51,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
         }
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC)
+                .from(holder.itemView.getContext(), artist.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/ArtistSimilarAdapter.java

@@ -44,7 +44,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
         holder.item.artistNameLabel.setText(MusicUtil.getReadableString(artist.getName()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), artist.getCoverArtId(), CustomGlideRequest.ARTIST_PIC)
+                .from(holder.itemView.getContext(), artist.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/DiscoverSongAdapter.java

@@ -44,7 +44,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
         holder.item.albumDiscoverSongLabel.setText(MusicUtil.getReadableString(song.getAlbum()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), song.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), song.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .into(holder.item.discoverSongCoverImageView);

app/src/main/java/com/cappielloantonio/play/ui/adapter/GridTrackAdapter.java

@@ -42,7 +42,7 @@ public class GridTrackAdapter extends RecyclerView.Adapter<GridTrackAdapter.View
         Chronology item = items.get(position);
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), item.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), item.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/PlayerSongQueueAdapter.java

@@ -52,7 +52,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         holder.item.queueSongSubtitleTextView.setText(holder.itemView.getContext().getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(song.getArtist()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), song.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), song.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogSongHorizontalAdapter.java

@@ -40,7 +40,7 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter<Pl
         holder.item.playlistDialogSongDurationTextView.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), song.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), song.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/PodcastEpisodeAdapter.java

@@ -50,7 +50,7 @@ public class PodcastEpisodeAdapter extends RecyclerView.Adapter<PodcastEpisodeAd
         holder.item.podcastDescriptionLabel.setText(MusicUtil.getReadableString(podcastEpisode.getDescription()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), podcastEpisode.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), podcastEpisode.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/SimilarTrackAdapter.java

@@ -44,7 +44,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
         holder.item.titleTrackLabel.setText(MusicUtil.getReadableString(song.getTitle()));
 
         CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), song.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), song.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/adapter/SongHorizontalAdapter.java

@@ -61,7 +61,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         }
 
         if (isCoverVisible) CustomGlideRequest.Builder
-                .from(holder.itemView.getContext(), song.getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(holder.itemView.getContext(), song.getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java

@@ -175,7 +175,7 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
 
     private void initBackCover() {
         CustomGlideRequest.Builder
-                .from(requireContext(), albumPageViewModel.getAlbum().getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(requireContext(), albumPageViewModel.getAlbum().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java

@@ -116,7 +116,7 @@ public class ArtistPageFragment extends Fragment implements ClickCallback {
                 bind.bioMoreTextViewClickable.setVisibility(artistInfo.getLastFmUrl() != null ? View.VISIBLE : View.GONE);
 
             if (getContext() != null && bind != null) CustomGlideRequest.Builder
-                    .from(requireContext(), artistPageViewModel.getArtist().getId(), CustomGlideRequest.ARTIST_PIC)
+                    .from(requireContext(), artistPageViewModel.getArtist().getId())
                     .build()
                     .transition(DrawableTransitionOptions.withCrossFade())
                     .into(bind.artistBackdropImageView);

app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java

@@ -151,7 +151,7 @@ public class PlayerBottomSheetFragment extends Fragment {
             bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(MusicUtil.getReadableString(mediaMetadata.extras.getString("artist")));
 
             CustomGlideRequest.Builder
-                    .from(requireContext(), mediaMetadata.extras.getString("coverArtId"), CustomGlideRequest.SONG_PIC)
+                    .from(requireContext(), mediaMetadata.extras.getString("coverArtId"))
                     .build()
                     .transition(DrawableTransitionOptions.withCrossFade())
                     .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerCoverFragment.java

@@ -158,7 +158,7 @@ public class PlayerCoverFragment extends Fragment {
 
     private void setCover(MediaMetadata mediaMetadata) {
         CustomGlideRequest.Builder
-                .from(requireContext(), mediaMetadata.extras != null ? mediaMetadata.extras.getString("coverArtId") : null, CustomGlideRequest.SONG_PIC)
+                .from(requireContext(), mediaMetadata.extras != null ? mediaMetadata.extras.getString("coverArtId") : null)
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

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

@@ -164,10 +164,9 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback {
 
     private void initBackCover() {
         CustomGlideRequest.Builder
-                .from(requireContext(), playlistPageViewModel.getPlaylist().getCoverArtId(), CustomGlideRequest.PLAYLIST_PIC)
+                .from(requireContext(), playlistPageViewModel.getPlaylist().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
-                .transform(new CenterCrop(), new GranularRoundedCorners(CustomGlideRequest.CORNER_RADIUS, 0, 0, 0))
                 .into(bind.playlistCoverImageView);
     }
 

app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java

@@ -82,7 +82,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
     private void init(View view) {
         ImageView coverAlbum = view.findViewById(R.id.album_cover_image_view);
         CustomGlideRequest.Builder
-                .from(requireContext(), albumBottomSheetViewModel.getAlbum().getCoverArtId(), CustomGlideRequest.ALBUM_PIC)
+                .from(requireContext(), albumBottomSheetViewModel.getAlbum().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java

@@ -73,7 +73,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
     private void init(View view) {
         ImageView coverArtist = view.findViewById(R.id.artist_cover_image_view);
         CustomGlideRequest.Builder
-                .from(requireContext(), artistBottomSheetViewModel.getArtist().getCoverArtId(), CustomGlideRequest.ARTIST_PIC)
+                .from(requireContext(), artistBottomSheetViewModel.getArtist().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/PodcastBottomSheetDialog.java

@@ -68,7 +68,7 @@ public class PodcastBottomSheetDialog extends BottomSheetDialogFragment implemen
         ImageView coverPodcast = view.findViewById(R.id.podcast_cover_image_view);
 
         CustomGlideRequest.Builder
-                .from(requireContext(), podcastBottomSheetViewModel.getPodcast().getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(requireContext(), podcastBottomSheetViewModel.getPodcast().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

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

@@ -77,7 +77,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().getCoverArtId(), CustomGlideRequest.SONG_PIC)
+                .from(requireContext(), songBottomSheetViewModel.getSong().getCoverArtId())
                 .build()
                 .transition(DrawableTransitionOptions.withCrossFade())
                 .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS))

app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java

@@ -157,21 +157,6 @@ public class MusicUtil {
         return "enc:" + plainPassword.chars().mapToObj(Integer::toHexString).collect(Collectors.joining());
     }
 
-    public static int getDefaultPicPerCategory(String category) {
-        switch (category) {
-            case CustomGlideRequest.SONG_PIC:
-                return R.drawable.default_album_art;
-            case CustomGlideRequest.ALBUM_PIC:
-                return R.drawable.default_album_art;
-            case CustomGlideRequest.ARTIST_PIC:
-                return R.drawable.default_album_art;
-            case CustomGlideRequest.PLAYLIST_PIC:
-                return R.drawable.default_album_art;
-            default:
-                return R.drawable.default_album_art;
-        }
-    }
-
     public static String getBitratePreference() {
         Network network = getConnectivityManager().getActiveNetwork();
         NetworkCapabilities networkCapabilities = getConnectivityManager().getNetworkCapabilities(network);