add value tags

Author: Razeeman

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

@@ -15,6 +15,7 @@ import com.example.util.simpletimetracker.feature_dialogs.helpDialog.HelpDialogF
 import com.example.util.simpletimetracker.feature_dialogs.optionsDialog.OptionsListDialogFragment
 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_records_filter.view.RecordsFilterFragment
@@ -44,6 +45,7 @@ import com.example.util.simpletimetracker.navigation.params.screen.PomodoroSetti
 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
@@ -197,6 +199,16 @@ class NavigationDialogMapModule {
         )
     }
 
+    @IntoMap
+    @Provides
+    @ScreenKey(RecordTagValueSelectionParams::class)
+    fun recordTagValueSelectionDialog(): NavigationData {
+        return NavigationData(
+            R.id.recordTagValueSelectionDialogFragment,
+            bundleCreatorDelegate(RecordTagValueSelectionDialogFragment::createBundle),
+        )
+    }
+
     @IntoMap
     @Provides
     @ScreenKey(DataExportSettingDialogParams::class)

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

@@ -304,6 +304,11 @@
         android:name="com.example.util.simpletimetracker.feature_dialogs.recordTagSelection.RecordTagSelectionDialogFragment"
         android:label="RecordTagSelectionDialogFragment"
         tools:layout="@layout/record_tag_selection_dialog_fragment" />
+    <dialog
+        android:id="@+id/recordTagValueSelectionDialogFragment"
+        android:name="com.example.util.simpletimetracker.feature_dialogs.recordTagValueSelection.view.RecordTagValueSelectionDialogFragment"
+        android:label="RecordTagValueSelectionDialogFragment"
+        tools:layout="@layout/record_tag_value_selection_dialog_fragment" />
     <dialog
         android:id="@+id/csvExportSettingsDialogFragment"
         android:name="com.example.util.simpletimetracker.feature_dialogs.csvExportSettings.view.CsvExportSettingsDialogFragment"

core/src/main/java/com/example/util/simpletimetracker/core/delegates/iconSelection/viewData/IconSelectionSwitchViewData.kt

@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.core.delegates.iconSelection.viewData
 
-import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
+import com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.icon.IconType
 
 data class IconSelectionSwitchViewData(

core/src/main/java/com/example/util/simpletimetracker/core/delegates/iconSelection/viewDelegate/IconSelectionViewDelegate.kt

@@ -19,7 +19,7 @@ import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionSwitchViewData
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewModelDelegate.IconSelectionViewModelDelegate
 import com.example.util.simpletimetracker.core.repo.DeviceRepo
-import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
+import com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.icon.IconEmojiType
 import com.example.util.simpletimetracker.domain.icon.IconImageState
 import com.example.util.simpletimetracker.domain.icon.IconType
@@ -62,7 +62,7 @@ object IconSelectionViewDelegate {
         }
 
         rvIconSelectionCategory.apply {
-            layoutManager = GridLayoutManager(context, IconEmojiType.values().size)
+            layoutManager = GridLayoutManager(context, IconEmojiType.entries.size)
             adapter = iconCategoriesAdapter
             itemAnimator = null
         }

core/src/main/java/com/example/util/simpletimetracker/core/delegates/iconSelection/viewModelDelegate/IconSelectionViewModelDelegate.kt

@@ -14,7 +14,7 @@ import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.
 import com.example.util.simpletimetracker.core.delegates.iconSelection.viewData.IconSelectionScrollViewData
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.mapper.IconEmojiMapper
-import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
+import com.example.util.simpletimetracker.feature_base_adapter.buttonsRow.view.ButtonsRowViewData
 import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.favourite.interactor.FavouriteIconInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor

core/src/main/java/com/example/util/simpletimetracker/core/dialog/OnTagValueSelectedListener.kt

@@ -0,0 +1,11 @@
+package com.example.util.simpletimetracker.core.dialog
+
+import com.example.util.simpletimetracker.navigation.params.screen.RecordTagValueSelectionParams
+
+interface OnTagValueSelectedListener {
+
+    fun onTagValueSelected(
+        params: RecordTagValueSelectionParams,
+        data: Double,
+    )
+}

core/src/main/java/com/example/util/simpletimetracker/core/dialog/TypesSelectionDialogListener.kt

@@ -1,6 +1,12 @@
 package com.example.util.simpletimetracker.core.dialog
 
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
+
 interface TypesSelectionDialogListener {
 
-    fun onDataSelected(dataIds: List<Long>, tag: String?)
+    fun onDataSelected(
+        tag: String?,
+        dataIds: List<Long>,
+        tagValues: List<RecordBase.Tag>,
+    )
 }

core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetUntrackedRecordsInteractorImpl.kt

@@ -50,6 +50,7 @@ class GetUntrackedRecordsInteractorImpl @Inject constructor(
                 timeStarted = it.timeStarted,
                 timeEnded = it.timeEnded,
                 comment = "",
+                tags = emptyList(),
             )
         }.let {
             processTimeOfDayRange(it)

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordRepeatInteractor.kt

@@ -72,7 +72,7 @@ class RecordRepeatInteractor @Inject constructor(
 
         addRunningRecordMediator.startTimer(
             typeId = prevRecord.typeId,
-            tagIds = prevRecord.tagIds,
+            tags = prevRecord.tags,
             comment = prevRecord.comment,
         )
         return ActionResult.Started

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordTagViewDataInteractor.kt

@@ -6,6 +6,7 @@ import com.example.util.simpletimetracker.core.mapper.CommonViewDataMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.extension.plusAssign
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.recordTag.interactor.GetSelectableTagsInteractor
 import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
@@ -28,7 +29,7 @@ class RecordTagViewDataInteractor @Inject constructor(
 
     // typeId == null - show all tags.
     suspend fun getViewData(
-        selectedTags: List<Long>,
+        selectedTags: List<RecordBase.Tag>,
         typeId: Long?,
         showAllTags: Boolean,
         multipleChoiceAvailable: Boolean,
@@ -54,10 +55,12 @@ class RecordTagViewDataInteractor @Inject constructor(
         val types = recordTypeInteractor.getAll().associateBy { it.id }
 
         return if (allTags.isNotEmpty()) {
-            val selected = allTags.filter { it.id in selectedTags }
-            val available = recordTags.filter { it.id !in selectedTags }
+            val selectedTagsMap = selectedTags.associateBy { it.tagId }
+            val selectedTagIds = selectedTagsMap.keys
+            val selected = allTags.filter { it.id in selectedTagIds }
+            val available = recordTags.filter { it.id !in selectedTagIds }
             val availableFromOtherActivities = if (showAllTags) {
-                tagsFromOtherActivities.filter { it.id !in selectedTags }
+                tagsFromOtherActivities.filter { it.id !in selectedTagIds }
             } else {
                 emptyList()
             }
@@ -79,8 +82,9 @@ class RecordTagViewDataInteractor @Inject constructor(
             }
 
             viewData += selected.map {
-                categoryViewDataMapper.mapRecordTag(
+                categoryViewDataMapper.mapRecordTagWithValue(
                     tag = it,
+                    tagData = selectedTagsMap[it.id],
                     type = types[it.iconColorSource],
                     isDarkTheme = isDarkTheme,
                 )