From 802cab781873ee97c58e8b90d36f8c5f36d98869 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Wed, 23 Mar 2022 20:33:56 +0530
Subject: [PATCH] Updated MDC

---
 .../activities/base/AbsSlidingMusicPanelActivity.kt   | 11 ++++++-----
 .../retromusic/fragments/search/SearchFragment.kt     |  7 +++----
 .../retromusic/views/BottomNavigationBarTinted.kt     |  3 ++-
 app/src/main/res/values/styles.xml                    |  1 +
 build.gradle                                          |  2 +-
 5 files changed, 13 insertions(+), 11 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 4037421f0..3cbee691b 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
@@ -62,9 +62,9 @@ import code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.CategoryInfo
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
+import dev.chrisbanes.insetter.applyInsetter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
@@ -145,9 +145,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             windowInsets = insets
             insets
         }
-        if (RetroUtil.isLandscape()) {
-            binding.slidingPanel.drawAboveSystemBarsWithPadding()
-        }
         chooseFragmentForTheme()
         setupSlidingUpPanel()
         setupBottomSheet()
@@ -357,7 +354,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         }
     }
 
-    fun setBottomNavVisibility(visible: Boolean, animate: Boolean = false, hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty()) {
+    fun setBottomNavVisibility(
+        visible: Boolean,
+        animate: Boolean = false,
+        hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty()
+    ) {
         if (isInOneTabMode) {
             hideBottomSheet(
                 hide = hideBottomSheet,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
index 50c922662..63f60d2a4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
@@ -24,7 +24,6 @@ import android.text.TextWatcher
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import androidx.annotation.IdRes
 import androidx.core.content.getSystemService
 import androidx.core.view.*
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -52,7 +51,7 @@ import java.util.*
 
 
 class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWatcher,
-    ChipGroup.OnCheckedChangeListener {
+    ChipGroup.OnCheckedStateChangeListener {
     companion object {
         const val QUERY = "query"
         const val REQ_CODE_SPEECH_INPUT = 9001
@@ -134,7 +133,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa
                 it.chipBackgroundColor = ColorStateList(states, colors)
             }
         }
-        binding.searchFilterGroup.setOnCheckedChangeListener(this)
+        binding.searchFilterGroup.setOnCheckedStateChangeListener(this)
     }
 
     private fun showData(data: List<Any>) {
@@ -241,7 +240,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa
         }
     }
 
-    override fun onCheckedChanged(group: ChipGroup?, @IdRes checkedId: Int) {
+    override fun onCheckedChanged(group: ChipGroup, checkedIds: MutableList<Int>) {
         search(binding.searchView.text.toString())
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
index 78dcef3a0..2652da794 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
@@ -42,7 +42,8 @@ class BottomNavigationBarTinted @JvmOverloads constructor(
         } else {
             applyInsetter {
                 type(navigationBars = true) {
-                    padding()
+                    padding(vertical = true)
+                    margin(horizontal = true)
                 }
             }
         }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 179ca4e10..cf42f1d20 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -188,6 +188,7 @@
     </style>
 
     <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
+        <item name="paddingBottomSystemWindowInsets">false</item>
         <item name="android:maxWidth">@empty</item>
     </style>
 
diff --git a/build.gradle b/build.gradle
index 3a129732d..008a095dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext {
         kotlin_version = '1.6.10'
         navigation_version = '2.4.1'
-        mdc_version = '1.5.0'
+        mdc_version = '1.6.0-beta01'
         preference_version = '1.2.0'
         appcompat_version = '1.4.1'
     }