add tag value from rules to preselected tags

Author: Razeeman

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -17,5 +17,5 @@ object Base {
     const val targetSDKWear = 34
 
     // Raise after wear api changes.
-    const val wearApiVersion = 3
+    const val wearApiVersion = 4
 }

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

@@ -4,24 +4,25 @@ import com.example.util.simpletimetracker.domain.base.CurrentTimestampProvider
 import com.example.util.simpletimetracker.domain.base.suspendLazy
 import com.example.util.simpletimetracker.domain.record.interactor.AddRunningRecordMediator
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
-import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToDefaultTagInteractor
 import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
 
 class LoadPreselectedTagsInteractor @Inject constructor(
     private val addRunningRecordMediator: AddRunningRecordMediator,
-    private val recordTypeToDefaultTagInteractor: RecordTypeToDefaultTagInteractor,
     private val currentTimestampProvider: CurrentTimestampProvider,
 ) {
 
-    suspend fun execute(typeId: Long) = coroutineScope {
-        val defaultTags = recordTypeToDefaultTagInteractor.getTags(typeId)
-        val timeStarted = currentTimestampProvider.get()
+    suspend fun execute(typeId: Long): List<RecordBase.Tag> = coroutineScope {
         val ruleTags = addRunningRecordMediator.processRules(
             typeId = typeId,
-            timeStarted = timeStarted,
+            timeStarted = currentTimestampProvider.get(),
             prevRecords = suspendLazy { emptyList() },
-        ).tags.map(RecordBase.Tag::tagId).toSet()
-        defaultTags + ruleTags
+        ).tags
+
+        addRunningRecordMediator.getAllTags(
+            typeId = typeId,
+            currentTags = emptyList(),
+            tagValuesFromRules = ruleTags,
+        )
     }
 }

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

@@ -377,7 +377,7 @@ class AddRunningRecordMediator @Inject constructor(
         }
     }
 
-    private suspend fun getAllTags(
+    suspend fun getAllTags(
         typeId: Long,
         currentTags: List<RecordBase.Tag>,
         tagValuesFromRules: List<RecordBase.Tag>,

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/interactor/ActivityStartStopFromBroadcastInteractor.kt

@@ -69,7 +69,6 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
             commentInputAvailable = false, // TODO open activity? Or RemoteInput?
         ) {
             val preselectedTags = loadPreselectedTagsInteractor.execute(selectedTypeId)
-                .map { RecordBase.Tag(tagId = it, numericValue = null) }
             val isMultipleTagAvailable = isMultipleTagChoiceAvailable(
                 selectedTypeId = selectedTypeId,
                 selectedTags = preselectedTags,

features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/viewModel/RecordTagSelectionViewModel.kt

@@ -162,10 +162,7 @@ class RecordTagSelectionViewModel @Inject constructor(
     // TODO TAG ability to deselect preselected tags
     private suspend fun initializeData() {
         if (initialDataLoaded) return
-        val initialIds = loadPreselectedTagsInteractor.execute(extra.typeId)
-        if (initialIds.isNotEmpty()) {
-            newTags = initialIds.map { RecordBase.Tag(tagId = it, numericValue = null) }
-        }
+        newTags = loadPreselectedTagsInteractor.execute(extra.typeId)
         val shouldCloseAfterOne = shouldCloseAfterOneTagInteractor.execute(
             typeId = extra.typeId,
             closeAfterOne = prefsInteractor.getRecordTagSelectionCloseAfterOne(),

features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataLocalMapper.kt

@@ -71,7 +71,7 @@ class WearDataLocalMapper @Inject constructor(
     fun map(
         recordTag: RecordTag,
         types: Map<Long, RecordType>,
-        preselectedTagIds: Set<Long>,
+        preselectedTags: Map<Long, RecordBase.Tag>,
     ): WearTagDTO {
         return WearTagDTO(
             id = recordTag.id,
@@ -80,7 +80,8 @@ class WearDataLocalMapper @Inject constructor(
                 tag = recordTag,
                 types = types,
             ).let(::mapColor),
-            preselected = recordTag.id in preselectedTagIds,
+            preselected = recordTag.id in preselectedTags.keys,
+            value = preselectedTags[recordTag.id]?.numericValue,
         )
     }
 

features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataRepo.kt

@@ -189,14 +189,15 @@ class WearDataRepo @Inject constructor(
 
     override suspend fun queryTagsForActivity(activityId: Long): List<WearTagDTO> {
         val types = recordTypeInteractor.getAll().associateBy { it.id }
-        val preselectedTagIds = loadPreselectedTagsInteractor.get().execute(activityId)
+        val preselectedTags = loadPreselectedTagsInteractor.get().execute(activityId)
+            .associateBy { it.tagId }
         return getSelectableTagsInteractor.execute(activityId)
             .filterNot { it.archived }
             .map {
                 wearDataLocalMapper.map(
                     recordTag = it,
                     types = types,
-                    preselectedTagIds = preselectedTagIds,
+                    preselectedTags = preselectedTags,
                 )
             }
     }

wear/src/main/java/com/example/util/simpletimetracker/data/WearDataLocalMapper.kt

@@ -83,6 +83,7 @@ class WearDataLocalMapper @Inject constructor() {
             name = dto.name,
             color = dto.color,
             preselected = dto.preselected,
+            value = dto.value,
         )
     }
 

wear/src/main/java/com/example/util/simpletimetracker/domain/model/WearTag.kt

@@ -10,4 +10,5 @@ data class WearTag(
     val name: String,
     val color: Long,
     val preselected: Boolean,
+    val value: Double?,
 )

wear/src/main/java/com/example/util/simpletimetracker/features/tagsSelection/viewModel/TagsViewModel.kt

@@ -123,7 +123,9 @@ class TagsViewModel @Inject constructor(
         if (settingsResult != null && tagsResult != null) {
             settings = settingsResult
             tags = tagsResult
-            selectedTags = tags.filter { it.preselected }.map { WearRecordTag(it.id, null) }
+            selectedTags = tags.filter { it.preselected }.map {
+                WearRecordTag(tagId = it.id, numericValue = it.value)
+            }
             val shouldCloseAfterOne = shouldCloseAfterOneTagInteractor.execute(
                 typeId = activityId,
                 closeAfterOne = settings?.recordTagSelectionCloseAfterOne.orFalse(),