change stat detail total preview

Razeeman · Razeeman · commit 5a0b0c5b9b3e · 2025-12-20T15:54:55.000+03:00
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetTotalStatisticsFilterInteractor.kt b/core/src/main/java/com/example/util/simpletimetracker/core/interactor/GetTotalStatisticsFilterInteractor.kt
@@ -0,0 +1,47 @@
+package com.example.util.simpletimetracker.core.interactor
+
+import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor
+import com.example.util.simpletimetracker.domain.category.model.Category
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
+import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
+import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
+import com.example.util.simpletimetracker.domain.recordType.model.RecordType
+import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
+import javax.inject.Inject
+import kotlin.collections.plus
+
+class GetTotalStatisticsFilterInteractor @Inject constructor(
+    private val recordTypeInteractor: RecordTypeInteractor,
+    private val categoryInteractor: CategoryInteractor,
+    private val recordTagInteractor: RecordTagInteractor,
+) {
+
+    suspend fun execute(
+        filterType: ChartFilterType
+    ): RecordsFilter {
+        return when (filterType) {
+            ChartFilterType.ACTIVITY -> {
+                val typeIds = recordTypeInteractor.getAll()
+                    .map(RecordType::id)
+                RecordsFilter.Activity(selected = typeIds, filtered = emptyList())
+            }
+            ChartFilterType.CATEGORY -> {
+                val categoryIds = categoryInteractor.getAll()
+                    .map(Category::id)
+                val items = categoryIds
+                    .map(RecordsFilter.CategoryItem::Categorized) +
+                    RecordsFilter.CategoryItem.Uncategorized
+                RecordsFilter.Category(selected = items, filtered = emptyList())
+            }
+            ChartFilterType.RECORD_TAG -> {
+                val tagIds = recordTagInteractor.getAll()
+                    .map(RecordTag::id)
+                val items = tagIds
+                    .map(RecordsFilter.TagItem::Tagged) +
+                    RecordsFilter.TagItem.Untagged
+                RecordsFilter.Tags(selected = items, filtered = emptyList())
+            }
+        }
+    }
+}
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/base/DomainConsts.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/base/DomainConsts.kt
@@ -1,7 +1,9 @@
 package com.example.util.simpletimetracker.domain.base
 
+// TODO change to sealed class?
 const val UNTRACKED_ITEM_ID = -1L
 const val UNCATEGORIZED_ITEM_ID = -2L
 const val MULTITASK_ITEM_ID = -3L
 const val REPEAT_BUTTON_ITEM_ID = -4L
 const val ARCHIVED_BUTTON_ITEM_ID = -5L
+const val STATISTICS_TOTAL_ITEM_ID = -6L
diff --git a/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt b/features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsDetailTotalNavigator.kt
@@ -2,14 +2,8 @@ package com.example.util.simpletimetracker.feature_statistics.interactor
 
 import com.example.util.simpletimetracker.core.extension.toParams
 import com.example.util.simpletimetracker.core.interactor.GetStatisticsDetailRangeInteractor
