refactor record filters

Author: Razeeman

core/src/main/res/drawable/hide.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>

features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt

@@ -50,6 +50,8 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         currentFilters: List<RecordsFilter>,
         recordTypes: List<RecordType>,
         recordTypeCategories: List<RecordTypeCategory>,
+        recordTags: List<RecordTag>,
+        typesToTags: List<RecordTypeToTag>,
     ): List<RecordsFilter> {
         val filters = currentFilters.toMutableList()
         val currentIds = filters.getTypeIds().toMutableList()
@@ -65,12 +67,27 @@ class RecordsFilterUpdateInteractor @Inject constructor(
 
         val newIds = currentIds.toMutableList().apply { addOrRemove(id) }
 
-        return handleSelectTypes(filters, newIds)
+        return handleSelectTypes(
+            currentFilters = filters,
+            newIds = newIds,
+        ).let {
+            checkTagFilterConsistency(
+                currentFilters = it,
+                recordTypes = recordTypes,
+                recordTypeCategories = recordTypeCategories,
+                recordTags = recordTags,
+                typesToTags = typesToTags,
+            )
+        }
     }
 
     fun handleCategoryClick(
         id: Long,
         currentFilters: List<RecordsFilter>,
+        recordTypes: List<RecordType>,
+        recordTypeCategories: List<RecordTypeCategory>,
+        recordTags: List<RecordTag>,
+        typesToTags: List<RecordTypeToTag>,
     ): List<RecordsFilter> {
         val filters = currentFilters.toMutableList()
         val currentItems = filters.getCategoryItems()
@@ -81,7 +98,18 @@ class RecordsFilterUpdateInteractor @Inject constructor(
             RecordsFilter.CategoryItem.Categorized(id)
         }.let { currentItems.toMutableList().apply { addOrRemove(it) } }
 
-        return handleSelectCategories(filters, newItems)
+        return handleSelectCategories(
+            currentFilters = filters,
+            newItems = newItems,
+        ).let {
+            checkTagFilterConsistency(
+                currentFilters = it,
+                recordTypes = recordTypes,
+                recordTypeCategories = recordTypeCategories,
+                recordTags = recordTags,
+                typesToTags = typesToTags,
+            )
+        }
     }
 
     fun handleTagClick(
@@ -372,6 +400,9 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         currentFilters: List<RecordsFilter>,
         subtype: RecordsFilterSelectionButtonType.Subtype,
         recordTypes: List<RecordType>,
+        recordTypeCategories: List<RecordTypeCategory>,
+        recordTags: List<RecordTag>,
+        typesToTags: List<RecordTypeToTag>,
     ): List<RecordsFilter> {
         val newIds = when (subtype) {
             is RecordsFilterSelectionButtonType.Subtype.SelectAll -> recordTypes.map { it.id }
@@ -380,13 +411,25 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         return handleSelectTypes(
             currentFilters = currentFilters,
             newIds = newIds,
-        )
+        ).let {
+            checkTagFilterConsistency(
+                currentFilters = it,
+                recordTypes = recordTypes,
+                recordTypeCategories = recordTypeCategories,
+                recordTags = recordTags,
+                typesToTags = typesToTags,
+            )
+        }
     }
 
     fun onCategoriesSelectionButtonClick(
         currentFilters: List<RecordsFilter>,
         subtype: RecordsFilterSelectionButtonType.Subtype,
         categories: List<Category>,
+        recordTypes: List<RecordType>,
+        recordTypeCategories: List<RecordTypeCategory>,
+        recordTags: List<RecordTag>,
+        typesToTags: List<RecordTypeToTag>,
     ): List<RecordsFilter> {
         val newItems = when (subtype) {
             is RecordsFilterSelectionButtonType.Subtype.SelectAll -> {
@@ -401,7 +444,15 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         return handleSelectCategories(
             currentFilters = currentFilters,
             newItems = newItems,
-        )
+        ).let {
+            checkTagFilterConsistency(
+                currentFilters = it,
+                recordTypes = recordTypes,
+                recordTypeCategories = recordTypeCategories,
+                recordTags = recordTags,
+                typesToTags = typesToTags,
+            )
+        }
     }
 
     fun onTagsSelectionButtonClick(
@@ -427,7 +478,7 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         )
     }
 
-    fun checkTagFilterConsistency(
+    private fun checkTagFilterConsistency(
         currentFilters: List<RecordsFilter>,
         recordTypes: List<RecordType>,
         recordTypeCategories: List<RecordTypeCategory>,
@@ -440,20 +491,18 @@ class RecordsFilterUpdateInteractor @Inject constructor(
             recordTypes = recordTypes,
             recordTypeCategories = recordTypeCategories,
         )
+        val tagIds = recordTags.map(RecordTag::id)
+        val selectableTagIds = filterSelectableTagsInteractor.execute(
+            tagIds = tagIds,
+            typesToTags = typesToTags,
+            typeIds = newTypeIds,
+        )
 
         fun update(tags: List<RecordsFilter.TagItem>): List<RecordsFilter.TagItem> {
             return tags.filter {
                 when (it) {
                     is RecordsFilter.TagItem.Tagged -> {
-                        it.tagId in recordTags
-                            .map { tag -> tag.id }
-                            .let { tags ->
-                                filterSelectableTagsInteractor.execute(
-                                    tagIds = tags,
-                                    typesToTags = typesToTags,
-                                    typeIds = newTypeIds,
-                                )
-                            }
+                        it.tagId in selectableTagIds
                     }
                     is RecordsFilter.TagItem.Untagged -> {
                         true
@@ -463,12 +512,10 @@ class RecordsFilterUpdateInteractor @Inject constructor(
         }
 
         val newSelectedTags = update(filters.getSelectedTags())
-
         filters.removeAll { filter -> filter is RecordsFilter.SelectedTags }
         if (newSelectedTags.isNotEmpty()) filters.add(RecordsFilter.SelectedTags(newSelectedTags))
 
         val newFilteredTags = update(filters.getFilteredTags())
-
         filters.removeAll { filter -> filter is RecordsFilter.FilteredTags }
         if (newFilteredTags.isNotEmpty()) filters.add(RecordsFilter.FilteredTags(newFilteredTags))
 

features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt

@@ -209,17 +209,22 @@ class RecordsFilterViewModel @Inject constructor(
                     currentFilters = filters,
                     subtype = subtype,
                     recordTypes = getTypesCache(),
+                    recordTypeCategories = getRecordTypeCategoriesCache(),
+                    recordTags = getTagsCache(),
+                    typesToTags = getRecordTypeToTagCache(),
                 )
-                checkTagFilterConsistency()
             }
             is RecordsFilterSelectionButtonType.Type.Categories -> {
                 filterSelectionState = RecordsFilterSelectionState.Visible(RecordFilterType.Category)
                 filters = recordsFilterUpdateInteractor.onCategoriesSelectionButtonClick(
                     currentFilters = filters,
                     subtype = subtype,
                     categories = getCategoriesCache(),
+                    recordTypes = getTypesCache(),
+                    recordTypeCategories = getRecordTypeCategoriesCache(),
+                    recordTags = getTagsCache(),
+                    typesToTags = getRecordTypeToTagCache(),
                 )
-                checkTagFilterConsistency()
             }
             is RecordsFilterSelectionButtonType.Type.Tags -> {
                 filters = recordsFilterUpdateInteractor.onTagsSelectionButtonClick(
@@ -348,17 +353,21 @@ class RecordsFilterViewModel @Inject constructor(
             currentFilters = filters,
             recordTypes = getTypesCache(),
             recordTypeCategories = getRecordTypeCategoriesCache(),
+            recordTags = getTagsCache(),
+            typesToTags = getRecordTypeToTagCache(),
         )
-        checkTagFilterConsistency()
     }
 
     private suspend fun handleCategoryClick(id: Long) {
         filterSelectionState = RecordsFilterSelectionState.Visible(RecordFilterType.Category)
         filters = recordsFilterUpdateInteractor.handleCategoryClick(
             id = id,
             currentFilters = filters,
+            recordTypes = getTypesCache(),
+            recordTypeCategories = getRecordTypeCategoriesCache(),
+            recordTags = getTagsCache(),
+            typesToTags = getRecordTypeToTagCache(),
         )
-        checkTagFilterConsistency()
     }
 
     private fun handleUntrackedClick() {
@@ -420,16 +429,6 @@ class RecordsFilterViewModel @Inject constructor(
         checkManualFilterVisibility()
     }
 
-    private suspend fun checkTagFilterConsistency() {
-        filters = recordsFilterUpdateInteractor.checkTagFilterConsistency(
-            currentFilters = filters,
-            recordTypes = getTypesCache(),
-            recordTypeCategories = getRecordTypeCategoriesCache(),
-            recordTags = getTagsCache(),
-            typesToTags = getRecordTypeToTagCache(),
-        )
-    }
-
     private fun removeFilter(type: RecordFilterType) {
         filters = recordsFilterUpdateInteractor.removeFilter(
             currentFilters = filters,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt

@@ -226,7 +226,7 @@ class StatisticsDetailFragment :
 
         val context = rvStatisticsDetailContent.context
         rvStatisticsDetailContent.onItemSwiped(
-            iconRes = R.drawable.delete, // TODO
+            iconRes = R.drawable.hide,
             iconColor = context.getThemedAttr(R.attr.appContrastColor),
             backgroundColor = ColorUtils.changeAlpha(
                 context.getThemedAttr(R.attr.appContrastColor), 0.10f,