WIP add filter change on stat detail swipe

Razeeman · Razeeman · commit 8002ef38c86a · 2025-06-15T12:26:42.000+03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -117,6 +117,7 @@ dependencies {
     implementation(project(":feature_tag_selection"))
     implementation(project(":feature_data_edit"))
     implementation(project(":feature_records_filter"))
+    implementation(project(":feature_records_filter:api"))
     implementation(project(":feature_goals"))
     implementation(project(":feature_pomodoro"))
     implementation(project(":feature_complex_rules"))
diff --git a/features/feature_records_filter/api/.gitignore b/features/feature_records_filter/api/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/features/feature_records_filter/api/build.gradle.kts b/features/feature_records_filter/api/build.gradle.kts
@@ -0,0 +1,18 @@
+import com.example.util.simpletimetracker.Base
+import com.example.util.simpletimetracker.applyAndroidLibrary
+
+plugins {
+    alias(libs.plugins.gradleLibrary)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.ksp)
+}
+
+applyAndroidLibrary()
+
+android {
+    namespace = "${Base.namespace}.feature_records_filter.api"
+}
+
+dependencies {
+    implementation(project(":core"))
+}
diff --git a/features/feature_records_filter/api/src/main/AndroidManifest.xml b/features/feature_records_filter/api/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:theme="@style/AppTheme" />
+
+</manifest>
diff --git a/features/feature_records_filter/api/src/main/java/com/example/util/simpletimetracker/feature_records_filter/api/RecordsFilterExcludeInteractor.kt b/features/feature_records_filter/api/src/main/java/com/example/util/simpletimetracker/feature_records_filter/api/RecordsFilterExcludeInteractor.kt
@@ -0,0 +1,18 @@
+package com.example.util.simpletimetracker.feature_records_filter.api
+
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+
+interface RecordsFilterExcludeInteractor {
+
+    fun exclude(
+        id: Long,
+        type: ExcludeType,
+        currentFilters: List<RecordsFilter>,
+    ): List<RecordsFilter>
+
+    sealed interface ExcludeType {
+        data object Activity: ExcludeType
+        data object Category: ExcludeType
+        data object Tag: ExcludeType
+    }
+}
diff --git a/features/feature_records_filter/build.gradle.kts b/features/feature_records_filter/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
 dependencies {
     implementation(project(":core"))
+    implementation(project(":feature_records_filter:api"))
     implementation(libs.google.dagger)
     ksp(libs.kapt.dagger)
 }
diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/di/RecordsFilterModule.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/di/RecordsFilterModule.kt
@@ -0,0 +1,16 @@
+package com.example.util.simpletimetracker.feature_records_filter.di
+
+import com.example.util.simpletimetracker.feature_records_filter.api.RecordsFilterExcludeInteractor
+import com.example.util.simpletimetracker.feature_records_filter.interactor.RecordsFilterExcludeInteractorImpl
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface RecordsFilterModule {
+
+    @Binds
+    fun bindRecordsFilterExcludeInteractor(impl: RecordsFilterExcludeInteractorImpl): RecordsFilterExcludeInteractor
+}
diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterExcludeInteractorImpl.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterExcludeInteractorImpl.kt
@@ -0,0 +1,38 @@
+package com.example.util.simpletimetracker.feature_records_filter.interactor
+
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.feature_records_filter.api.RecordsFilterExcludeInteractor
+import com.example.util.simpletimetracker.feature_records_filter.api.RecordsFilterExcludeInteractor.ExcludeType
+import com.example.util.simpletimetracker.feature_records_filter.model.RecordFilterType
+import javax.inject.Inject
+
+class RecordsFilterExcludeInteractorImpl @Inject constructor(
+    private val recordsFilterUpdateInteractor: RecordsFilterUpdateInteractor,
+) : RecordsFilterExcludeInteractor {
+
+    override fun exclude(
+        id: Long,
+        type: ExcludeType,
+        currentFilters: List<RecordsFilter>,
+    ): List<RecordsFilter> {
+        // TODO change filter
+        // TODO check tag consistency
+        // TODO multitask?
+        // TODO untracked?
+        return when (type) {
+            is ExcludeType.Activity -> {
+                currentFilters
+            }
+            is ExcludeType.Category -> {
+                currentFilters
+            }
+            is ExcludeType.Tag -> {
+                recordsFilterUpdateInteractor.handleTagClick(
+                    currentState = RecordFilterType.FilteredTags,
+                    currentFilters = currentFilters,
+                    itemId = id,
+                )
+            }
+        }
+    }
+}
diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterUpdateInteractor.kt
@@ -26,7 +26,6 @@ import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTypeToTag
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
-import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData
 import com.example.util.simpletimetracker.feature_base_adapter.record.RecordViewData
 import com.example.util.simpletimetracker.feature_base_adapter.recordFilter.FilterViewData
 import com.example.util.simpletimetracker.feature_records_filter.mapper.RecordsFilterViewDataMapper
