add preselected tags support to wear

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 = 2
+    const val wearApiVersion = 3
 }

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

@@ -0,0 +1,26 @@
+package com.example.util.simpletimetracker.core.interactor
+
+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.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()
+        val ruleTags = addRunningRecordMediator.processRules(
+            typeId = typeId,
+            timeStarted = timeStarted,
+            prevRecords = suspendLazy { emptyList() },
+        ).tagsIds
+        defaultTags + ruleTags
+    }
+}

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

@@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.async
 
 fun <T> CoroutineScope.suspendLazy(
-    initializer: suspend CoroutineScope.() -> T
+    initializer: suspend CoroutineScope.() -> T,
 ) = object : SuspendLazy<T> {
     private val deferred = async(start = CoroutineStart.LAZY, block = initializer)
     override suspend operator fun invoke(): T = deferred.await()

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

@@ -6,17 +6,15 @@ import androidx.lifecycle.viewModelScope
 import com.example.util.simpletimetracker.core.ShouldCloseAfterOneTagInteractor
 import com.example.util.simpletimetracker.core.base.BaseViewModel
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.interactor.LoadPreselectedTagsInteractor
 import com.example.util.simpletimetracker.core.interactor.RecordCommentSearchViewDataInteractor
 import com.example.util.simpletimetracker.core.viewData.CommentFilterTypeViewData
-import com.example.util.simpletimetracker.domain.base.CurrentTimestampProvider
-import com.example.util.simpletimetracker.domain.base.suspendLazy
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 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.AddTagToTypeIfNotExistMediator
 import com.example.util.simpletimetracker.domain.recordTag.interactor.NeedTagValueSelectionInteractor
-import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTypeToDefaultTagInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData
 import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData
@@ -28,7 +26,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.RecordTagSele
 import com.example.util.simpletimetracker.navigation.params.screen.RecordTagValueSelectionParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -40,9 +37,8 @@ class RecordTagSelectionViewModel @Inject constructor(
     private val prefsInteractor: PrefsInteractor,
     private val addTagToTypeIfNotExistMediator: AddTagToTypeIfNotExistMediator,
     private val needTagValueSelectionInteractor: NeedTagValueSelectionInteractor,
-    private val recordTypeToDefaultTagInteractor: RecordTypeToDefaultTagInteractor,
     private val shouldCloseAfterOneTagInteractor: ShouldCloseAfterOneTagInteractor,
-    private val currentTimestampProvider: CurrentTimestampProvider,
+    private val loadPreselectedTagsInteractor: LoadPreselectedTagsInteractor,
     private val recordCommentSearchViewDataInteractor: RecordCommentSearchViewDataInteractor,
 ) : BaseViewModel() {
 
@@ -63,7 +59,7 @@ class RecordTagSelectionViewModel @Inject constructor(
 
     private var newComment: String = ""
     private var newTags: List<RecordBase.Tag> = emptyList()
-    private var initialSelectedTagsLoaded: Boolean = false
+    private var initialDataLoaded: Boolean = false
     private var searchLoadJob: Job? = null
     private var isMultipleChoiceAvailable: Boolean = true
 
@@ -162,24 +158,13 @@ class RecordTagSelectionViewModel @Inject constructor(
         saveClicked.set(Unit)
     }
 
-    private suspend fun loadPreselectedTagIds(): Set<Long> = coroutineScope {
-        // TODO TAG check retroactive mode?
-        // TODO TAG ability to deselect preselected tags
-        // TODO TAG multiple choice from notification
-        // TODO TAG show preselected on wear and notification
-        val defaultTags = recordTypeToDefaultTagInteractor.getTags(extra.typeId)
-        val timeStarted = currentTimestampProvider.get()
-        val ruleTags = addRunningRecordMediator.processRules(
-            typeId = extra.typeId,
-            timeStarted = timeStarted,
-            prevRecords = suspendLazy { emptyList() },
-        ).tagsIds
-        defaultTags + ruleTags
-    }
-
-    private suspend fun initializePreselectedTags() {
-        if (initialSelectedTagsLoaded) return
-        val initialIds = loadPreselectedTagIds()
+    // TODO TAG add check retroactive mode to loaded preselected tags?
+    // TODO TAG ability to deselect preselected tags
+    // TODO TAG multiple choice from notification
+    // TODO TAG show preselected on notification
+    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) }
         }
@@ -191,7 +176,7 @@ class RecordTagSelectionViewModel @Inject constructor(
         // If there are preselected tags - ignore setting.
         isMultipleChoiceAvailable = newTags.isNotEmpty() || !shouldCloseAfterOne
         updateButtonVisibility()
-        initialSelectedTagsLoaded = true
+        initialDataLoaded = true
     }
 
     private fun updateButtonVisibility() {
@@ -222,7 +207,7 @@ class RecordTagSelectionViewModel @Inject constructor(
     private suspend fun loadViewData(
         fromCommentChange: Boolean,
     ): List<ViewHolderType> {
-        initializePreselectedTags()
+        initializeData()
 
         return viewDataInteractor.getViewData(
             extra = extra,

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

@@ -71,6 +71,7 @@ class WearDataLocalMapper @Inject constructor(
     fun map(
         recordTag: RecordTag,
         types: Map<Long, RecordType>,
+        preselectedTagIds: Set<Long>,
     ): WearTagDTO {
         return WearTagDTO(
             id = recordTag.id,
@@ -79,6 +80,7 @@ class WearDataLocalMapper @Inject constructor(
                 tag = recordTag,
                 types = types,
             ).let(::mapColor),
+            preselected = recordTag.id in preselectedTagIds,
         )
     }
 

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

@@ -5,6 +5,7 @@
  */
 package com.example.util.simpletimetracker.feature_wear
 
+import com.example.util.simpletimetracker.core.interactor.LoadPreselectedTagsInteractor
 import com.example.util.simpletimetracker.core.interactor.RecordRepeatInteractor
 import com.example.util.simpletimetracker.core.interactor.StatisticsMediator
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
@@ -63,6 +64,7 @@ class WearDataRepo @Inject constructor(
     private val addRunningRecordMediator: Lazy<AddRunningRecordMediator>,
     private val recordRepeatInteractor: Lazy<RecordRepeatInteractor>,
     private val updateExternalViewsInteractor: Lazy<UpdateExternalViewsInteractor>,
+    private val loadPreselectedTagsInteractor: Lazy<LoadPreselectedTagsInteractor>,
     private val router: Router,
     private val timeMapper: TimeMapper,
     private val widgetInteractor: WidgetInteractor,
@@ -187,12 +189,14 @@ 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)
         return getSelectableTagsInteractor.execute(activityId)
             .filterNot { it.archived }
             .map {
                 wearDataLocalMapper.map(
                     recordTag = it,
                     types = types,
+                    preselectedTagIds = preselectedTagIds,
                 )
             }
     }

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

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

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

@@ -9,4 +9,5 @@ data class WearTag(
     val id: Long,
     val name: String,
     val color: Long,
+    val preselected: Boolean,
 )

wear/src/main/java/com/example/util/simpletimetracker/features/tagsSelection/mapper/TagsViewDataMapper.kt

@@ -11,8 +11,6 @@ import com.example.util.simpletimetracker.R
 import com.example.util.simpletimetracker.core.ErrorStateMapper
 import com.example.util.simpletimetracker.core.mapper.RecordTagValueMapper
 import com.example.util.simpletimetracker.data.WearResourceRepo
-import com.example.util.simpletimetracker.domain.extension.orFalse
-import com.example.util.simpletimetracker.domain.model.WearSettings
 import com.example.util.simpletimetracker.domain.model.WearTag
 import com.example.util.simpletimetracker.domain.model.WearRecordTag
 import com.example.util.simpletimetracker.features.tagsSelection.screen.TagListState
@@ -46,7 +44,7 @@ class TagsViewDataMapper @Inject constructor(
                 tags = tags,
                 selectedTags = selectedTags,
                 loadingState = loadingState,
-                multipleChoiceAvailable = multipleChoiceAvailable
+                multipleChoiceAvailable = multipleChoiceAvailable,
             )
         }
 

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

@@ -123,12 +123,13 @@ class TagsViewModel @Inject constructor(
         if (settingsResult != null && tagsResult != null) {
             settings = settingsResult
             tags = tagsResult
+            selectedTags = tags.filter { it.preselected }.map { WearRecordTag(it.id, null) }
             val shouldCloseAfterOne = shouldCloseAfterOneTagInteractor.execute(
                 typeId = activityId,
                 closeAfterOne = settings?.recordTagSelectionCloseAfterOne.orFalse(),
                 excludedActivities = settings?.closeAfterOneTagExcludeActivities.orEmpty(),
             )
-            isMultipleChoiceAvailable = !shouldCloseAfterOne
+            isMultipleChoiceAvailable = selectedTags.isNotEmpty() || !shouldCloseAfterOne
             _state.value = mapState()
         } else {
             showError()
@@ -186,7 +187,7 @@ class TagsViewModel @Inject constructor(
             tags = tags,
             selectedTags = selectedTags,
             loadingState = loadingState,
-            multipleChoiceAvailable = isMultipleChoiceAvailable
+            multipleChoiceAvailable = isMultipleChoiceAvailable,
         )
     }