refactor tag selection view data

Razeeman · Razeeman · commit fbbe63446b17 · 2026-02-22T09:14:16.000+03:00
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordTagViewDataInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordTagViewDataInteractor.kt
@@ -4,6 +4,7 @@ import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper
 import com.example.util.simpletimetracker.core.mapper.CommonViewDataMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.domain.extension.addBetweenEach
 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
@@ -34,6 +35,7 @@ class RecordTagViewDataInteractor @Inject constructor(
         showAllTags: Boolean,
         multipleChoiceAvailable: Boolean,
         showAddButton: Boolean,
+        showHint: Boolean,
         showArchived: Boolean,
         showUntaggedButton: Boolean,
         showAllTagsButton: Boolean,
@@ -44,135 +46,149 @@ class RecordTagViewDataInteractor @Inject constructor(
 
         val isDarkTheme = prefsInteractor.getDarkMode()
         val allTags = recordTagInteractor.getAll().filterArchived()
+
+        if (allTags.isEmpty()) {
+            return mapEmpty(
+                showAddButton = showAddButton,
+                isDarkTheme = isDarkTheme,
+            )
+        }
+
         val recordTags = getSelectableTagsInteractor.execute(*typeIds.toLongArray()).filterArchived()
         val recordTagIds = recordTags.map { it.id }
         val tagsFromOtherActivities = allTags.filter { it.id !in recordTagIds }
         val hasMoreTags = tagsFromOtherActivities.isNotEmpty()
         val types = recordTypeInteractor.getAll().associateBy { it.id }
 
-        return if (allTags.isNotEmpty()) {
-            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 selectedTagIds }
-            } else {
-                emptyList()
-            }
+        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 selectedTagIds }
+        } else {
+            emptyList()
+        }
 
-            val viewData = mutableListOf<ViewHolderType>()
-            val buttonsViewData = mutableListOf<ViewHolderType>()
+        // Hint
+        val hintViewData = if (showHint) {
+            listOf(categoryViewDataMapper.mapToRecordTagHint())
+        } else {
+            emptyList()
+        }
 
-            if (showAddButton) {
-                viewData += listOf(
-                    categoryViewDataMapper.mapToRecordTagHint(),
-                    DividerViewData("divider_hint".hashCode().toLong()),
-                )
-            }
+        // Selected
+        val selectedViewData = mutableListOf<ViewHolderType>()
+        if (multipleChoiceAvailable) {
+            selectedViewData += commonViewDataMapper.mapSelectedHint(
+                isEmpty = selected.isEmpty(),
+            )
+        } else if (selected.isNotEmpty()) {
+            selectedViewData += InfoViewData(
+                text = resourceRepo.getString(R.string.something_preselected),
+            )
+        }
+        selectedViewData += selected.map {
+            categoryViewDataMapper.mapRecordTagWithValue(
+                tag = it,
+                tagData = selectedTagsMap[it.id],
+                types = types,
+                isDarkTheme = isDarkTheme,
+            )
+        }
 
