improve untagged and uncategorized buttons

Author: Razeeman

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt

@@ -876,7 +876,7 @@ abstract class ChangeRecordBaseViewModel(
             showAddButton = true,
             showHint = true,
             showArchived = false,
-            showUntaggedButton = true,
+            showUntaggedButton = newTags.isNotEmpty(),
             showAllTagsButton = true,
         ).let {
             ChangeRecordTagsViewData(

features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/interactor/ChangeRecordTypeViewDataInteractor.kt

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.feature_change_record_type.interactor
 import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper
 import com.example.util.simpletimetracker.core.mapper.CommonViewDataMapper
 import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor
+import com.example.util.simpletimetracker.domain.extension.addBetweenEach
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.divider.DividerViewData
@@ -25,35 +26,49 @@ class ChangeRecordTypeViewDataInteractor @Inject constructor(
         return if (categories.isNotEmpty()) {
             val selected = categories.filter { it.id in selectedCategories }
             val available = categories.filter { it.id !in selectedCategories }
-            val viewData = mutableListOf<ViewHolderType>()
 
-            categoryViewDataMapper.mapToCategoryHint().let(viewData::add)
+            // Main hint
+            val hintData = listOf(categoryViewDataMapper.mapToCategoryHint())
 
-            DividerViewData("divider_hint".hashCode().toLong())
-                .let(viewData::add)
-
-            commonViewDataMapper.mapSelectedHint(
-                isEmpty = selected.isEmpty(),
-            ).let(viewData::add)
-
-            selected.map {
+            // Selected
+            val selectedData = mutableListOf<ViewHolderType>()
+            selectedData += commonViewDataMapper.mapSelectedHint(isEmpty = selected.isEmpty())
+            selectedData += selected.map {
                 categoryViewDataMapper.mapCategory(
                     category = it,
                     isDarkTheme = isDarkTheme,
                 )
-            }.let(viewData::addAll)
-
-            DividerViewData("divider_available".hashCode().toLong())
-                .let(viewData::add)
+            }
 
-            available.map {
+            // Available
+            val availableData = available.map {
                 categoryViewDataMapper.mapCategory(
                     category = it,
                     isDarkTheme = isDarkTheme,
                 )
-            }.let(viewData::addAll)
+            }
+
+            // Buttons
+            val buttonsViewData = mutableListOf<ViewHolderType>()
+            if (selected.isNotEmpty()) {
+                buttonsViewData += categoryViewDataMapper.mapToUncategorizedItem(
+                    isFiltered = false,
+                    isDarkTheme = isDarkTheme,
+                )
+            }
+            buttonsViewData += categoryViewDataMapper.mapToTypeTagAddItem(isDarkTheme)
 
-            categoryViewDataMapper.mapToTypeTagAddItem(isDarkTheme).let(viewData::add)
+            // All
+            val viewData = listOf(
+                hintData,
+                selectedData,
+                availableData,
+                buttonsViewData,
+            ).filter {
+                it.isNotEmpty()
+            }.addBetweenEach { index ->
+                listOf(DividerViewData(index.toLong()))
+            }.flatten()
 
             ChangeRecordTypeCategoriesViewData(
                 selectedCount = selected.size,

features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt

@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.core.view.ViewChooserStateDelegate
+import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID
 import com.example.util.simpletimetracker.domain.category.interactor.RecordTypeCategoryInteractor
 import com.example.util.simpletimetracker.domain.color.model.AppColor
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
@@ -178,12 +179,17 @@ class ChangeRecordTypeViewModel @Inject constructor(
 
     fun onCategoryClick(item: CategoryViewData) {
         viewModelScope.launch {
-            newCategories.addOrRemove(item.id)
+            if (item.id == UNCATEGORIZED_ITEM_ID) {
+                newCategories.clear()
+            } else {
+                newCategories.addOrRemove(item.id)
+            }
             updateCategoriesViewData()
         }
     }
 
     fun onCategoryLongClick(item: CategoryViewData, sharedElements: Pair<Any, String>) {
+        if (item.id == UNCATEGORIZED_ITEM_ID) return
         router.navigate(
             data = ChangeCategoryFromChangeActivityParams(
                 ChangeTagData.Change(

features/feature_change_shortcut/src/main/java/com/example/util/simpletimetracker/feature_change_shortcut/viewModel/ChangeShortcutViewModel.kt

@@ -387,7 +387,7 @@ class ChangeShortcutViewModel @Inject constructor(
             showAddButton = false,
             showHint = true,
             showArchived = false,
-            showUntaggedButton = true,
+            showUntaggedButton = recordTags.isNotEmpty(),
             showAllTagsButton = false,
         )
         tags.set(data.data)