-import com.example.util.simpletimetracker.domain.category.interactor.CategoryInteractor
-import com.example.util.simpletimetracker.domain.category.model.Category
+import com.example.util.simpletimetracker.core.interactor.GetTotalStatisticsFilterInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
-import com.example.util.simpletimetracker.domain.recordTag.interactor.RecordTagInteractor
-import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
-import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
-import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
-import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.StatisticsDetailParams
@@ -19,37 +13,15 @@ class StatisticsDetailTotalNavigator @Inject constructor(
     private val router: Router,
     private val prefsInteractor: PrefsInteractor,
     private val getStatisticsDetailRangeInteractor: GetStatisticsDetailRangeInteractor,
-    private val recordTypeInteractor: RecordTypeInteractor,
-    private val categoryInteractor: CategoryInteractor,
-    private val recordTagInteractor: RecordTagInteractor,
+    private val getTotalStatisticsFilterInteractor: GetTotalStatisticsFilterInteractor,
 ) {
 
     suspend fun execute(
         shift: Int,
     ) {
-        val filter = when (prefsInteractor.getChartFilterType()) {
-            ChartFilterType.ACTIVITY -> {
-                val typeIds = recordTypeInteractor.getAll()
-                    .map(RecordType::id)
-                RecordsFilter.Activity(selected = typeIds, filtered = emptyList())
-            }
-            ChartFilterType.CATEGORY -> {
-                val categoryIds = categoryInteractor.getAll()
-                    .map(Category::id)
-                val items = categoryIds
-                    .map(RecordsFilter.CategoryItem::Categorized) +
-                    RecordsFilter.CategoryItem.Uncategorized
-                RecordsFilter.Category(selected = items, filtered = emptyList())
-            }
-            ChartFilterType.RECORD_TAG -> {
-                val tagIds = recordTagInteractor.getAll()
-                    .map(RecordTag::id)
-                val items = tagIds
-                    .map(RecordsFilter.TagItem::Tagged) +
-                    RecordsFilter.TagItem.Untagged
-                RecordsFilter.Tags(selected = items, filtered = emptyList())
-            }
-        }
+        val filter = getTotalStatisticsFilterInteractor.execute(
+            filterType = prefsInteractor.getChartFilterType(),
+        )
 
         val params = StatisticsDetailParams(
             transitionName = "",
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailAdjacentActivitiesInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailAdjacentActivitiesInteractor.kt
@@ -69,7 +69,7 @@ class StatisticsDetailAdjacentActivitiesInteractor @Inject constructor(
                 statisticsDetailViewDataMapper.mapToPreview(
                     recordType = recordTypes[typeId] ?: return@mapIndexedNotNull null,
                     isDarkTheme = isDarkTheme,
-                    isFirst = false,
+                    showName = false,
                     isForComparison = false,
                 ).copy(name = "$correctedPercent%")
             }
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailPreviewInteractor.kt
@@ -50,12 +50,20 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
 
     suspend fun getPreviewData(
         filterParams: List<RecordsFilter>,
+        total: Boolean,
         isExpanded: Boolean,
         isForComparison: Boolean,
     ): List<ViewHolderType> = withContext(Dispatchers.Default) {
         val isDarkTheme = prefsInteractor.getDarkMode()
         val previewType = getPreviewType(filterParams)
 
+        fun mapTotal(): List<ViewHolderType> {
+            return statisticsDetailViewDataMapper.mapToTotalPreview(
+                isDarkTheme = isDarkTheme,
+                isForComparison = isForComparison,
+            ).let(::listOf)
+        }
+
         suspend fun mapActivities(
             selectedIds: List<Long>,
         ): List<ViewHolderType> {
@@ -65,7 +73,7 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
                     statisticsDetailViewDataMapper.mapToPreview(
                         recordType = type,
                         isDarkTheme = isDarkTheme,
-                        isFirst = index == 0,
+                        showName = !total && index == 0,
                         isForComparison = isForComparison,
                     )
                 }
@@ -139,6 +147,8 @@ class StatisticsDetailPreviewInteractor @Inject constructor(
                 val selectedIds = records.map { it.typeIds }.flatten().distinct()
                 mapActivities(selectedIds)
             }
+        }.let {
+            if (total) mapTotal() + it else it
         }.let {
             if (it.size > MAX_PREVIEWS_COUNT && !isExpanded) {
                 val type = if (isForComparison) {
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailTotalRecordsSelectedInteractor.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailTotalRecordsSelectedInteractor.kt
@@ -0,0 +1,68 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.interactor
+
+import com.example.util.simpletimetracker.core.interactor.GetTotalStatisticsFilterInteractor
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
+import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
+import javax.inject.Inject
+
+class StatisticsDetailTotalRecordsSelectedInteractor @Inject constructor(
+    private val getTotalStatisticsFilterInteractor: GetTotalStatisticsFilterInteractor,
+) {
+
+    suspend fun execute(
+        currentFilter: List<RecordsFilter>,
+    ): Boolean {
+        if (currentFilter.size != 1) return false
+        val onlyFilter = currentFilter.firstOrNull() ?: return false
+        val chartFilter = when (onlyFilter) {
+            is RecordsFilter.Activity -> ChartFilterType.ACTIVITY
+            is RecordsFilter.Category -> ChartFilterType.CATEGORY
+            is RecordsFilter.Tags -> ChartFilterType.RECORD_TAG
+            else -> return false
+        }
+        val totalFilter = getTotalStatisticsFilterInteractor.execute(chartFilter)
+        return totalFilter.prepareForComparison() == onlyFilter.prepareForComparison()
+    }
+
+    private fun RecordsFilter.prepareForComparison(): RecordsFilter {
+        fun List<RecordsFilter.CategoryItem>.prepare(): List<RecordsFilter.CategoryItem> {
+            return this.sortedBy {
+                when (it) {
+                    is RecordsFilter.CategoryItem.Categorized -> it.categoryId
+                    is RecordsFilter.CategoryItem.Uncategorized -> -1
+                }
+            }
+        }
+
+        fun List<RecordsFilter.TagItem>.prepare(): List<RecordsFilter.TagItem> {
+            return this.sortedBy {
+                when (it) {
+                    is RecordsFilter.TagItem.Tagged -> it.tagId
+                    is RecordsFilter.TagItem.Untagged -> -1
+                }
+            }
+        }
+
+        return when (this) {
+            is RecordsFilter.Activity -> {
+                this.copy(
+                    selected = this.selected.sorted(),
+                    filtered = this.filtered.sorted(),
+                )
+            }
+            is RecordsFilter.Category -> {
+                this.copy(
+                    selected = this.selected.prepare(),
+                    filtered = this.filtered.prepare(),
+                )
+            }
+            is RecordsFilter.Tags -> {
+                this.copy(
+                    selected = this.selected.prepare(),
+                    filtered = this.filtered.prepare(),
+                )
+            }
+            else -> this
+        }
+    }
+}
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt
@@ -12,6 +12,7 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.base.DurationFormat
 import com.example.util.simpletimetracker.domain.base.MULTITASK_ITEM_ID
 import com.example.util.simpletimetracker.domain.base.OneShotValue
+import com.example.util.simpletimetracker.domain.base.STATISTICS_TOTAL_ITEM_ID
 import com.example.util.simpletimetracker.domain.base.UNTRACKED_ITEM_ID
 import com.example.util.simpletimetracker.domain.category.model.Category
 import com.example.util.simpletimetracker.domain.daysOfWeek.model.DayOfWeek
@@ -61,7 +62,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
     fun mapToPreview(
         recordType: RecordType,
         isDarkTheme: Boolean,
-        isFirst: Boolean,
+        showName: Boolean,
         isForComparison: Boolean,
     ): StatisticsDetailPreviewViewData {
         return StatisticsDetailPreviewViewData(
@@ -71,7 +72,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             } else {
                 StatisticsDetailPreviewViewData.Type.FILTER
             },
-            name = recordType.name.takeIf { isFirst }.orEmpty(),
+            name = recordType.name.takeIf { showName }.orEmpty(),
             iconId = recordType.icon
                 .let(iconMapper::mapIcon),
             color = recordType.color
@@ -210,6 +211,23 @@ class StatisticsDetailViewDataMapper @Inject constructor(
         )
     }
 
+    fun mapToTotalPreview(
+        isDarkTheme: Boolean,
+        isForComparison: Boolean,
+    ): StatisticsDetailPreviewViewData {
+        return StatisticsDetailPreviewViewData(
+            id = STATISTICS_TOTAL_ITEM_ID,
+            type = if (isForComparison) {
+                StatisticsDetailPreviewViewData.Type.COMPARISON
+            } else {
+                StatisticsDetailPreviewViewData.Type.FILTER
+            },
+            name = resourceRepo.getString(R.string.statistics_total_tracked),
+            iconId = null,
+            color = colorMapper.toUntrackedColor(isDarkTheme),
+        )
+    }
+
     fun mapToChartViewData(
         data: List<ChartBarDataDuration>,
         prevData: List<ChartBarDataDuration>,
diff --git a/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt b/features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt
@@ -4,16 +4,22 @@ import androidx.lifecycle.LiveData
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
 import com.example.util.simpletimetracker.core.extension.lazySuspend
 import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.extension.toModel
+import com.example.util.simpletimetracker.domain.extension.orFalse
+import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
 import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailPreviewInteractor
+import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailTotalRecordsSelectedInteractor
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreview
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewMoreViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
+import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParam
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
     private val previewInteractor: StatisticsDetailPreviewInteractor,
+    private val totalRecordsSelectedInteractor: StatisticsDetailTotalRecordsSelectedInteractor,
 ) : StatisticsDetailViewModelDelegate, ViewModelDelegate() {
 
     val viewData: LiveData<StatisticsDetailPreviewCompositeViewData?> by lazySuspend {
@@ -44,14 +50,18 @@ class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
 
     private suspend fun loadViewData(): StatisticsDetailPreviewCompositeViewData? {
         val parent = parent ?: return null
+        val currentFilter = parent.filter
+        val total = totalRecordsSelectedInteractor.execute(currentFilter)
 
         val data = previewInteractor.getPreviewData(
-            filterParams = parent.filter,
+            filterParams = currentFilter,
+            total = total,
             isExpanded = previewsExpanded,
             isForComparison = false,
         )
         val comparisonData = previewInteractor.getPreviewData(
             filterParams = parent.comparisonFilter,
+            total = false,
             isExpanded = previewsComparisonExpanded,
             isForComparison = true,
         )

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class StatisticsDetailAdjacentActivitiesInteractor @Inject constructor(`
`69`	`69`	`statisticsDetailViewDataMapper.mapToPreview(`
`70`	`70`	`recordType = recordTypes[typeId] ?: return@mapIndexedNotNull null,`
`71`	`71`	`isDarkTheme = isDarkTheme,`
`72`		`- isFirst = false,`
	`72`	`+ showName = false,`
`73`	`73`	`isForComparison = false,`
`74`	`74`	`).copy(name = "$correctedPercent%")`
`75`	`75`	`}`