From f7628aa8315e8bbd91bb52a476df3ca3ab7c9602 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Fri, 5 Apr 2019 11:22:42 +0530
Subject: [PATCH] Fix artist cover background purple color in color theme

---
 .../retromusic/ui/activities/ArtistDetailActivity.kt     | 9 ++++-----
 app/src/main/res/layout-land/activity_artist_details.xml | 9 +++++----
 .../main/res/layout-xlarge/activity_artist_details.xml   | 1 +
 app/src/main/res/layout/activity_artist_details.xml      | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
index 0f8dc70b..8389410b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt
@@ -73,8 +73,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac
         setDrawUnderStatusBar()
         setupWindowTransitions()
         super.onCreate(savedInstanceState)
-
-
+        collapsingToolbarLayout?.setBackgroundColor(ThemeStore.primaryColor(this))
         toggleBottomNavigationView(true)
         setNavigationbarColorAuto()
         setLightNavigationBar(true)
@@ -126,9 +125,9 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac
     private fun setupToolbarMarginHeight() {
         val primaryColor = ThemeStore.primaryColor(this)
         TintHelper.setTintAuto(contentContainer!!, primaryColor, true)
-        if (collapsingToolbar != null) {
-            collapsingToolbar!!.setContentScrimColor(primaryColor)
-            collapsingToolbar!!.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor))
+        if (collapsingToolbarLayout != null) {
+            collapsingToolbarLayout!!.setContentScrimColor(primaryColor)
+            collapsingToolbarLayout!!.setStatusBarScrimColor(ColorUtil.darkenColor(primaryColor))
         }
 
         toolbar!!.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml
index b755d210..68b69089 100644
--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -42,10 +42,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/status_bar_padding" />
-
                 <LinearLayout
                     android:id="@+id/background"
                     android:layout_width="match_parent"
@@ -88,6 +84,10 @@
                     <include layout="@layout/activity_artist_content" />
                 </LinearLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/status_bar_padding" />
+
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </LinearLayout>
@@ -96,6 +96,7 @@
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
+
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/actionShuffleAll"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml
index 21db36f3..a88847e0 100644
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -20,6 +20,7 @@
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
+            android:id="@+id/collapsingToolbarLayout"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
index 4f92c807..dda89382 100755
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingToolbar"
+            android:id="@+id/collapsingToolbarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:contentScrim="@android:color/transparent"