From d4d9df6ba5cc076732ca86b4641b6970a4cd7107 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Mon, 17 Feb 2020 21:47:47 +0530
Subject: [PATCH] Fix tablet layout crashing

---
 .../retromusic/adapter/artist/ArtistAdapter.kt      |  4 ++++
 .../fragments/player/blur/BlurPlayerFragment.kt     | 13 ++++++-------
 .../fragments/player/cardblur/CardBlurFragment.kt   |  5 ++---
 app/src/main/res/layout-land/fragment_blur.xml      |  5 ++++-
 .../res/layout-land/fragment_card_blur_player.xml   |  5 ++++-
 .../main/res/layout-xlarge-land/fragment_blur.xml   | 12 ++++--------
 app/src/main/res/layout-xlarge/fragment_blur.xml    |  5 ++++-
 app/src/main/res/layout/fragment_blur.xml           | 12 +++++-------
 .../main/res/layout/fragment_card_blur_player.xml   |  5 ++++-
 .../fragment_card_blur_player_playback_controls.xml |  6 +-----
 app/src/main/res/values/dimens.xml                  |  2 +-
 11 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
index fb183ece..0b7188e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@@ -35,6 +35,10 @@ class ArtistAdapter(
     activity, cabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
 
+    init {
+        this.setHasStableIds(true)
+    }
+
     fun swapDataSet(dataSet: List<Artist>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
index dd5c3cd3..570e6805 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
@@ -54,7 +54,7 @@ class BlurPlayerFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPrefer
     }
 
     private fun setUpPlayerToolbar() {
-        playerToolbar!!.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
             setNavigationOnClickListener { activity!!.onBackPressed() }
             ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity)
@@ -68,8 +68,8 @@ class BlurPlayerFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPrefer
     override fun onColorChanged(color: Int) {
         playbackControlsFragment.setDark(color)
         lastColor = color
-        callbacks!!.onPaletteColorChanged()
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar!!, Color.WHITE, activity)
+        callbacks?.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
     }
 
     override fun toggleFavorite(song: Song) {
@@ -99,17 +99,16 @@ class BlurPlayerFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPrefer
     private fun updateBlur() {
         val blurAmount = PreferenceManager.getDefaultSharedPreferences(requireContext())
             .getInt(PreferenceUtil.NEW_BLUR_AMOUNT, 25)
-        colorBackground!!.clearColorFilter()
+        colorBackground.clearColorFilter()
         SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
             .checkIgnoreMediaStore(requireContext())
             .generatePalette(requireContext()).build()
+            .dontAnimate()
             .transform(BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat()).build())
-            //.centerCrop()
-            //.override(320, 480)
             .into(object : RetroMusicColoredTarget(colorBackground) {
                 override fun onColorReady(color: Int) {
                     if (color == defaultFooterColor) {
-                        colorBackground!!.setColorFilter(color)
+                        colorBackground.setColorFilter(color)
                     }
                 }
             })
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
index 5ff6e16c..f1854004 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
@@ -133,13 +133,12 @@ class CardBlurFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPreferen
         SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
             .checkIgnoreMediaStore(requireContext())
             .generatePalette(requireContext()).build()
+            .dontAnimate()
             .transform(BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat()).build())
-            //.centerCrop()
-            //.override(320, 480)
             .into(object : RetroMusicColoredTarget(colorBackground) {
                 override fun onColorReady(color: Int) {
                     if (color == defaultFooterColor) {
-                        colorBackground!!.setColorFilter(color)
+                        colorBackground.setColorFilter(color)
                     }
                 }
             })
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 53b138bc..d4040d47 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,7 +12,9 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
     <View
         android:id="@+id/mask"
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
index 801afc7a..640bad4b 100644
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,7 +12,9 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
     <View
         android:id="@+id/mask"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
index 8bd1733a..7c76d87c 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,21 +12,16 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
-    <View
-        android:id="@+id/mask"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/md_black_1000"
-        android:visibility="gone" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/shadow_up" />
 
-
     <LinearLayout
         android:id="@+id/playerContent"
         android:layout_width="400dp"
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index 8a971f5b..0ad2df96 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,7 +12,9 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
     <View
         android:id="@+id/mask"
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 0007814e..dea5b2c1 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,17 +12,15 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shadow_up_full_theme" />
 
-    <View
-        android:id="@+id/mask"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -52,8 +51,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            tools:background="@color/md_white_1000">
+            android:layout_weight="1">
 
             <fragment
                 android:id="@+id/playbackControlsFragment"
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index badc784e..a7861d17 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,7 +12,9 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:background="?attr/colorSurface"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
 
     <View
         android:id="@+id/mask"
diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
index 381c80ef..f89736fe 100644
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@@ -32,7 +32,6 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp">
 
-
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/songCurrentProgress"
                 android:layout_width="wrap_content"
@@ -40,11 +39,9 @@
                 android:layout_weight="1"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
-                android:textAppearance="@style/TextViewOverline"
                 android:textStyle="bold"
                 tools:text="22.00" />
 
-
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/songTotalTime"
                 android:layout_width="wrap_content"
@@ -52,7 +49,6 @@
                 android:layout_weight="0"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
-                android:textAppearance="@style/TextViewOverline"
                 android:textStyle="bold"
                 tools:text="22.00" />
         </LinearLayout>
@@ -81,8 +77,8 @@
             android:maxLines="1"
             android:paddingStart="16dp"
             android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:paddingEnd="16dp"
+            android:paddingBottom="8dp"
             android:textSize="12sp"
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c8084435..bb2608da 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -49,5 +49,5 @@
     <dimen name="bottom_sheet_peek_1_height">56dp</dimen>
     <dimen name="bottom_sheet_peek_2_height">32dp</dimen>
     <dimen name="list_pref_guideline_begin">56dp</dimen>
-    <dimen name="pref_title_padding">70dp</dimen>
+    <dimen name="pref_title_padding">72dp</dimen>
 </resources>