From 50c7d4aeb7b0e6c437e036012924a5baacec8d62 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Tue, 23 Nov 2021 11:31:50 +0530
Subject: [PATCH] Fixed Main Settings bottom insets

---
 .../retromusic/fragments/settings/AbsSettingsFragment.kt    | 1 -
 .../retromusic/fragments/settings/MainSettingsFragment.kt   | 6 ++++++
 app/src/main/res/layout/fragment_main_settings.xml          | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
index 94775a27..1fd169bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
@@ -66,7 +66,6 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setDivider(ColorDrawable(Color.TRANSPARENT))
-        listView.overScrollMode = View.OVER_SCROLL_NEVER
         // This is a workaround as CollapsingToolbarLayout consumes insets and
         // insets are not passed to child views
         // https://github.com/material-components/material-components-android/issues/1310
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
index c507a259..00935fdf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
@@ -19,15 +19,18 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.FragmentMainSettingsBinding
+import code.name.monkey.retromusic.extensions.addBottomInsets
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.RetroUtil
 
 class MainSettingsFragment : Fragment(), View.OnClickListener {
 
@@ -84,6 +87,9 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
             binding.buyPremium.setTextColor(it)
             binding.diamondIcon.imageTintList = ColorStateList.valueOf(it)
         }
+        if (!RetroUtil.isLandscape()) {
+            binding.container.updatePadding(bottom = RetroUtil.getNavigationBarHeight())
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index d538c45f..966b543d 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -8,6 +8,7 @@
     android:transitionGroup="true">
 
     <LinearLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">