From 93277b8de7922af7d4a7d97ae86e3e0d0a54557c Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Fri, 3 Dec 2021 00:03:04 +0530 Subject: [PATCH] [Settings] Code Cleanup --- .../fragments/settings/AbsSettingsFragment.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 7e6ed914..afdd8a9b 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 @@ -19,15 +19,16 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.View import android.widget.Toast +import androidx.core.view.ViewCompat 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.safeGetBottomInsets import code.name.monkey.retromusic.preferences.* import code.name.monkey.retromusic.util.NavigationUtil -import code.name.monkey.retromusic.util.RetroUtil /** * @author Hemanth S (h4h13). @@ -66,11 +67,14 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setDivider(ColorDrawable(Color.TRANSPARENT)) - // This is a workaround as CollapsingToolbarLayout consumes insets and - // insets are not passed to child views + // CollapsingToolbarLayout consumes insets and insets are not passed to child views + // So we get insets from root view // https://github.com/material-components/material-components-android/issues/1310 - if (!RetroUtil.isLandscape()) { - listView.updatePadding(bottom = RetroUtil.getNavigationBarHeight()) + ViewCompat.setOnApplyWindowInsetsListener( + view + ) { _, insets -> + listView.updatePadding(bottom = insets.safeGetBottomInsets()) + insets } invalidateSettings() }