From e67c094320508eac1f9543a7eece9f94de70f1bb Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Fri, 24 Dec 2021 22:14:03 +0530
Subject: [PATCH] Fixed bottom navigation tint

---
 .../base/AbsSlidingMusicPanelActivity.kt          | 15 +++++++++------
 .../retromusic/extensions/ColorExtensions.kt      | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 04a5ff251..2e3273f2e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -25,7 +25,10 @@ import android.view.ViewTreeObserver
 import android.view.animation.PathInterpolator
 import android.widget.FrameLayout
 import androidx.core.animation.doOnEnd
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import code.name.monkey.appthemehelper.util.ColorUtil
@@ -143,8 +146,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         setupSlidingUpPanel()
         setupBottomSheet()
         updateColor()
-        binding.slidingPanel.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
-        bottomNavigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
+        if (!PreferenceUtil.materialYou) {
+            binding.slidingPanel.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
+            bottomNavigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
+        }
+
         navigationBarColor = surfaceColor()
     }
 
@@ -394,7 +400,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         if (hide) {
             bottomSheetBehavior.peekHeight = -windowInsets.safeGetBottomInsets()
             bottomSheetBehavior.state = STATE_COLLAPSED
-            libraryViewModel.setFabMargin(if (isBottomNavVisible) dip(R.dimen.bottom_nav_height) else 0)
             ViewCompat.setElevation(binding.slidingPanel, 0f)
             ViewCompat.setElevation(binding.bottomNavigationView, 10f)
         } else {
@@ -408,7 +413,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
                     } else {
                         bottomSheetBehavior.peekHeight = heightOfBarWithTabs
                     }
-                    libraryViewModel.setFabMargin(dip(R.dimen.mini_player_height_expanded))
                 } else {
                     println("Details")
                     if (animate) {
@@ -419,7 +423,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
                         bottomSheetBehavior.peekHeight = heightOfBar
                         binding.slidingPanel.bringToFront()
                     }
-                    libraryViewModel.setFabMargin(dip(R.dimen.mini_player_height))
                 }
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
index d3fe516e0..8b7de433d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
@@ -244,9 +244,14 @@ fun Context.getColorCompat(@ColorRes colorRes: Int): Int {
 
 @ColorInt
 fun Context.darkAccentColor(): Int {
+    val colorSurfaceVariant = if (surfaceColor().isColorLight) {
+        surfaceColor()
+    } else {
+        surfaceColor().lighterColor
+    }
     return ColorUtils.blendARGB(
         accentColor(),
-        surfaceColor(),
+        colorSurfaceVariant,
         if (surfaceColor().isColorLight) 0.96f else 0.975f
     )
 }
@@ -262,3 +267,9 @@ fun Context.darkAccentColorVariant(): Int {
 
 inline val @receiver:ColorInt Int.isColorLight
     get() = ColorUtil.isColorLight(this)
+
+inline val @receiver:ColorInt Int.lighterColor
+    get() = ColorUtil.lightenColor(this)
+
+inline val @receiver:ColorInt Int.darkerColor
+    get() = ColorUtil.darkenColor(this)
\ No newline at end of file