apply insets per screen

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

@@ -9,6 +9,7 @@ import androidx.viewbinding.ViewBinding
 import com.example.util.simpletimetracker.core.extension.allowDiskWrite
 import com.example.util.simpletimetracker.core.manager.ThemeManager
 import com.example.util.simpletimetracker.core.provider.ContextProvider
+import com.example.util.simpletimetracker.core.utils.applyStatusBarInsets
 import com.example.util.simpletimetracker.core.utils.applySystemBarInsets
 
 abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
@@ -31,7 +32,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
         themeManager.setTheme(this)
         _binding = inflater(layoutInflater)
         setContentView(binding.root)
-        binding.root.applySystemBarInsets()
+        binding.root.applyStatusBarInsets()
         initUi()
         initUx()
         initViewModel()

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

@@ -9,11 +9,14 @@ import android.view.ViewTreeObserver.OnPreDrawListener
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.viewbinding.ViewBinding
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
+import com.example.util.simpletimetracker.core.utils.applyNavBarInsets
 import kotlinx.coroutines.Job
 
 abstract class BaseFragment<T : ViewBinding> : Fragment(), Throttler {
 
     abstract val inflater: (LayoutInflater, ViewGroup?, Boolean) -> T
+    abstract val insetConfiguration: InsetConfiguration
     override var throttleJob: Job? = null
     protected val binding: T get() = _binding!!
     private var _binding: T? = null
@@ -42,6 +45,7 @@ abstract class BaseFragment<T : ViewBinding> : Fragment(), Throttler {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (!initialized) {
+            initInsets()
             initUi()
             initUx()
         }
@@ -88,6 +92,17 @@ abstract class BaseFragment<T : ViewBinding> : Fragment(), Throttler {
         view?.viewTreeObserver?.addOnPreDrawListener(listener)
     }
 
+    private fun initInsets() {
+        when (val config = insetConfiguration) {
+            is InsetConfiguration.DoNotApply -> {
+                // Do nothing
+            }
+            is InsetConfiguration.ApplyToView -> {
+                config.view().applyNavBarInsets()
+            }
+        }
+    }
+
     inline fun <T> LiveData<T>.observe(
         crossinline onChanged: (T) -> Unit,
     ) {

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

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.example.util.simpletimetracker.core.utils
 
 import android.view.View
@@ -40,3 +42,8 @@ fun WindowInsetsCompat.getNavBarInsets(): Insets {
 fun WindowInsetsCompat.getSystemBarInsets(): Insets {
     return getInsets(WindowInsetsCompat.Type.systemBars())
 }
+
+sealed interface InsetConfiguration {
+    object DoNotApply : InsetConfiguration
+    data class ApplyToView(val view: () -> View) : InsetConfiguration
+}

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

@@ -21,6 +21,7 @@ import com.google.android.flexbox.JustifyContent
 import dagger.hilt.android.AndroidEntryPoint
 import com.example.util.simpletimetracker.feature_archive.databinding.ArchiveFragmentBinding as Binding
 import androidx.core.view.isVisible
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 
 @AndroidEntryPoint
 class ArchiveFragment :
@@ -31,6 +32,9 @@ class ArchiveFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.rvArchiveList }
+
     private val viewModel: ArchiveViewModel by viewModels()
 
     private val archiveAdapter: BaseRecyclerAdapter by lazy {

features/feature_archive/src/main/res/layout/archive_fragment.xml

@@ -41,6 +41,7 @@
         android:id="@+id/rvArchiveList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:clipToPadding="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dividerArchive"
         tools:listitem="@layout/item_record_type_layout" />

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.example.util.simpletimetracker.core.base.BaseFragment
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAddAdapterDelegate
@@ -25,6 +26,9 @@ class CategoriesFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.rvCategoriesList }
+
     private val viewModel: CategoriesViewModel by viewModels()
 
     private val categoriesAdapter: BaseRecyclerAdapter by lazy {

features/feature_categories/src/main/res/layout/categories_fragment.xml

@@ -41,6 +41,7 @@
         android:id="@+id/rvCategoriesList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:clipToPadding="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dividerCategories"
         tools:listitem="@layout/item_category_layout" />

features/feature_change_activity_filter/src/main/java/com/example/util/simpletimetracker/feature_change_activity_filter/view/ChangeActivityFilterFragment.kt

@@ -17,6 +17,7 @@ import com.example.util.simpletimetracker.core.extension.hideKeyboard
 import com.example.util.simpletimetracker.core.extension.observeOnce
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.showKeyboard
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.UpdateViewChooserState
 import com.example.util.simpletimetracker.domain.extension.orFalse
@@ -51,7 +52,11 @@ class ChangeActivityFilterFragment :
     BaseFragment<Binding>(),
     ColorSelectionDialogListener {
 
-    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding = Binding::inflate
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
 
     private val viewModel: ChangeActivityFilterViewModel by viewModels()
 

features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt

@@ -17,6 +17,7 @@ import com.example.util.simpletimetracker.core.extension.hideKeyboard
 import com.example.util.simpletimetracker.core.extension.observeOnce
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.showKeyboard
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.UpdateViewChooserState
 import com.example.util.simpletimetracker.domain.extension.orFalse
@@ -57,7 +58,11 @@ class ChangeCategoryFragment :
     ColorSelectionDialogListener,
     DurationDialogListener {
 
-    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding = Binding::inflate
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
 
     private val viewModel: ChangeCategoryViewModel by viewModels()
 

features/feature_change_complex_rule/src/main/java/com/example/util/simpletimetracker/feature_change_complex_rule/view/ChangeComplexRuleFragment.kt

@@ -12,6 +12,7 @@ import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.dialog.TypesSelectionDialogListener
 import com.example.util.simpletimetracker.core.extension.addOnBackPressedListener
 import com.example.util.simpletimetracker.core.extension.observeOnce
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.UpdateViewChooserState
 import com.example.util.simpletimetracker.domain.extension.orFalse
@@ -48,7 +49,11 @@ class ChangeComplexRuleFragment :
     BaseFragment<Binding>(),
     TypesSelectionDialogListener {
 
-    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding = Binding::inflate
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
 
     private val viewModel: ChangeComplexRuleViewModel by viewModels()
 

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.core.extension.observeOnce
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.sharedViewModel.RemoveRecordViewModel
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
@@ -33,6 +34,9 @@ class ChangeRecordFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
+
     @Inject
     lateinit var removeRecordViewModelFactory: BaseViewModelFactory<RemoveRecordViewModel>
 

features/feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt

@@ -28,6 +28,7 @@ import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.showKeyboard
 import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.repo.DeviceRepo
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.UpdateViewChooserState
 import com.example.util.simpletimetracker.domain.extension.orFalse
@@ -78,6 +79,9 @@ class ChangeRecordTagFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
+
     @Inject
     lateinit var deviceRepo: DeviceRepo
 

features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt

@@ -29,6 +29,7 @@ import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.showKeyboard
 import com.example.util.simpletimetracker.core.extension.toViewData
 import com.example.util.simpletimetracker.core.repo.DeviceRepo
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.core.view.UpdateViewChooserState
 import com.example.util.simpletimetracker.domain.extension.orFalse
@@ -81,6 +82,9 @@ class ChangeRecordTypeFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
+
     @Inject
     lateinit var deviceRepo: DeviceRepo
 

features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt

@@ -10,6 +10,7 @@ import com.example.util.simpletimetracker.core.dialog.DateTimeDialogListener
 import com.example.util.simpletimetracker.core.extension.observeOnce
 import com.example.util.simpletimetracker.core.extension.setSharedTransitions
 import com.example.util.simpletimetracker.core.extension.toViewData
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.fragmentArgumentDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.runningRecord.RunningRecordViewData
 import com.example.util.simpletimetracker.feature_change_record.view.ChangeRecordCore
@@ -33,6 +34,9 @@ class ChangeRunningRecordFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
+
     @Inject
     lateinit var router: Router
 

features/feature_complex_rules/src/main/java/com/example/util/simpletimetracker/feature_complex_rules/view/ComplexRulesFragment.kt

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.util.simpletimetracker.core.base.BaseFragment
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
@@ -20,6 +21,9 @@ class ComplexRulesFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.rvComplexRulesList }
+
     private val viewModel: ComplexRulesViewModel by viewModels()
 
     private val rulesAdapter: BaseRecyclerAdapter by lazy {

features/feature_complex_rules/src/main/res/layout/complex_rules_fragment.xml

@@ -39,6 +39,7 @@
         android:id="@+id/rvComplexRulesList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:clipToPadding="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dividerComplexRules"
         tools:listitem="@layout/item_complex_rule_layout" />

features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/view/DataEditFragment.kt

@@ -11,6 +11,7 @@ import com.example.util.simpletimetracker.core.dialog.RecordsFilterListener
 import com.example.util.simpletimetracker.core.dialog.StandardDialogListener
 import com.example.util.simpletimetracker.core.extension.hideKeyboard
 import com.example.util.simpletimetracker.core.extension.showKeyboard
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.category.createCategoryAdapterDelegate
 import com.example.util.simpletimetracker.feature_data_edit.dialog.DataEditTagSelectionDialogListener
@@ -43,6 +44,9 @@ class DataEditFragment :
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.root }
+
     private val viewModel: DataEditViewModel by viewModels()
 
     private val addTagsPreviewAdapter: BaseRecyclerAdapter by lazy {

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/dateTime/DateDialogFragment.kt

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.utils.BuildVersions
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.domain.extension.orZero
 import java.util.Calendar
 import com.example.util.simpletimetracker.feature_dialogs.databinding.DateDialogFragmentBinding as Binding
@@ -14,6 +15,9 @@ class DateDialogFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.DoNotApply
+
     interface OnDateSetListener {
         fun onDateSet(year: Int, monthOfYear: Int, dayOfMonth: Int)
     }

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/dateTime/TimeDialogFragment.kt

@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
 import com.example.util.simpletimetracker.core.base.BaseFragment
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.domain.extension.orFalse
 import com.example.util.simpletimetracker.domain.extension.orZero
 import java.util.Calendar
@@ -18,6 +19,9 @@ class TimeDialogFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.DoNotApply
+
     interface OnTimeSetListener {
         fun onTimeSet(hourOfDay: Int, minute: Int, seconds: Int)
     }

features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/view/GoalsFragment.kt

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
 import com.example.util.simpletimetracker.core.sharedViewModel.MainTabsViewModel
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
 import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmptyAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
@@ -24,6 +25,9 @@ class GoalsFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.ApplyToView { binding.rvGoalsList }
+
     @Inject
     lateinit var mainTabsViewModelFactory: BaseViewModelFactory<MainTabsViewModel>
 

features/feature_goals/src/main/res/layout/goals_fragment.xml

@@ -4,5 +4,6 @@
     android:id="@+id/rvGoalsList"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipToPadding="false"
     tools:itemCount="15"
     tools:listitem="@layout/item_statistics_goal_layout" />

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt

@@ -16,6 +16,7 @@ import com.example.util.simpletimetracker.core.di.BaseViewModelFactory
 import com.example.util.simpletimetracker.core.extension.addOnBackPressedListener
 import com.example.util.simpletimetracker.core.extension.addOnPageChangeCallback
 import com.example.util.simpletimetracker.core.sharedViewModel.MainTabsViewModel
+import com.example.util.simpletimetracker.core.utils.InsetConfiguration
 import com.example.util.simpletimetracker.core.utils.SHORTCUT_NAVIGATION_KEY
 import com.example.util.simpletimetracker.core.view.SafeFragmentStateAdapter
 import com.example.util.simpletimetracker.domain.extension.orZero
@@ -36,6 +37,9 @@ class MainFragment : BaseFragment<Binding>() {
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
+    override val insetConfiguration: InsetConfiguration =
+        InsetConfiguration.DoNotApply
+
     @Inject
     lateinit var mainTabsViewModelFactory: BaseViewModelFactory<MainTabsViewModel>