add setting to show nav bar at the bottom

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/viewData/SettingsBlock.kt

@@ -49,6 +49,7 @@ enum class SettingsBlock {
     DisplayEnablePomodoroMode,
     DisplayPomodoroModeActivities,
     DisplayGoalsOnSeparateTabs,
+    DisplayNavBarAtTheBottom,
     DisplayKeepScreenOn,
     DisplayWidgetBackground,
     DisplayMilitaryFormat,

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt

@@ -290,6 +290,10 @@ class PrefsRepoImpl @Inject constructor(
         KEY_DEFAULT_TYPES_HIDDEN, false,
     )
 
+    override var isNavBarAtTheBottom: Boolean by prefs.delegate(
+        KEY_IS_NAV_BAR_AT_THE_BOTTOM, false,
+    )
+
     override fun setWidget(widgetId: Int, recordType: Long) {
         val key = KEY_WIDGET + widgetId
         logPrefsDataAccess("set $key")
@@ -556,6 +560,7 @@ class PrefsRepoImpl @Inject constructor(
         private const val KEY_REPEAT_BUTTON_TYPE = "repeatButtonType"
         private const val KEY_WIDGET_TRANSPARENCY_PERCENT = "widgetTransparencyPercent"
         private const val KEY_DEFAULT_TYPES_HIDDEN = "defaultTypesHidden"
+        private const val KEY_IS_NAV_BAR_AT_THE_BOTTOM = "isNavBarAtTheBottom"
         private const val KEY_WIDGET = "widget_"
         private const val KEY_STATISTICS_WIDGET_FILTERED_TYPES = "statistics_widget_filtered_types_"
         private const val KEY_STATISTICS_WIDGET_FILTERED_CATEGORIES = "statistics_widget_filtered_categories_"

domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt

@@ -667,6 +667,14 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.defaultTypesHidden = value
     }
 
+    suspend fun getIsNavBarAtTheBottom(): Boolean = withContext(Dispatchers.IO) {
+        prefsRepo.isNavBarAtTheBottom
+    }
+
+    suspend fun setIsNavBarAtTheBottom(value: Boolean) = withContext(Dispatchers.IO) {
+        prefsRepo.isNavBarAtTheBottom = value
+    }
+
     suspend fun clear() = withContext(Dispatchers.IO) {
         prefsRepo.clear()
     }

domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt

@@ -133,6 +133,8 @@ interface PrefsRepo {
 
     var defaultTypesHidden: Boolean
 
+    var isNavBarAtTheBottom: Boolean
+
     fun setWidget(widgetId: Int, recordType: Long)
 
     fun getWidget(widgetId: Int): Long

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

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.AttrRes
+import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.fragment.app.activityViewModels
@@ -17,11 +18,11 @@ import com.example.util.simpletimetracker.core.sharedViewModel.MainTabsViewModel
 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
-import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.example.util.simpletimetracker.feature_main.R
 import com.example.util.simpletimetracker.feature_main.adapter.MainContentAdapter
 import com.example.util.simpletimetracker.feature_main.provider.MainTabsProvider
 import com.example.util.simpletimetracker.feature_main.viewModel.MainViewModel
+import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
@@ -61,6 +62,7 @@ class MainFragment : BaseFragment<Binding>() {
 
     override fun initViewModel() {
         viewModel.initialize
+        viewModel.isNavBatAtTheBottom.observe(::updateNavBarPosition)
     }
 
     private fun setupPager() = with(binding) {
@@ -107,6 +109,29 @@ class MainFragment : BaseFragment<Binding>() {
         mainPager.setCurrentItem(mainPagePosition, false)
     }
 
+    private fun updateNavBarPosition(isAtTheBottom: Boolean) = with(binding) {
+        val set = ConstraintSet()
+        set.clone(binding.containerMain)
+        if (isAtTheBottom) {
+            set.clear(R.id.mainTabs, ConstraintSet.TOP)
+            set.connect(R.id.mainTabs, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM)
+            set.connect(R.id.mainPager, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP)
+            set.connect(R.id.mainPager, ConstraintSet.BOTTOM, R.id.mainTabs, ConstraintSet.TOP)
+        } else {
+            set.clear(R.id.mainTabs, ConstraintSet.BOTTOM)
+            set.connect(R.id.mainTabs, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP)
+            set.connect(R.id.mainPager, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM)
+            set.connect(R.id.mainPager, ConstraintSet.TOP, R.id.mainTabs, ConstraintSet.BOTTOM)
+        }
+        set.applyTo(binding.containerMain)
+
+        if (isAtTheBottom) {
+            TabLayout.INDICATOR_GRAVITY_TOP
+        } else {
+            TabLayout.INDICATOR_GRAVITY_BOTTOM
+        }.let(mainTabs::setSelectedTabIndicatorGravity)
+    }
+
     private fun getOnBackPressedCallback(): OnBackPressedCallback {
         return object : OnBackPressedCallback(false) {
             override fun handleOnBackPressed() {

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/viewModel/MainViewModel.kt

@@ -1,8 +1,11 @@
 package com.example.util.simpletimetracker.feature_main.viewModel
 
-import androidx.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
+import com.example.util.simpletimetracker.core.base.BaseViewModel
+import com.example.util.simpletimetracker.core.extension.lazySuspend
 import com.example.util.simpletimetracker.domain.interactor.NotificationTypeInteractor
+import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.WearInteractor
 import com.example.util.simpletimetracker.domain.interactor.WidgetInteractor
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -14,9 +17,11 @@ class MainViewModel @Inject constructor(
     private val notificationTypeInteractor: NotificationTypeInteractor,
     private val widgetInteractor: WidgetInteractor,
     private val wearInteractor: WearInteractor,
-) : ViewModel() {
+    private val prefsInteractor: PrefsInteractor,
+) : BaseViewModel() {
 
     val initialize: Unit by lazy { syncState() }
+    val isNavBatAtTheBottom: LiveData<Boolean> by lazySuspend { loadIsNavBatAtTheBottom() }
 
     private fun syncState() {
         viewModelScope.launch {
@@ -25,4 +30,8 @@ class MainViewModel @Inject constructor(
             wearInteractor.update()
         }
     }
+
+    private suspend fun loadIsNavBatAtTheBottom(): Boolean {
+        return prefsInteractor.getIsNavBarAtTheBottom()
+    }
 }

features/feature_main/src/main/res/layout/main_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/containerMain"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -12,10 +13,12 @@
         app:tabIndicatorColor="?appTabSelectedColor"
         app:tabRippleColor="@color/tab_ripple" />
 
+    <!--  Small margin is added to prevent shared transition going under new screen  -->
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/mainPager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginTop="0.1dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainTabs" />
 

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/interactor/SettingsDisplayViewDataInteractor.kt

@@ -156,6 +156,14 @@ class SettingsDisplayViewDataInteractor @Inject constructor(
                 bottomSpaceIsVisible = true,
                 dividerIsVisible = true,
             )
+            result += SettingsCheckboxViewData(
+                block = SettingsBlock.DisplayNavBarAtTheBottom,
+                title = resourceRepo.getString(R.string.settings_show_nav_bar_at_the_bottom),
+                subtitle = "",
+                isChecked = prefsInteractor.getIsNavBarAtTheBottom(),
+                bottomSpaceIsVisible = true,
+                dividerIsVisible = true,
+            )
             result += SettingsCheckboxViewData(
                 block = SettingsBlock.DisplayKeepScreenOn,
                 title = resourceRepo.getString(R.string.settings_keep_screen_on),

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/SettingsViewModel.kt

@@ -179,6 +179,8 @@ class SettingsViewModel @Inject constructor(
                 displayDelegate.onAllowMultipleActivityFiltersClicked()
             SettingsBlock.DisplayGoalsOnSeparateTabs ->
                 displayDelegate.onShowGoalsSeparatelyClicked()
+            SettingsBlock.DisplayNavBarAtTheBottom ->
+                displayDelegate.onShowNavBarAtTheBottomClicked()
             SettingsBlock.DisplayKeepScreenOn ->
                 displayDelegate.onKeepScreenOnClicked()
             SettingsBlock.DisplayMilitaryFormat ->

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt

@@ -253,6 +253,15 @@ class SettingsDisplayViewModelDelegate @Inject constructor(
         }
     }
 
+    fun onShowNavBarAtTheBottomClicked() {
+        delegateScope.launch {
+            val newValue = !prefsInteractor.getIsNavBarAtTheBottom()
+            prefsInteractor.setIsNavBarAtTheBottom(newValue)
+            parent?.updateContent()
+            router.restartApp()
+        }
+    }
+
     fun onUseMilitaryTimeClicked() {
         delegateScope.launch {
             val newValue = !prefsInteractor.getUseMilitaryTimeFormat()