From ecfc04e772cfe5139fa48d8738f77a9ad045bddb Mon Sep 17 00:00:00 2001
From: Tule Simon <58936865+TuleSimon@users.noreply.github.com>
Date: Sat, 22 Apr 2023 18:50:56 +0100
Subject: [PATCH] fixing back buttons

---
 .../fragments/player/classic/ClassicPlayerFragment.kt    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
index bc605b546..7c76add86 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
@@ -30,6 +30,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.commit
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.ColorUtil
@@ -178,6 +179,9 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                 if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) {
                     getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED
                 }
+                else{
+                    mainActivity.getBottomSheetBehavior().state=BottomSheetBehavior.STATE_COLLAPSED
+                }
             }
         })
     }
@@ -305,8 +309,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
         binding.playerControlsContainer.songTotalTime.setTextColor(lastPlaybackControlsColor)
 
         if (isLandscapeMode()) {
-            val window = requireActivity().window
-            window?.navigationBarColor = color.backgroundColor
+            mainActivity.setNavigationBarColor(color.backgroundColor)
         }
 
         ViewUtil.setProgressDrawable(
@@ -604,7 +607,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                     val window = requireActivity().window
                     window?.navigationBarColor.let { navBarColor ->
                         if (navBarColor == null || navBarColor != color) {
-                            window?.navigationBarColor = color
+                            mainActivity.setNavigationBarColor(color)
                         }
                     }
                 }