From 061c0a8a3c0730c9ee5c570f649852a397efab73 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Fri, 14 Jan 2022 18:56:57 +0530 Subject: [PATCH] Added insetter https://github.com/chrisbanes/insetter --- app/build.gradle | 2 ++ app/src/main/assets/license.html | 2 ++ .../fragments/settings/AbsSettingsFragment.kt | 23 ++++--------------- .../settings/MainSettingsFragment.kt | 17 ++------------ app/src/main/res/layout/activity_settings.xml | 19 +++++++-------- 5 files changed, 19 insertions(+), 44 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 863a2ef1e..17e20a02f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -159,6 +159,8 @@ dependencies { implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3' implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' + implementation "dev.chrisbanes.insetter:insetter:0.6.1" + implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' implementation 'com.github.Adonai:jaudiotagger:2.3.15' implementation 'com.anjlab.android.iab.v3:library:2.0.3' diff --git a/app/src/main/assets/license.html b/app/src/main/assets/license.html index b0de6464e..ff5e78bd2 100644 --- a/app/src/main/assets/license.html +++ b/app/src/main/assets/license.html @@ -70,6 +70,8 @@ title="KeyboardVisibilityEvent">KeyboardVisibilityEvent by Yasuhiro SHIMIZU

android-snowfall by Jetradar Mobile

+

Insetter by Chris Banes

Icons by Austin Andrews

Material Design City Wallpaper

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 2fae21e2b..8a1502ab0 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 @@ -20,18 +20,14 @@ import android.os.Build import android.os.Bundle import android.view.View import android.widget.Toast -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.updatePadding import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceManager import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat import code.name.monkey.retromusic.activities.OnThemeChangedListener -import code.name.monkey.retromusic.extensions.rootView -import code.name.monkey.retromusic.extensions.safeGetBottomInsets import code.name.monkey.retromusic.preferences.* import code.name.monkey.retromusic.util.NavigationUtil +import dev.chrisbanes.insetter.applyInsetter /** * @author Hemanth S (h4h13). @@ -74,19 +70,10 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() { listView.overScrollMode = View.OVER_SCROLL_NEVER } - // CollapsingToolbarLayout consumes insets and insets are not passed to child views - // So we get insets from decor view - // https://github.com/material-components/material-components-android/issues/1310 - ViewCompat.setOnApplyWindowInsetsListener( - requireActivity().rootView - ) { _, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - listView.updatePadding( - left = insets.left, - bottom = insets.bottom, - right = insets.right, - ) - windowInsets + listView.applyInsetter { + type(navigationBars = true) { + padding() + } } invalidateSettings() } 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 99738c86c..5b2d85269 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,17 +19,14 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -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.drawAboveSystemBarsWithPadding import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.rootView import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.util.NavigationUtil @@ -89,17 +86,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener { binding.diamondIcon.imageTintList = ColorStateList.valueOf(it) } - ViewCompat.setOnApplyWindowInsetsListener( - requireActivity().rootView - ) { _, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - _binding?.container?.updatePadding( - left = insets.left, - bottom = insets.bottom, - right = insets.right, - ) - windowInsets - } + binding.container.drawAboveSystemBarsWithPadding() } override fun onDestroyView() { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 89b542036..7e1caf699 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -6,6 +6,14 @@ android:layout_height="match_parent" android:background="?attr/colorSurface" android:fitsSystemWindows="true"> + - - - - \ No newline at end of file