Chore: Improve WindowInsets

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

Author: imknown

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

@@ -61,26 +61,30 @@ class MainActivity : AppCompatActivity() {
         // enableEdgeToEdge()
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.appBar) { appBar, windowInsets ->
-            val insets = windowInsets.getInsets(windowInsetsCompatTypes)
+        // https://developer.android.com/develop/ui/views/layout/edge-to-edge#material-components
+        // https://developer.android.com/develop/ui/compose/layouts/insets#material3-components
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBar) { appBar, windowInsetsCompat ->
+            val insets = windowInsetsCompat.getInsets(windowInsetsCompatTypes)
             appBar.updatePadding(
                 left = insets.left,
                 right = insets.right,
                 top = insets.top
             )
 
-            windowInsets
+            windowInsetsCompat
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigationView) { bnView, windowInsets ->
-            val insets = windowInsets.getInsets(windowInsetsCompatTypes)
+        // https://developer.android.com/develop/ui/views/layout/edge-to-edge#material-components
+        // https://developer.android.com/develop/ui/compose/layouts/insets#material3-components
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigationView) { bnView, windowInsetsCompat ->
+            val insets = windowInsetsCompat.getInsets(windowInsetsCompatTypes)
             bnView.updatePadding(
                 left = insets.left,
                 right = insets.right,
                 bottom = insets.bottom
             )
 
-            windowInsets
+            windowInsetsCompat
         }
     }
 

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

@@ -72,8 +72,8 @@ abstract class BaseListFragment : BaseFragment<FragmentListBinding>() {
     }
 
     private fun initWindowInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { rv, windowInsets ->
-            val insets = windowInsets.getInsets(windowInsetsCompatTypes)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { rv, windowInsetsCompat ->
+            val insets = windowInsetsCompat.getInsets(windowInsetsCompatTypes)
             (activity as? MainActivity)?.binding?.bottomNavigationView?.doOnLayout { bnv ->
                 rv.updatePadding(
                     left = insets.left,
@@ -82,7 +82,7 @@ abstract class BaseListFragment : BaseFragment<FragmentListBinding>() {
                 )
             }
 
-            windowInsets
+            windowInsetsCompat
         }
     }
 

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

@@ -43,8 +43,8 @@ class SettingsFragment : PreferenceFragmentCompat(), FragmentMixin {
     private fun initWindowInsets() {
         listView.clipToPadding = false
 
-        ViewCompat.setOnApplyWindowInsetsListener(listView) { rv, windowInsets ->
-            val insets = windowInsets.getInsets(windowInsetsCompatTypes)
+        ViewCompat.setOnApplyWindowInsetsListener(listView) { rv, windowInsetsCompat ->
+            val insets = windowInsetsCompat.getInsets(windowInsetsCompatTypes)
             (activity as? MainActivity)?.binding?.bottomNavigationView?.doOnLayout { bnv ->
                 rv.updatePadding(
                     left = insets.left,
@@ -53,7 +53,7 @@ class SettingsFragment : PreferenceFragmentCompat(), FragmentMixin {
                 )
             }
 
-            windowInsets
+            windowInsetsCompat
         }
     }