-            if (multipleChoiceAvailable) {
-                viewData += commonViewDataMapper.mapSelectedHint(
-                    isEmpty = selected.isEmpty(),
-                )
-            } else if (selected.isNotEmpty()) {
-                viewData += InfoViewData(
-                    text = resourceRepo.getString(R.string.something_preselected),
-                )
+        // Available
+        val availableViewData = mutableListOf<ViewHolderType>()
+        categoryViewDataMapper.groupToTagGroups(available).forEach { (groupName, tags) ->
+            if (groupName.isNotEmpty()) {
+                availableViewData += InfoViewData(text = groupName)
             }
 
-            viewData += selected.map {
-                categoryViewDataMapper.mapRecordTagWithValue(
+            availableViewData += tags.map {
+                categoryViewDataMapper.mapRecordTag(
                     tag = it,
-                    tagData = selectedTagsMap[it.id],
                     types = types,
                     isDarkTheme = isDarkTheme,
                 )
             }
+        }
 
-            if (
-                (multipleChoiceAvailable && available.isNotEmpty()) ||
-                (!multipleChoiceAvailable && selected.isNotEmpty() && available.isNotEmpty())
-            ) {
-                viewData += DividerViewData("divider_available".hashCode().toLong())
-            }
-
-            categoryViewDataMapper.groupToTagGroups(available).forEach { (groupName, tags) ->
-                if (groupName.isNotEmpty()) {
-                    viewData += InfoViewData(text = groupName)
-                }
-
-                viewData += tags.map {
-                    categoryViewDataMapper.mapRecordTag(
-                        tag = it,
-                        types = types,
-                        isDarkTheme = isDarkTheme,
-                    )
-                }
-            }
-
-            if (availableFromOtherActivities.isNotEmpty()) {
-                viewData += DividerViewData("divider_from_other".hashCode().toLong())
-
-                viewData += HintViewData(
-                    text = resourceRepo.getString(R.string.change_record_tag_from_other_activity),
-                )
-
-                viewData += availableFromOtherActivities.map {
-                    categoryViewDataMapper.mapRecordTag(
-                        tag = it,
-                        types = types,
-                        isDarkTheme = isDarkTheme,
-                    )
-                }
-            }
-
-            if (showUntaggedButton) {
-                buttonsViewData += categoryViewDataMapper.mapToUntaggedItem(
-                    isDarkTheme = isDarkTheme,
-                    isFiltered = false,
-                )
-            }
+        // From other
+        val availableFromOtherViewData = mutableListOf<ViewHolderType>()
+        if (availableFromOtherActivities.isNotEmpty()) {
+            availableFromOtherViewData += HintViewData(
+                text = resourceRepo.getString(R.string.change_record_tag_from_other_activity),
+            )
 
-            if (showAllTagsButton && !showAllTags && hasMoreTags) {
-                buttonsViewData += categoryViewDataMapper.mapToRecordTagShowAllItem(
+            availableFromOtherViewData += availableFromOtherActivities.map {
+                categoryViewDataMapper.mapRecordTag(
+                    tag = it,
+                    types = types,
                     isDarkTheme = isDarkTheme,
                 )
             }
+        }
 
-            if (showAddButton) {
-                buttonsViewData += categoryViewDataMapper.mapToRecordTagAddItem(isDarkTheme)
-            }
+        // Buttons
+        val buttonsViewData = mutableListOf<ViewHolderType>()
+        if (showUntaggedButton) {
+            buttonsViewData += categoryViewDataMapper.mapToUntaggedItem(
+                isDarkTheme = isDarkTheme,
+                isFiltered = false,
+            )
+        }
+        if (showAllTagsButton && !showAllTags && hasMoreTags) {
+            buttonsViewData += categoryViewDataMapper.mapToRecordTagShowAllItem(
+                isDarkTheme = isDarkTheme,
+            )
+        }
+        if (showAddButton) {
+            buttonsViewData += categoryViewDataMapper.mapToRecordTagAddItem(isDarkTheme)
+        }
 
-            if (buttonsViewData.isNotEmpty()) {
-                if (multipleChoiceAvailable ||
-                    selected.isNotEmpty() ||
-                    availableFromOtherActivities.isNotEmpty()
-                ) {
-                    viewData += DividerViewData("divider_buttons".hashCode().toLong())
+        // All
+        val viewData = listOf(
+            hintViewData to true,
+            selectedViewData to true,
+            availableViewData to true,
+            availableFromOtherViewData to true,
+            buttonsViewData to (multipleChoiceAvailable || availableFromOtherViewData.isNotEmpty()),
+        ).filter {
+            it.first.isNotEmpty()
+        }.addBetweenEach(
+            map = { it.first },
+            spacingProducer = { index, _, second ->
+                if (second?.second == true) {
+                    listOf(DividerViewData("divider_$index".hashCode().toLong()))
+                } else {
+                    null
                 }
-                viewData += buttonsViewData
-            }
+            },
+        ).flatten()
 
-            Result(
-                selectedCount = selected.size,
-                data = viewData,
-            )
+        return Result(
+            selectedCount = selected.size,
+            data = viewData,
+        )
+    }
+
+    private suspend fun mapEmpty(
+        showAddButton: Boolean,
+        isDarkTheme: Boolean,
+    ): Result {
+        val viewData = mutableListOf<ViewHolderType>()
+        viewData += if (showAddButton && recordTagInteractor.isEmpty()) {
+            categoryViewDataMapper.mapToTagsFirstHint()
         } else {
-            val viewData = mutableListOf<ViewHolderType>()
-            viewData += if (showAddButton && recordTagInteractor.isEmpty()) {
-                categoryViewDataMapper.mapToTagsFirstHint()
-            } else {
-                categoryViewDataMapper.mapToRecordTagsEmpty()
-            }
-            if (showAddButton) {
-                viewData += categoryViewDataMapper.mapToRecordTagAddItem(isDarkTheme)
-            }
-            Result(
-                selectedCount = 0,
-                data = viewData,
-            )
+            categoryViewDataMapper.mapToRecordTagsEmpty()
+        }
+        if (showAddButton) {
+            viewData += categoryViewDataMapper.mapToRecordTagAddItem(isDarkTheme)
         }
+        return Result(
+            selectedCount = 0,
+            data = viewData,
+        )
     }
 
     data class Result(
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/extension/CollectionExtensions.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/extension/CollectionExtensions.kt
@@ -56,13 +56,20 @@ inline fun <T> List<T>.replaceWith(new: T, crossinline filter: (T) -> Boolean):
 }
 
 fun <T> List<T>.addBetweenEach(
-    spacingProducer: (index: Int) -> T,
+    spacingProducer: (index: Int) -> T?,
 ): List<T> {
-    val result = mutableListOf<T>()
+    return this.addBetweenEach(map = { it }, spacingProducer = { index, _, _ -> spacingProducer(index) })
+}
+
+fun <IN, OUT> List<IN>.addBetweenEach(
+    map: (IN) -> OUT,
+    spacingProducer: (index: Int, currentItem: IN, nextItem: IN?) -> OUT?,
+): List<OUT> {
+    val result = mutableListOf<OUT>()
     this.forEachIndexed { index, item ->
-        result += item
+        result += map(item)
         if (index != this.lastIndex) {
-            result += spacingProducer(index)
+            result += spacingProducer(index, item, this.getOrNull(index + 1))
         }
     }
     return result
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
@@ -919,6 +919,7 @@ abstract class ChangeRecordBaseViewModel(
             showAllTags = showAllTags,
             multipleChoiceAvailable = true,
             showAddButton = true,
+            showHint = true,
             showArchived = false,
             showUntaggedButton = true,
             showAllTagsButton = true,
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTagSelectionViewModel.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTagSelectionViewModel.kt
@@ -101,6 +101,7 @@ class DataEditTagSelectionViewModel @Inject constructor(
             showAllTags = false,
             multipleChoiceAvailable = true,
             showAddButton = false,
+            showHint = false,
             showArchived = true,
             showUntaggedButton = false,
             showAllTagsButton = false,
diff --git a/features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/interactor/RecordTagSelectionViewDataInteractor.kt b/features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/interactor/RecordTagSelectionViewDataInteractor.kt
@@ -77,6 +77,7 @@ class RecordTagSelectionViewDataInteractor @Inject constructor(
                 showAllTags = showAllTags,
                 multipleChoiceAvailable = multipleChoiceAvailable,
                 showAddButton = false,
+                showHint = false,
                 showArchived = false,
                 showUntaggedButton = true,
                 showAllTagsButton = true,
diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt
@@ -55,6 +55,7 @@ class StatisticsView @JvmOverloads constructor(
     var itemDuration: String = ""
         set(value) {
             binding.tvStatisticsItemDuration.text = value
+            binding.tvStatisticsItemDuration.isVisible = value.isNotEmpty()
             field = value
         }
 
diff --git a/features/feature_views/src/main/res/layout/statistics_view_layout.xml b/features/feature_views/src/main/res/layout/statistics_view_layout.xml
@@ -33,7 +33,7 @@
             android:id="@+id/tvStatisticsItemName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="8dp"
             android:textColor="?appLightTextColor"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ class StatisticsView @JvmOverloads constructor(`
`55`	`55`	`var itemDuration: String = ""`
`56`	`56`	`set(value) {`
`57`	`57`	`binding.tvStatisticsItemDuration.text = value`
	`58`	`+ binding.tvStatisticsItemDuration.isVisible = value.isNotEmpty()`
`58`	`59`	`field = value`
`59`	`60`	`}`
`60`	`61`