Refactor code

app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt

@@ -11,7 +11,7 @@ import retrofit2.create
 import retrofit2.http.GET
 import retrofit2.http.Query
 import java.io.File
-import java.util.*
+import java.util.Locale
 
 private const val BASE_QUERY_ARTIST = "search/artist"
 private const val BASE_URL = "https://api.deezer.com/"
@@ -55,7 +55,8 @@ interface DeezerApiService {
         private fun createCacheControlInterceptor(): Interceptor {
             return Interceptor { chain ->
                 val modifiedRequest = chain.request().newBuilder()
-                        .addHeader("Cache-Control",
+                    .addHeader(
+                        "Cache-Control",
                         String.format(
                             Locale.getDefault(),
                             "max-age=31536000, max-stale=31536000"

app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java

@@ -16,9 +16,15 @@ package code.name.monkey.retromusic.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-
 import androidx.annotation.NonNull;
-
+import code.name.monkey.retromusic.App;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.glide.artistimage.ArtistImage;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper;
+import code.name.monkey.retromusic.model.Artist;
+import code.name.monkey.retromusic.util.ArtistSignatureUtil;
+import code.name.monkey.retromusic.util.CustomArtistImageUtil;
 import com.bumptech.glide.BitmapRequestBuilder;
 import com.bumptech.glide.DrawableRequestBuilder;
 import com.bumptech.glide.DrawableTypeRequest;
@@ -29,68 +35,32 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.target.Target;
 
-import code.name.monkey.retromusic.App;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.glide.artistimage.ArtistImage;
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper;
-import code.name.monkey.retromusic.model.Artist;
-import code.name.monkey.retromusic.util.ArtistSignatureUtil;
-import code.name.monkey.retromusic.util.CustomArtistImageUtil;
-
 
 public class ArtistGlideRequest {
 
-    public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
-    private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.SOURCE;
-    private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_art;
-
-    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist, boolean noCustomImage, boolean forceDownload) {
-        boolean hasCustomImage = CustomArtistImageUtil.Companion.getInstance(App.Companion.getContext()).hasCustomArtistImage(artist);
-        if (noCustomImage || !hasCustomImage) {
-            return requestManager.load(new ArtistImage(artist.getName(), forceDownload));
-        } else {
-            return requestManager.load(CustomArtistImageUtil.getFile(artist));
-        }
-    }
-
-    public static Key createSignature(Artist artist) {
-        return ArtistSignatureUtil.getInstance(App.Companion.getContext()).getArtistSignature(artist.getName());
-    }
-
     public static class Builder {
-        final RequestManager requestManager;
+
         final Artist artist;
-        boolean noCustomImage;
+
         boolean forceDownload;
 
+        boolean noCustomImage;
+
+        final RequestManager requestManager;
+
+        public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
+            return new Builder(requestManager, artist);
+        }
+
         private Builder(@NonNull RequestManager requestManager, Artist artist) {
             this.requestManager = requestManager;
             this.artist = artist;
         }
 
-        public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
-            return new Builder(requestManager, artist);
-        }
-
-        public PaletteBuilder generatePalette(Context context) {
-            return new PaletteBuilder(this, context);
-        }
-
         public BitmapBuilder asBitmap() {
             return new BitmapBuilder(this);
         }
 
-        public Builder noCustomImage(boolean noCustomImage) {
-            this.noCustomImage = noCustomImage;
-            return this;
-        }
-
-        public Builder forceDownload(boolean forceDownload) {
-            this.forceDownload = forceDownload;
-            return this;
-        }
-
         public DrawableRequestBuilder<GlideDrawable> build() {
             //noinspection unchecked
             return createBaseRequest(requestManager, artist, noCustomImage, forceDownload)
@@ -101,9 +71,24 @@ public class ArtistGlideRequest {
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                     .signature(createSignature(artist));
         }
+
+        public Builder forceDownload(boolean forceDownload) {
+            this.forceDownload = forceDownload;
+            return this;
+        }
+
+        public PaletteBuilder generatePalette(Context context) {
+            return new PaletteBuilder(this, context);
+        }
+
+        public Builder noCustomImage(boolean noCustomImage) {
+            this.noCustomImage = noCustomImage;
+            return this;
+        }
     }
 
     public static class BitmapBuilder {
+
         private final Builder builder;
 
         public BitmapBuilder(Builder builder) {
@@ -112,7 +97,8 @@ public class ArtistGlideRequest {
 
         public BitmapRequestBuilder<?, Bitmap> build() {
             //noinspection unchecked
-            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage, builder.forceDownload)
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage,
+                    builder.forceDownload)
                     .asBitmap()
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
                     .error(DEFAULT_ERROR_IMAGE)
@@ -124,7 +110,9 @@ public class ArtistGlideRequest {
     }
 
     public static class PaletteBuilder {
+
         final Context context;
+
         private final Builder builder;
 
         public PaletteBuilder(Builder builder, Context context) {
@@ -134,7 +122,8 @@ public class ArtistGlideRequest {
 
         public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
             //noinspection unchecked
-            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage, builder.forceDownload)
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage,
+                    builder.forceDownload)
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
@@ -145,6 +134,30 @@ public class ArtistGlideRequest {
                     .signature(createSignature(builder.artist));
         }
     }
+
+    private static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
+
+    private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.SOURCE;
+
+    private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_art;
+
+    @NonNull
+    public static Key createSignature(@NonNull Artist artist) {
+        return ArtistSignatureUtil.getInstance(App.Companion.getContext()).getArtistSignature(artist.getName());
+    }
+
+    @NonNull
+    private static DrawableTypeRequest createBaseRequest(@NonNull RequestManager requestManager,
+            @NonNull Artist artist,
+            boolean noCustomImage, boolean forceDownload) {
+        boolean hasCustomImage = CustomArtistImageUtil.Companion.getInstance(App.Companion.getContext())
+                .hasCustomArtistImage(artist);
+        if (noCustomImage || !hasCustomImage) {
+            return requestManager.load(new ArtistImage(artist.getName()));
+        } else {
+            return requestManager.load(CustomArtistImageUtil.getFile(artist));
+        }
+    }
 }
 
 /**

app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt

@@ -32,8 +32,7 @@ import java.io.IOException
 import java.io.InputStream
 import java.util.concurrent.TimeUnit
 
-
+class ArtistImage(val artistName: String)
-class ArtistImage(val artistName: String, val skipOkHttpCache: Boolean)
 
 class ArtistImageFetcher(
     private val context: Context,
@@ -109,20 +108,25 @@ class ArtistImageLoader(
 class Factory(
     val context: Context
 ) : ModelLoaderFactory<ArtistImage, InputStream> {
+
     private var deezerApiService: DeezerApiService
     private var okHttpFactory: OkHttpUrlLoader.Factory
 
     init {
-        okHttpFactory = OkHttpUrlLoader.Factory(OkHttpClient.Builder()
+        okHttpFactory = OkHttpUrlLoader.Factory(
+            OkHttpClient.Builder()
                 .connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
                 .readTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
                 .writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
-                .build())
+                .build()
-        deezerApiService = DeezerApiService.invoke(DeezerApiService.createDefaultOkHttpClient(context)
+        )
+        deezerApiService = DeezerApiService.invoke(
+            DeezerApiService.createDefaultOkHttpClient(context)
                 .connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
                 .readTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
                 .writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
-                .build())
+                .build()
+        )
     }
 
     override fun build(context: Context?, factories: GenericLoaderFactory?): ModelLoader<ArtistImage, InputStream> {
@@ -137,5 +141,4 @@ class Factory(
         // we need these very low values to make sure our artist image loading calls doesn't block the image loading queue
         private const val TIMEOUT: Long = 700
     }
-
 }