customize options menu

Author: Razeeman

app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt

@@ -16,11 +16,12 @@ import com.example.util.simpletimetracker.feature_dialogs.optionsDialog.OptionsL
 import com.example.util.simpletimetracker.feature_dialogs.recordQuickActions.view.RecordQuickActionsDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.recordTagSelection.RecordTagSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.recordTagValueSelection.view.RecordTagValueSelectionDialogFragment
-import com.example.util.simpletimetracker.feature_dialogs.typesSelection.view.TypesSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.standard.StandardDialogFragment
+import com.example.util.simpletimetracker.feature_dialogs.typesSelection.view.TypesSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_records_filter.view.RecordsFilterFragment
-import com.example.util.simpletimetracker.feature_settings.partialRestoreSelection.view.PartialRestoreSelectionFragment
+import com.example.util.simpletimetracker.feature_settings.customizeOptionsMenu.CustomizeOptionsMenuDialogFragment
 import com.example.util.simpletimetracker.feature_settings.partialRestoreSelection.model.PartialRestoreSelectionDialogParams
+import com.example.util.simpletimetracker.feature_settings.partialRestoreSelection.view.PartialRestoreSelectionFragment
 import com.example.util.simpletimetracker.navigation.NavigationData
 import com.example.util.simpletimetracker.navigation.bundleCreator.BundleCreator
 import com.example.util.simpletimetracker.navigation.bundleCreator.bundleCreatorDelegate
@@ -31,6 +32,7 @@ import com.example.util.simpletimetracker.navigation.params.screen.CardSizeDialo
 import com.example.util.simpletimetracker.navigation.params.screen.ChartFilterDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.ColorSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.CustomRangeSelectionParams
+import com.example.util.simpletimetracker.navigation.params.screen.CustomizeOptionsMenuDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditDuplicateTypeDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditTagSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataEditTypeSelectionDialogParams
@@ -41,15 +43,15 @@ import com.example.util.simpletimetracker.navigation.params.screen.DefaultTypesS
 import com.example.util.simpletimetracker.navigation.params.screen.DurationDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.EmojiSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.HelpDialogParams
+import com.example.util.simpletimetracker.navigation.params.screen.OptionsListParams
 import com.example.util.simpletimetracker.navigation.params.screen.PartialRestoreParams
 import com.example.util.simpletimetracker.navigation.params.screen.PomodoroSettingsParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordQuickActionsParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordTagSelectionParams
-import com.example.util.simpletimetracker.navigation.params.screen.OptionsListParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordTagValueSelectionParams
-import com.example.util.simpletimetracker.navigation.params.screen.TypesSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParams
 import com.example.util.simpletimetracker.navigation.params.screen.StandardDialogParams
+import com.example.util.simpletimetracker.navigation.params.screen.TypesSelectionDialogParams
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -140,6 +142,16 @@ class NavigationDialogMapModule {
         )
     }
 
+    @IntoMap
+    @Provides
+    @ScreenKey(CustomizeOptionsMenuDialogParams::class)
+    fun customizeOptionsMenuDialog(): NavigationData {
+        return NavigationData(
+            R.id.customizeOptionsMenuDialogFragment,
+            bundleCreatorDelegate(CustomizeOptionsMenuDialogFragment::createBundle),
+        )
+    }
+
     @IntoMap
     @Provides
     @ScreenKey(CardOrderDialogParams::class)

app/src/main/res/navigation/nav_graph.xml

@@ -279,6 +279,11 @@
         android:name="com.example.util.simpletimetracker.feature_dialogs.cardSize.view.CardSizeDialogFragment"
         android:label="CardSizeDialogFragment"
         tools:layout="@layout/card_size_dialog_fragment" />
+    <dialog
+        android:id="@+id/customizeOptionsMenuDialogFragment"
+        android:name="com.example.util.simpletimetracker.feature_settings.customizeOptionsMenu.CustomizeOptionsMenuDialogFragment"
+        android:label="CustomizeOptionsMenuDialogFragment"
+        tools:layout="@layout/customize_options_menu_dialog_fragment" />
     <dialog
         android:id="@+id/cardOrderDialogFragment"
         android:name="com.example.util.simpletimetracker.feature_dialogs.cardOrder.view.CardOrderDialogFragment"