@@ -115,7 +114,7 @@ class RecordsFilterUpdateInteractor @Inject constructor(
     fun handleTagClick(
         currentState: RecordFilterType,
         currentFilters: List<RecordsFilter>,
-        item: CategoryViewData.Record,
+        itemId: Long,
     ): List<RecordsFilter> {
         val filters = currentFilters.toMutableList()
         val currentTags = when (currentState) {
@@ -124,9 +123,9 @@ class RecordsFilterUpdateInteractor @Inject constructor(
             else -> return currentFilters
         }
 
-        val newTags = when (item) {
-            is CategoryViewData.Record.Tagged -> RecordsFilter.TagItem.Tagged(item.id)
-            is CategoryViewData.Record.Untagged -> RecordsFilter.TagItem.Untagged
+        val newTags = when (itemId) {
+            UNCATEGORIZED_ITEM_ID -> RecordsFilter.TagItem.Untagged
+            else -> RecordsFilter.TagItem.Tagged(itemId)
         }.let { currentTags.toMutableList().apply { addOrRemove(it) } }
 
         return handleSelectTags(currentState, filters, newTags)
diff --git a/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt b/features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/viewModel/RecordsFilterViewModel.kt
@@ -417,7 +417,7 @@ class RecordsFilterViewModel @Inject constructor(
         filters = recordsFilterUpdateInteractor.handleTagClick(
             currentState = filterSelectionState.type ?: return,
             currentFilters = filters,
-            item = item,
+            itemId = item.id,
         )
     }
 
diff --git a/features/feature_statistics_detail/build.gradle.kts b/features/feature_statistics_detail/build.gradle.kts
@@ -17,6 +17,7 @@ android {
 
 dependencies {
     implementation(project(":core"))
+    implementation(project(":feature_records_filter:api"))
     implementation(libs.google.dagger)
     ksp(libs.kapt.dagger)
 }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt
@@ -238,7 +238,9 @@ class StatisticsDetailFragment :
                     .orFalse()
             },
             onSwiped = { viewHolder ->
-                viewModel.onSwiped(viewHolder as? ViewHolderType)
+                viewHolder?.adapterPosition
+                    ?.let { contentAdapter.getItemByPosition(it) }
+                    ?.let(viewModel::onSwiped)
             },
         )
     }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt
@@ -111,6 +111,7 @@ class StatisticsDetailViewModel @Inject constructor(
         if (this::extra.isInitialized) return
         this.extra = extra
         rangeDelegate.initialize(extra)
+        filterDelegate.initialize(extra)
     }
 
     fun onVisible() {
@@ -360,7 +361,7 @@ class StatisticsDetailViewModel @Inject constructor(
                 return rangeDelegate.getDateFilter()
             }
 
-            override suspend fun onTypesFilterDismissed() {
+            override suspend fun onFiltersChanged() {
                 streaksDelegate.onTypesFilterDismissed()
                 previewDelegate.updateViewData()
                 streaksDelegate.updateStreaksGoalViewData()
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailFilterViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailFilterViewModelDelegate.kt
@@ -8,12 +8,14 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.feature_records_filter.api.RecordsFilterExcludeInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.R
 import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParam
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterResultParams
+import com.example.util.simpletimetracker.navigation.params.screen.StatisticsDetailParams
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -24,12 +26,13 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
     private val resourceRepo: ResourceRepo,
     private val recordFilterInteractor: RecordFilterInteractor,
     private val prefsInteractor: PrefsInteractor,
+    private val recordsFilterExcludeInteractor: RecordsFilterExcludeInteractor,
 ) : StatisticsDetailViewModelDelegate, ViewModelDelegate() {
 
     private var parent: StatisticsDetailViewModelDelegate.Parent? = null
 
-    private val filter: MutableList<RecordsFilter> by lazy { loadFilter().toMutableList() }
-    private val comparisonFilter: MutableList<RecordsFilter> = mutableListOf()
+    private var filter: List<RecordsFilter> = emptyList()
+    private var comparisonFilter: List<RecordsFilter> = mutableListOf()
     private var records: List<RecordBase> = emptyList() // all records with selected ids
     private var compareRecords: List<RecordBase> = emptyList() // all records with selected ids
     private var loadJob: Job? = null
@@ -39,6 +42,10 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
         this.parent = parent
     }
 
+    fun initialize(extra: StatisticsDetailParams) {
+        filter = loadFilter(extra).toMutableList()
+    }
+
     fun onVisible() {
         loadJob?.cancel()
         loadJob = delegateScope.launch {
@@ -69,14 +76,8 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
         val finalFilters = result.filters.filter { it !is RecordsFilter.Date }
 
         when (result.tag) {
-            FILTER_TAG -> {
-                filter.clear()
-                filter.addAll(finalFilters)
-            }
-            COMPARE_TAG -> {
-                comparisonFilter.clear()
-                comparisonFilter.addAll(finalFilters)
-            }
+            FILTER_TAG -> filter = finalFilters
+            COMPARE_TAG -> comparisonFilter = finalFilters
         }
 
         // Update is on dismiss.
@@ -88,10 +89,16 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
     }
 
     fun onStatisticsHidden(id: Long, mode: DataDistributionMode) {
-        // TODO change filter
-        // TODO check tag consistency
-        // TODO multitask?
-        // TODO untracked?
+        val type = when (mode) {
+            DataDistributionMode.ACTIVITY -> RecordsFilterExcludeInteractor.ExcludeType.Activity
+            DataDistributionMode.CATEGORY -> RecordsFilterExcludeInteractor.ExcludeType.Category
+            DataDistributionMode.TAG -> RecordsFilterExcludeInteractor.ExcludeType.Tag
+        }
+        filter = recordsFilterExcludeInteractor.exclude(
+            id = id,
+            type = type,
+            currentFilters = filter,
+        )
         onFiltersChanged()
     }
 
@@ -115,7 +122,7 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
         loadJob?.cancel()
         loadJob = delegateScope.launch {
             loadRecordsCache()
-            parent?.onTypesFilterDismissed()
+            parent?.onFiltersChanged()
         }
     }
 
@@ -163,10 +170,8 @@ class StatisticsDetailFilterViewModelDelegate @Inject constructor(
         compareRecords = recordFilterInteractor.getByFilter(comparisonFilter)
     }
 
-    private fun loadFilter(): List<RecordsFilter> {
-        val parent = parent ?: return emptyList()
-
-        return parent.extra.filter.map(RecordsFilterParam::toModel)
+    private fun loadFilter(extra: StatisticsDetailParams): List<RecordsFilter> {
+        return extra.filter.map(RecordsFilterParam::toModel)
     }
 
     companion object {
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailViewModelDelegate.kt
@@ -23,7 +23,7 @@ interface StatisticsDetailViewModelDelegate {
         fun onRangeChanged()
         fun updateViewData()
         fun getDateFilter(): List<RecordsFilter>
-        suspend fun onTypesFilterDismissed()
+        suspend fun onFiltersChanged()
         fun onStatisticsHidden(id: Long, mode: DataDistributionMode)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ android {`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`implementation(project(":core"))`
	`19`	`+ implementation(project(":feature_records_filter:api"))`
`19`	`20`	`implementation(libs.google.dagger)`
`20`	`21`	`ksp(libs.kapt.dagger)`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ class RecordsFilterViewModel @Inject constructor(`
`417`	`417`	`filters = recordsFilterUpdateInteractor.handleTagClick(`
`418`	`418`	`currentState = filterSelectionState.type ?: return,`
`419`	`419`	`currentFilters = filters,`
`420`		`- item = item,`
	`420`	`+ itemId = item.id,`
`421`	`421`	`)`
`422`	`422`	`}`
`423`	`423`