Fix: Improve WindowInsets

Signed-off-by: imknown <imknown@qq.com>

Author: imknown

app/src/main/java/net/imknown/android/forefrontinfo/ui/MainActivity.kt

@@ -27,7 +27,7 @@ import net.imknown.android.forefrontinfo.ui.settings.SettingsFragment
 
 class MainActivity : AppCompatActivity() {
 
-    private val binding by viewBinding(MainActivityBinding::inflate)
+    internal val binding by viewBinding(MainActivityBinding::inflate)
 
     private val mainViewModel by viewModels<MainViewModel>()
 
@@ -36,6 +36,8 @@ class MainActivity : AppCompatActivity() {
 
         setContentView(binding.root)
 
+        initWindowInsets()
+
         initViews()
 
         if (savedInstanceState == null) {
@@ -51,17 +53,17 @@ class MainActivity : AppCompatActivity() {
 //        mainViewModel.removeRequestPermissionResultListener()
     }
 
-    private fun initViews() {
+    private fun initWindowInsets() {
         // https://developer.android.com/design/ui/mobile/guides/foundations/system-bars#button_modes
         // https://developer.android.com/develop/ui/views/layout/edge-to-edge#create-transparent
         // https://developer.android.com/develop/ui/views/layout/edge-to-edge-manually#change-color
         // https://developer.android.com/develop/ui/compose/layouts/system-bars#create-transparent
         // enableEdgeToEdge()
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.appBar) { view, windowInsets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBar) { appBar, windowInsets ->
             val insets = windowInsets.getInsets(windowInsetsCompatTypes)
-            view.updatePadding(
+            appBar.updatePadding(
                 left = insets.left,
                 right = insets.right,
                 top = insets.top
@@ -70,17 +72,19 @@ class MainActivity : AppCompatActivity() {
             windowInsets
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigationView) { view, windowInsets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigationView) { bnView, windowInsets ->
             val insets = windowInsets.getInsets(windowInsetsCompatTypes)
-            view.updatePadding(
+            bnView.updatePadding(
                 left = insets.left,
                 right = insets.right,
                 bottom = insets.bottom
             )
 
             windowInsets
         }
+    }
 
+    private fun initViews() {
         initSubtitle()
 
         binding.bottomNavigationView.setOnItemSelectedListener {

app/src/main/java/net/imknown/android/forefrontinfo/ui/base/list/BaseListFragment.kt

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.ViewCompat
+import androidx.core.view.doOnLayout
 import androidx.core.view.updatePadding
 import androidx.lifecycle.LiveData
 import com.google.android.material.color.MaterialColors
@@ -14,6 +15,7 @@ import net.imknown.android.forefrontinfo.base.mvvm.Event
 import net.imknown.android.forefrontinfo.base.mvvm.EventObserver
 import net.imknown.android.forefrontinfo.base.mvvm.windowInsetsCompatTypes
 import net.imknown.android.forefrontinfo.databinding.FragmentListBinding
+import net.imknown.android.forefrontinfo.ui.MainActivity
 import com.google.android.material.R as materialR
 
 abstract class BaseListFragment : BaseFragment<FragmentListBinding>() {
@@ -36,6 +38,8 @@ abstract class BaseListFragment : BaseFragment<FragmentListBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         // super.onViewCreated(view, savedInstanceState)
 
+        initWindowInsets()
+
         initViews(savedInstanceState)
 
         listViewModel.changeScrollBarModeEvent.observe(viewLifecycleOwner, EventObserver {
@@ -67,20 +71,22 @@ abstract class BaseListFragment : BaseFragment<FragmentListBinding>() {
         listViewModel.init(savedInstanceState)
     }
 
-    private fun initViews(savedInstanceState: Bundle?) {
-        val bottomR = materialR.dimen.design_bottom_navigation_height
-        val bottom = resources.getDimensionPixelSize(bottomR)
-        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { view, windowInsets ->
+    private fun initWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { rv, windowInsets ->
             val insets = windowInsets.getInsets(windowInsetsCompatTypes)
-            view.updatePadding(
-                left = insets.left,
-                right = insets.right,
-                bottom = insets.bottom + (insets.bottom + bottom)
-            )
+            (activity as? MainActivity)?.binding?.bottomNavigationView?.doOnLayout { bnv ->
+                rv.updatePadding(
+                    left = insets.left,
+                    right = insets.right,
+                    bottom = bnv.height
+                )
+            }
 
             windowInsets
         }
+    }
 
+    private fun initViews(savedInstanceState: Bundle?) {
         val color = MaterialColors.getColor(binding.root, materialR.attr.colorOnPrimaryContainer)
         binding.swipeRefreshLayout.setColorSchemeColors(color)
         val backgroundColor =

app/src/main/java/net/imknown/android/forefrontinfo/ui/settings/SettingsFragment.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.StringRes
 import androidx.core.view.ViewCompat
+import androidx.core.view.doOnLayout
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.preference.ListPreference
@@ -15,7 +16,7 @@ import net.imknown.android.forefrontinfo.base.extension.isChinaMainlandTimezone
 import net.imknown.android.forefrontinfo.base.mvvm.EventObserver
 import net.imknown.android.forefrontinfo.base.mvvm.FragmentMixin
 import net.imknown.android.forefrontinfo.base.mvvm.windowInsetsCompatTypes
-import com.google.android.material.R as materialR
+import net.imknown.android.forefrontinfo.ui.MainActivity
 
 class SettingsFragment : PreferenceFragmentCompat(), FragmentMixin {
 
@@ -34,21 +35,26 @@ class SettingsFragment : PreferenceFragmentCompat(), FragmentMixin {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        initWindowInsets()
+
+        initViews()
+    }
+
+    private fun initWindowInsets() {
         listView.clipToPadding = false
-        val bottomR = materialR.dimen.design_bottom_navigation_height
-        val bottom = resources.getDimensionPixelSize(bottomR)
-        ViewCompat.setOnApplyWindowInsetsListener(listView) { insetView, windowInsets ->
+
+        ViewCompat.setOnApplyWindowInsetsListener(listView) { rv, windowInsets ->
             val insets = windowInsets.getInsets(windowInsetsCompatTypes)
-            insetView.updatePadding(
-                left = insets.left,
-                right = insets.right,
-                bottom = insets.bottom + (insets.bottom + bottom)
-            )
+            (activity as? MainActivity)?.binding?.bottomNavigationView?.doOnLayout { bnv ->
+                rv.updatePadding(
+                    left = insets.left,
+                    right = insets.right,
+                    bottom = bnv.height
+                )
+            }
 
             windowInsets
         }
-
-        initViews()
     }
 
     private fun initViews() {