core/src/main/java/com/example/util/simpletimetracker/core/delegates/dateSelector/mapper/DateSelectorMapper.kt

@@ -9,6 +9,7 @@ import com.example.util.simpletimetracker.domain.daysOfWeek.model.DaysInCalendar
 import com.example.util.simpletimetracker.domain.statistics.extension.canBeSwiped
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
 import com.example.util.simpletimetracker.feature_base_adapter.InfiniteRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.R
 import com.example.util.simpletimetracker.feature_base_adapter.dateSelector.DateSelectorDayViewData
 import com.example.util.simpletimetracker.feature_base_adapter.dateSelector.DateSelectorRangeViewData
 import com.example.util.simpletimetracker.feature_base_adapter.dateSelector.DateSelectorSingleViewData
@@ -206,19 +207,31 @@ class DateSelectorMapper @Inject constructor(
         val firstDayOfWeek: DayOfWeek,
     ) {
         sealed interface Type {
+            val optionsButton: Button
+
             data class Records(
+                override val optionsButton: Button,
                 val isCalendarView: Boolean,
                 val daysInCalendar: DaysInCalendar,
             ) : Type
 
             data class Statistics(
+                override val optionsButton: Button,
                 val rangeLength: RangeLength,
             ) : Type
         }
 
+        sealed interface Button {
+            data object Hidden : Button
+            data class Visible(val iconResId: Int) : Button
+        }
+
         companion object {
             val Empty = SetupData(
-                type = Type.Statistics(RangeLength.Day),
+                type = Type.Statistics(
+                    optionsButton = Button.Hidden,
+                    rangeLength = RangeLength.Day,
+                ),
                 startOfDayShift = 0,
                 firstDayOfWeek = DayOfWeek.SUNDAY,
             )

core/src/main/java/com/example/util/simpletimetracker/core/delegates/dateSelector/viewData/DateSelectorButtonsViewData.kt

@@ -0,0 +1,12 @@
+package com.example.util.simpletimetracker.core.delegates.dateSelector.viewData
+
+data class DateSelectorButtonsViewData(
+    val addButton: Button,
+    val optionsButton: Button,
+) {
+
+    sealed interface Button {
+        data object Hidden : Button
+        data class Visible(val iconResId: Int) : Button
+    }
+}

core/src/main/java/com/example/util/simpletimetracker/core/delegates/dateSelector/viewDelegate/DateSelectorViewDelegate.kt

@@ -14,6 +14,7 @@ import androidx.viewbinding.ViewBinding
 import androidx.viewpager2.widget.ViewPager2
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.databinding.DateSelectorLayoutBinding
+import com.example.util.simpletimetracker.core.delegates.dateSelector.viewData.DateSelectorButtonsViewData
 import com.example.util.simpletimetracker.core.delegates.dateSelector.viewModelDelegate.DateSelectorViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.changeDragSensitivity
 import com.example.util.simpletimetracker.core.extension.horizontalSmoothScrollWithOffset
@@ -24,6 +25,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.dateSelector.crea
 import com.example.util.simpletimetracker.feature_views.extension.addOnScrollListenerAdapter
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
+import com.google.android.material.button.MaterialButton
 
 object DateSelectorViewDelegate {
 
@@ -71,13 +73,10 @@ object DateSelectorViewDelegate {
     fun <T : ViewBinding> initUx(
         fragment: BaseFragment<T>,
         binding: DateSelectorLayoutBinding,
-        isAddButtonVisible: Boolean,
         onRecordAddClick: () -> Unit,
         onOptionsClick: () -> Unit,
         onOptionsLongClick: () -> Unit,
     ) = with(fragment) {
-        binding.btnRecordsContainerAdd.isVisible = isAddButtonVisible
-
         binding.btnRecordsContainerAdd.setOnClick(throttle(onRecordAddClick))
         binding.btnRecordsContainerOptions.setOnClick(throttle(onOptionsClick))
         binding.btnRecordsContainerOptions.setOnLongClick(throttle(onOptionsLongClick))
@@ -106,6 +105,12 @@ object DateSelectorViewDelegate {
             binding.viewRecordsContainerBorderShadowStart.isVisible = isVisible
             binding.viewRecordsContainerBorderShadowEnd.isVisible = isVisible
         }
+        viewModel.buttonsViewData.observe {
+            setButtonsViewData(
+                binding = binding,
+                viewData = it,
+            )
+        }
     }
 
     private fun getAdapter(
@@ -201,4 +206,27 @@ object DateSelectorViewDelegate {
         // TODO do better maybe?
         viewHolder.adapter.value.notifyDataSetChanged()
     }
+
+    private fun setButtonsViewData(
+        binding: DateSelectorLayoutBinding,
+        viewData: DateSelectorButtonsViewData,
+    ) = with(binding) {
+        fun setData(
+            view: MaterialButton,
+            data: DateSelectorButtonsViewData.Button,
+        ) {
+            when (data) {
+                is DateSelectorButtonsViewData.Button.Visible -> {
+                    view.isVisible = true
+                    view.setIconResource(data.iconResId)
+                }
+                is DateSelectorButtonsViewData.Button.Hidden -> {
+                    view.isVisible = false
+                }
+            }
+        }
+
+        setData(btnRecordsContainerAdd, viewData.addButton)
+        setData(btnRecordsContainerOptions, viewData.optionsButton)
+    }
 }

core/src/main/java/com/example/util/simpletimetracker/core/delegates/dateSelector/viewModelDelegate/DateSelectorViewModelDelegate.kt

@@ -5,10 +5,14 @@ import androidx.lifecycle.MutableLiveData
 import com.example.util.simpletimetracker.core.base.SingleLiveEvent
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.delegates.dateSelector.mapper.DateSelectorMapper
+import com.example.util.simpletimetracker.core.delegates.dateSelector.viewData.DateSelectorButtonsViewData
 import com.example.util.simpletimetracker.core.delegates.dateSelector.viewData.DateSelectorScrollViewData
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
 import com.example.util.simpletimetracker.feature_base_adapter.InfiniteRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.R
+import com.example.util.simpletimetracker.navigation.params.screen.OptionsListParams
 import javax.inject.Inject
 
 class DateSelectorViewModelDelegate @Inject constructor(
@@ -18,6 +22,7 @@ class DateSelectorViewModelDelegate @Inject constructor(
 
     val dateScrollPosition: LiveData<DateSelectorScrollViewData> =
         SingleLiveEvent<DateSelectorScrollViewData>()
+    val buttonsViewData: LiveData<DateSelectorButtonsViewData> = MutableLiveData()
     val updateDatesViewData: LiveData<Unit> = SingleLiveEvent<Unit>()
     val borderShadowsVisibility: LiveData<Boolean> = MutableLiveData()
 
@@ -68,6 +73,18 @@ class DateSelectorViewModelDelegate @Inject constructor(
         dateScrollPosition.set(scrollData)
     }
 
+    fun getOptionsButton(
+        options: List<OptionsListParams.Item>,
+    ): DateSelectorMapper.SetupData.Button {
+        return if (options.isEmpty()) {
+            DateSelectorMapper.SetupData.Button.Hidden
+        } else {
+            val defaultIcon = R.drawable.more
+            val icon = options.firstOrNull()?.icon?.takeIf { options.size == 1 } ?: defaultIcon
+            DateSelectorMapper.SetupData.Button.Visible(icon)
+        }
+    }
+
     private suspend fun setupDatesSelector() {
         val setupData = DateSelectorMapper.SetupData(
             type = parent?.getSetupData() ?: return,
@@ -80,6 +97,26 @@ class DateSelectorViewModelDelegate @Inject constructor(
         val shadowsVisibility = dataProvider.getCount() ==
             InfiniteRecyclerAdapter.DataProvider.Count.Infinite
         borderShadowsVisibility.set(shadowsVisibility)
+
+        val buttonsData = DateSelectorButtonsViewData(
+            addButton = when (setupData.type) {
+                is DateSelectorMapper.SetupData.Type.Records -> {
+                    DateSelectorButtonsViewData.Button.Visible(iconResId = R.drawable.plus)
+                }
+                is DateSelectorMapper.SetupData.Type.Statistics -> {
+                    DateSelectorButtonsViewData.Button.Hidden
+                }
+            },
+            optionsButton = when (val optionsButton = setupData.type.optionsButton) {
+                is DateSelectorMapper.SetupData.Button.Visible -> {
+                    DateSelectorButtonsViewData.Button.Visible(iconResId = optionsButton.iconResId)
+                }
+                is DateSelectorMapper.SetupData.Button.Hidden -> {
+                    DateSelectorButtonsViewData.Button.Hidden
+                }
+            },
+        )
+        buttonsViewData.set(buttonsData)
     }
 
     interface Parent {

core/src/main/res/layout/date_selector_layout.xml

@@ -47,21 +47,24 @@
         style="@style/ContainerRangeOptionsButton"
         android:layout_height="0dp"
         android:layout_marginEnd="8dp"
-        app:icon="@drawable/more"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:icon="@drawable/more"
+        tools:visibility="visible" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnRecordsContainerAdd"
         style="@style/ContainerRangeOptionsButton"
         android:layout_height="0dp"
         android:layout_marginEnd="4dp"
         android:visibility="gone"
-        app:icon="@drawable/add"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/btnRecordsContainerOptions"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginEnd="8dp"
+        tools:icon="@drawable/add"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

data_local/src/main/java/com/example/util/simpletimetracker/data_local/backup/BackupPrefsRepo.kt

@@ -88,6 +88,7 @@ import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Compani
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_DURATION_PRESENTATION_FORMAT
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_ENABLE_SEARCH_ON_MAIN
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_HIDDEN_COMMENT_FILTERS
+import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_HIDDEN_CONTAINER_OPTIONS
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_START_TIMER_BY_LONG_CLICK
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_POMODORO_SHOW_MORE_CONTROLS
 import com.example.util.simpletimetracker.data_local.prefs.PrefsRepoImpl.Companion.KEY_TYPE_ADDITIONAL_FIELDS_SHOWN
@@ -244,6 +245,7 @@ class BackupPrefsRepo @Inject constructor(
             PrefsProcessor(KEY_CATEGORY_ADDITIONAL_FIELDS_SHOWN, ::categoryAdditionalFieldsShown),
             PrefsProcessor(KEY_TAG_ADDITIONAL_FIELDS_SHOWN, ::tagAdditionalFieldsShown),
             PrefsProcessor(KEY_STATISTICS_DETAIL_STREAK_TYPE, ::statisticsDetailStreakType),
+            PrefsProcessor(KEY_HIDDEN_CONTAINER_OPTIONS, ::hiddenContainerOptions),
         )
     }
 

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

@@ -453,6 +453,10 @@ class PrefsRepoImpl @Inject constructor(
         KEY_STATISTICS_DETAIL_STREAK_TYPE, 0,
     )
 
+    override var hiddenContainerOptions: Set<String> by prefs.delegate(
+        KEY_HIDDEN_CONTAINER_OPTIONS, emptySet(),
+    )
+
     override fun setWidget(widgetId: Int, recordType: Long) {
         val key = KEY_WIDGET + widgetId
         logPrefsDataAccess("set $key")
@@ -735,6 +739,7 @@ class PrefsRepoImpl @Inject constructor(
         const val KEY_CARD_ORDER_MANUAL = "cardOrderManual"
         const val KEY_CATEGORY_ORDER_MANUAL = "categoryOrderManual"
         const val KEY_TAG_ORDER_MANUAL = "tagOrderManual"
+        const val KEY_HIDDEN_CONTAINER_OPTIONS = "hiddenContainerOptions"
 
         private const val KEY_AUTOMATIC_BACKUP_URI = "automaticBackupUri"
         private const val KEY_AUTOMATIC_BACKUP_ERROR = "automaticBackupError"

domain/src/main/java/com/example/util/simpletimetracker/domain/base/ContainerOptionsModel.kt

@@ -0,0 +1,20 @@
+package com.example.util.simpletimetracker.domain.base
+
+sealed interface ContainerOptionsModel {
+
+    sealed interface Records : ContainerOptionsModel {
+        data object CalendarView : Records
+        data object Filter : Records
+        data object Share : Records
+        data object BackToToday : Records
+        data object SelectDate : Records
+    }
+
+    sealed interface Statistics: ContainerOptionsModel {
+        data object Filter : Statistics
+        data object Share : Statistics
+        data object BackToToday : Statistics
+        data object SelectDate : Statistics
+        data object SelectRange : Statistics
+    }
+}