From fb87d6b9468e63299d448d3a51495a09e24e7d81 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 22 Sep 2020 18:44:58 +0900
Subject: [PATCH] update options for custom glide request

---
 .../dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java | 2 +-
 .../java/com/dkanada/gramophone/adapter/GenreAdapter.java  | 2 +-
 .../com/dkanada/gramophone/adapter/PlaylistAdapter.java    | 2 +-
 .../com/dkanada/gramophone/adapter/album/AlbumAdapter.java | 2 +-
 .../gramophone/adapter/album/HorizontalAlbumAdapter.java   | 2 +-
 .../dkanada/gramophone/adapter/artist/ArtistAdapter.java   | 2 +-
 .../com/dkanada/gramophone/adapter/song/SongAdapter.java   | 2 +-
 .../com/dkanada/gramophone/glide/CustomGlideRequest.java   | 7 +++----
 .../service/notification/PlayingNotificationImpl.java      | 2 +-
 .../service/notification/PlayingNotificationImpl24.java    | 2 +-
 .../gramophone/ui/activities/AlbumDetailActivity.java      | 2 +-
 .../gramophone/ui/activities/ArtistDetailActivity.java     | 2 +-
 .../java/com/dkanada/gramophone/widgets/AppWidgetCard.java | 2 +-
 .../com/dkanada/gramophone/widgets/AppWidgetClassic.java   | 2 +-
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java
index 71e9443c..cd562f22 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java
@@ -109,7 +109,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         private void loadAlbumCover() {
             CustomGlideRequest.Builder
                     .from(Glide.with(getContext()), song.primary)
-                    .generatePalette(getActivity()).build()
+                    .palette(getActivity()).build()
                     .into(new CustomPaletteTarget(binding.playerImage) {
                         @Override
                         public void onColorReady(int color) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
index 198aa0af..60913015 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java
@@ -84,7 +84,7 @@ public class GenreAdapter extends RecyclerView.Adapter<GenreAdapter.ViewHolder>
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), genre.id)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
index f2aeb858..25395465 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java
@@ -94,7 +94,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), playlist.id)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
index a57dbcc4..bfb6c396 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java
@@ -130,7 +130,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), album.primary)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java
index 84453a47..d04dfd13 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java
@@ -53,7 +53,7 @@ public class HorizontalAlbumAdapter extends AlbumAdapter {
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), album.primary)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
index e20d8eef..e596fb45 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
@@ -124,7 +124,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), artist.primary)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
index 04412817..df74f470 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java
@@ -135,7 +135,7 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
 
         CustomGlideRequest.Builder
                 .from(Glide.with(activity), song.primary)
-                .generatePalette(activity).build()
+                .palette(activity).build()
                 .into(new CustomPaletteTarget(holder.image) {
                     @Override
                     public void onLoadCleared(Drawable placeholder) {
diff --git a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
index 177280f7..361ee8b0 100644
--- a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
+++ b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
@@ -33,6 +33,8 @@ public class CustomGlideRequest {
         final String item;
 
         private Builder(@NonNull RequestManager requestManager, String item) {
+            requestManager.applyDefaultRequestOptions(createRequestOptions(item));
+
             this.requestManager = requestManager;
             this.item = item;
         }
@@ -41,7 +43,7 @@ public class CustomGlideRequest {
             return new Builder(requestManager, item);
         }
 
-        public PaletteBuilder generatePalette(Context context) {
+        public PaletteBuilder palette(Context context) {
             return new PaletteBuilder(this, context);
         }
 
@@ -53,7 +55,6 @@ public class CustomGlideRequest {
             Object uri = item != null ? createUrl(item) : DEFAULT_IMAGE;
 
             return requestManager.load(uri)
-                    .apply(createRequestOptions(item))
                     .transition(new DrawableTransitionOptions().crossFade());
         }
     }
@@ -69,7 +70,6 @@ public class CustomGlideRequest {
             Object uri = builder.item != null ? createUrl(builder.item) : DEFAULT_IMAGE;
 
             return builder.requestManager.asBitmap().load(uri)
-                    .apply(createRequestOptions(builder.item))
                     .transition(new BitmapTransitionOptions().crossFade());
         }
     }
@@ -87,7 +87,6 @@ public class CustomGlideRequest {
             Object uri = builder.item != null ? createUrl(builder.item) : DEFAULT_IMAGE;
 
             return builder.requestManager.as(BitmapPaletteWrapper.class).load(uri)
-                    .apply(createRequestOptions(builder.item))
                     .transition(with(new ViewAnimationFactory<>(DEFAULT_ANIMATION)));
         }
     }
diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
index 5c606ab6..2f343460 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
@@ -90,7 +90,7 @@ public class PlayingNotificationImpl extends PlayingNotification {
                 }
 
                 target = CustomGlideRequest.Builder.from(Glide.with(service), song.primary)
-                        .generatePalette(service).build()
+                        .palette(service).build()
                         .into(new SimpleTarget<BitmapPaletteWrapper>(bigNotificationImageSize, bigNotificationImageSize) {
                             @Override
                             public void onResourceReady(BitmapPaletteWrapper resource, Transition<? super BitmapPaletteWrapper> glideAnimation) {
diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
index 354864c0..619caacf 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
@@ -52,7 +52,7 @@ public class PlayingNotificationImpl24 extends PlayingNotification {
         final int bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size);
         service.runOnUiThread(() -> CustomGlideRequest.Builder
                 .from(Glide.with(service), song.primary)
-                .generatePalette(service).build()
+                .palette(service).build()
                 .into(new SimpleTarget<BitmapPaletteWrapper>(bigNotificationImageSize, bigNotificationImageSize) {
                     @Override
                     public void onResourceReady(BitmapPaletteWrapper resource, Transition<? super BitmapPaletteWrapper> glideAnimation) {
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/AlbumDetailActivity.java
index ce961a00..3877c156 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/AlbumDetailActivity.java
@@ -111,7 +111,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
     private void loadAlbumCover(String primary) {
         CustomGlideRequest.Builder
                 .from(Glide.with(this), primary)
-                .generatePalette(this).build()
+                .palette(this).build()
                 .dontAnimate()
                 .into(new CustomPaletteTarget(binding.image) {
                     @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/ArtistDetailActivity.java
index 34a4cd5f..89aafc43 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/ArtistDetailActivity.java
@@ -147,7 +147,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
     private void loadArtistImage(String primary) {
         CustomGlideRequest.Builder
                 .from(Glide.with(this), primary)
-                .generatePalette(this).build()
+                .palette(this).build()
                 .dontAnimate()
                 .into(new CustomPaletteTarget(binding.image) {
                     @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
index efd0f608..4a308f34 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
+++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
@@ -101,7 +101,7 @@ public class AppWidgetCard extends BaseAppWidget {
                 }
 
                 target = CustomGlideRequest.Builder.from(Glide.with(service), song.primary)
-                        .generatePalette(service).build()
+                        .palette(service).build()
                         .centerCrop()
                         .into(new SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
                             @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
index c0747fef..251b5845 100644
--- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
+++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
@@ -94,7 +94,7 @@ public class AppWidgetClassic extends BaseAppWidget {
                 }
 
                 target = CustomGlideRequest.Builder.from(Glide.with(appContext), song.primary)
-                        .generatePalette(service).build()
+                        .palette(service).build()
                         .centerCrop()
                         .into(new SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
                             @Override