From 0fedfb500aff7280cf7d0b19872a5eecba2f7958 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Sun, 26 Apr 2020 01:04:06 +0530
Subject: [PATCH] Fix shared element transition

---
 .../name/monkey/retromusic/glide/AlbumGlideRequest.java     | 6 ++----
 .../name/monkey/retromusic/glide/ArtistGlideRequest.java    | 5 +++--
 app/src/main/res/layout/activity_album.xml                  | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/AlbumGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/AlbumGlideRequest.java
index b42121d6..7b16ab0d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/AlbumGlideRequest.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/AlbumGlideRequest.java
@@ -84,7 +84,6 @@ public class AlbumGlideRequest {
             //noinspection unchecked
             return createBaseRequest(requestManager, song, ignoreMediaStore)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .signature(createSignature(song));
@@ -103,15 +102,15 @@ public class AlbumGlideRequest {
             return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore)
                     .asBitmap()
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
+                    .dontTransform()
                     .signature(createSignature(builder.song));
         }
     }
 
     public static class PaletteBuilder {
-        private  final Context context;
+        private final Context context;
         private final Builder builder;
 
         PaletteBuilder(Builder builder, Context context) {
@@ -126,7 +125,6 @@ public class AlbumGlideRequest {
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .signature(createSignature(builder.song));
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
index 025d3ad2..c1e1390d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
@@ -88,10 +88,10 @@ public class ArtistGlideRequest {
             //noinspection unchecked
             return createBaseRequest(requestManager, artist, noCustomImage, forceDownload)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .dontTransform()
                     .signature(createSignature(artist));
         }
 
@@ -127,6 +127,7 @@ public class ArtistGlideRequest {
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .dontTransform()
                     .signature(createSignature(builder.artist));
         }
     }
@@ -149,10 +150,10 @@ public class ArtistGlideRequest {
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .dontTransform()
                     .signature(createSignature(builder.artist));
         }
     }
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index f042c123..efda1125 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -32,6 +32,7 @@
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar"
+                    android:background="?attr/colorSurface"
                     app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
 
                 <ViewStub