From 58d71cad8ae6b0fd4fa44914bef8758bb2d81125 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 8 Nov 2021 11:44:24 +0530
Subject: [PATCH] Fixed DetailListFragment AppBarLayout

---
 .../retromusic/fragments/other/DetailListFragment.kt  |  3 +++
 .../retromusic/service/MediaButtonIntentReceiver.kt   | 11 +++++------
 app/src/main/res/layout/fragment_playlist_detail.xml  |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
index ed1a5c72f..49f226782 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
@@ -38,6 +38,7 @@ import code.name.monkey.retromusic.interfaces.IArtistClickListener
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.util.RetroUtil
+import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialSharedAxis
 
 class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail),
@@ -63,6 +64,8 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
                 returnTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false)
             }
         }
+        binding.appBarLayout.statusBarForeground =
+            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
         postponeEnterTransition()
         view.doOnPreDraw { startPostponedEnterTransition() }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
index d77a7d756..848b21105 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
@@ -63,14 +63,13 @@ class MediaButtonIntentReceiver : BroadcastReceiver() {
                 when (msg.what) {
                     MSG_HEADSET_DOUBLE_CLICK_TIMEOUT -> {
                         val clickCount = msg.arg1
-                        val command: String?
 
                         if (DEBUG) Log.v(TAG, "Handling headset click, count = $clickCount")
-                        when (clickCount) {
-                            1 -> command = ACTION_TOGGLE_PAUSE
-                            2 -> command = ACTION_SKIP
-                            3 -> command = ACTION_REWIND
-                            else -> command = null
+                        val command = when (clickCount) {
+                            1 -> ACTION_TOGGLE_PAUSE
+                            2 -> ACTION_SKIP
+                            3 -> ACTION_REWIND
+                            else -> null
                         }
 
                         if (command != null) {
diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml
index 18f981bdf..ce6a687c1 100644
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ b/app/src/main/res/layout/fragment_playlist_detail.xml
@@ -12,7 +12,8 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true">
+        app:liftOnScroll="true"
+        android:fitsSystemWindows="true">
 
         <FrameLayout
             android:id="@+id/toolbar_container"
@@ -24,7 +25,6 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/colorSurface"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black"
                 app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
         </FrameLayout>