trying to fix insets on samsung

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/base/BaseBottomSheetFragment.kt

@@ -116,10 +116,7 @@ abstract class BaseBottomSheetFragment<T : ViewBinding> : BottomSheetDialogFragm
                 findViewById<View>(com.google.android.material.R.id.container)?.apply {
                     fitsSystemWindows = false
                     doOnApplyWindowInsetsListener {
-                        updatePadding(
-                            top = it.getStatusBarInsets().top,
-                            bottom = 0,
-                        )
+                        updatePadding(top = getStatusBarInsets(), bottom = 0)
                     }
                 }
 

core/src/main/java/com/example/util/simpletimetracker/core/utils/InsetUtils.kt

@@ -1,11 +1,11 @@
 package com.example.util.simpletimetracker.core.utils
 
 import android.view.View
-import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import com.example.util.simpletimetracker.core.manager.KeyboardVisibilityManager
+import com.example.util.simpletimetracker.domain.extension.orZero
 
 // Can update padding or margin, which would be more appropriate.
 fun View.doOnApplyWindowInsetsListener(block: View.(WindowInsetsCompat) -> Unit) {
@@ -17,31 +17,22 @@ fun View.doOnApplyWindowInsetsListener(block: View.(WindowInsetsCompat) -> Unit)
     }
 }
 
-fun View.applySystemBarInsets() {
-    doOnApplyWindowInsetsListener {
-        val insets = it.getSystemBarInsets()
-        updatePadding(top = insets.top, bottom = insets.bottom)
-    }
-}
-
 fun View.applyStatusBarInsets() {
-    doOnApplyWindowInsetsListener { updatePadding(top = it.getStatusBarInsets().top) }
+    doOnApplyWindowInsetsListener { updatePadding(top = getStatusBarInsets()) }
 }
 
 fun View.applyNavBarInsets() {
-    doOnApplyWindowInsetsListener { updatePadding(bottom = it.getNavBarInsets().bottom) }
-}
-
-fun WindowInsetsCompat.getStatusBarInsets(): Insets {
-    return getInsets(WindowInsetsCompat.Type.statusBars())
+    doOnApplyWindowInsetsListener { updatePadding(bottom = getNavBarInsets()) }
 }
 
-fun WindowInsetsCompat.getNavBarInsets(): Insets {
-    return getInsets(WindowInsetsCompat.Type.navigationBars())
+fun View.getStatusBarInsets(): Int {
+    return ViewCompat.getRootWindowInsets(this)
+        ?.getInsets(WindowInsetsCompat.Type.statusBars())?.top.orZero()
 }
 
-fun WindowInsetsCompat.getSystemBarInsets(): Insets {
-    return getInsets(WindowInsetsCompat.Type.systemBars())
+fun View.getNavBarInsets(): Int {
+    return ViewCompat.getRootWindowInsets(this)
+        ?.getInsets(WindowInsetsCompat.Type.navigationBars())?.bottom.orZero()
 }
 
 // Need windowSoftInputMode="adjustResize" on activity in order to work on api < 30.

features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt

@@ -73,7 +73,7 @@ class ArchiveFragment :
         }
 
         btnArchiveOptions.doOnApplyWindowInsetsListener {
-            val navBarHeight = it.getNavBarInsets().bottom.pxToDp()
+            val navBarHeight = getNavBarInsets().pxToDp()
             viewModel.onChangeInsets(navBarHeight = navBarHeight)
             setMargins(bottom = navBarHeight)
         }

features/feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/view/CategoriesFragment.kt

@@ -79,7 +79,7 @@ class CategoriesFragment :
         }
 
         btnCategoriesOptions.doOnApplyWindowInsetsListener {
-            val navBarHeight = it.getNavBarInsets().bottom.pxToDp()
+            val navBarHeight = getNavBarInsets().pxToDp()
             viewModel.onChangeInsets(navBarHeight = navBarHeight)
             setMargins(bottom = navBarHeight)
         }

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt

@@ -125,7 +125,7 @@ class RunningRecordsFragment :
         }
 
         view?.doOnApplyWindowInsetsListener {
-            viewModel.onChangeInsets(navBarHeight = it.getNavBarInsets().bottom.pxToDp())
+            viewModel.onChangeInsets(navBarHeight = getNavBarInsets().pxToDp())
         }
 
         setOnPreDrawListener {

features/feature_shortcuts/src/main/java/com/example/util/simpletimetracker/feature_shortcuts/view/ShortcutsFragment.kt

@@ -58,7 +58,7 @@ class ShortcutsFragment : BaseFragment<Binding>() {
         }
 
         view?.doOnApplyWindowInsetsListener {
-            viewModel.onChangeInsets(navBarHeight = it.getNavBarInsets().bottom.pxToDp())
+            viewModel.onChangeInsets(navBarHeight = getNavBarInsets().pxToDp())
         }
     }
 

features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/universal/view/WidgetUniversalFragment.kt

@@ -74,7 +74,7 @@ class WidgetUniversalFragment :
         }
 
         view?.doOnApplyWindowInsetsListener {
-            viewModel.onChangeInsets(navBarHeight = it.getNavBarInsets().bottom.pxToDp())
+            viewModel.onChangeInsets(navBarHeight = getNavBarInsets().pxToDp())
         }
     }