move stat detail data distribution to separate delegate

Author: Razeeman

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailContentInteractor.kt

@@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.adapter.Stat
 import com.example.util.simpletimetracker.feature_statistics_detail.adapter.StatisticsDetailSeriesChartViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailChartCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailChartViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailGoalsCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
@@ -44,6 +45,7 @@ class StatisticsDetailContentInteractor @Inject constructor(
         comparisonDurationSplitChartViewData: StatisticsDetailChartViewData?,
         nextActivitiesViewData: List<ViewHolderType>?,
         goalsViewData: StatisticsDetailGoalsCompositeViewData?,
+        dataDistributionViewData: StatisticsDetailDataDistributionViewData?,
     ): List<ViewHolderType> {
         val result = mutableListOf<ViewHolderType>()
 
@@ -298,9 +300,7 @@ class StatisticsDetailContentInteractor @Inject constructor(
 
         result += goalsViewData?.viewData.orEmpty()
 
-        statsViewData?.let { viewData ->
-            result += viewData.splitData
-        }
+        result += dataDistributionViewData?.splitData.orEmpty()
 
         return result
     }

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailDataDistributionInteractor.kt

@@ -4,6 +4,7 @@ import com.example.util.simpletimetracker.core.interactor.StatisticsChartViewDat
 import com.example.util.simpletimetracker.core.interactor.StatisticsMediator
 import com.example.util.simpletimetracker.core.mapper.ColorMapper
 import com.example.util.simpletimetracker.core.mapper.StatisticsViewDataMapper
+import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.core.viewData.StatisticsDataHolder
 import com.example.util.simpletimetracker.domain.base.UNCATEGORIZED_ITEM_ID
@@ -13,8 +14,12 @@ import com.example.util.simpletimetracker.domain.statistics.interactor.Statistic
 import com.example.util.simpletimetracker.domain.statistics.interactor.StatisticsTagInteractor
 import com.example.util.simpletimetracker.domain.statistics.model.ChartFilterType
 import com.example.util.simpletimetracker.domain.base.OneShotValue
+import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.record.mapper.RangeMapper
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
+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.RangeLength
 import com.example.util.simpletimetracker.domain.statistics.model.Statistics
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.statistics.StatisticsViewData
@@ -32,21 +37,69 @@ import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDi
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailChartViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionGraphViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionModeViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionViewData
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class StatisticsDetailDataDistributionInteractor @Inject constructor(
+    private val colorMapper: ColorMapper,
+    private val resourceRepo: ResourceRepo,
+    private val prefsInteractor: PrefsInteractor,
+    private val recordTypeInteractor: RecordTypeInteractor,
+    private val timeMapper: TimeMapper,
+    private val rangeMapper: RangeMapper,
     private val statisticsInteractor: StatisticsInteractor,
     private val statisticsTagInteractor: StatisticsTagInteractor,
     private val statisticsCategoryInteractor: StatisticsCategoryInteractor,
     private val statisticsMediator: StatisticsMediator,
     private val statisticsChartViewDataInteractor: StatisticsChartViewDataInteractor,
     private val statisticsDetailViewDataMapper: StatisticsDetailViewDataMapper,
     private val statisticsViewDataMapper: StatisticsViewDataMapper,
-    private val colorMapper: ColorMapper,
-    private val resourceRepo: ResourceRepo,
 ) {
 
-    suspend fun mapDataDistribution(
+    suspend fun getViewData(
+        records: List<RecordBase>,
+        rangeLength: RangeLength,
+        rangePosition: Int,
+        dataDistributionMode: DataDistributionMode,
+        dataDistributionGraph: DataDistributionGraph,
+    ): StatisticsDetailDataDistributionViewData = withContext(Dispatchers.Default) {
+        val isDarkTheme = prefsInteractor.getDarkMode()
+        val firstDayOfWeek = prefsInteractor.getFirstDayOfWeek()
+        val startOfDayShift = prefsInteractor.getStartOfDayShift()
+        val useProportionalMinutes = prefsInteractor.getUseProportionalMinutes()
+        val showSeconds = prefsInteractor.getShowSeconds()
+        val types = recordTypeInteractor.getAll()
+
+        val typesMap = types.associateBy(RecordType::id)
+        val range = timeMapper.getRangeStartAndEnd(
+            rangeLength = rangeLength,
+            shift = rangePosition,
+            firstDayOfWeek = firstDayOfWeek,
+            startOfDayShift = startOfDayShift,
+        )
+        val splitData = mapDataDistribution(
+            mode = dataDistributionMode,
+            graph = dataDistributionGraph,
+            records = if (range.timeStarted == 0L && range.timeEnded == 0L) {
+                records
+            } else {
+                rangeMapper.getRecordsFromRange(records, range)
+                    .map { rangeMapper.clampRecordToRange(it, range) }
+            },
+            typesMap = typesMap,
+            isDarkTheme = isDarkTheme,
+            useProportionalMinutes = useProportionalMinutes,
+            showSeconds = showSeconds,
+        )
+
+        return@withContext StatisticsDetailDataDistributionViewData(
+            splitData = splitData,
+        )
+    }
+
+    private suspend fun mapDataDistribution(
         mode: DataDistributionMode,
         graph: DataDistributionGraph,
         records: List<RecordBase>,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailStatsInteractor.kt

@@ -37,8 +37,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
         showComparison: Boolean,
         rangeLength: RangeLength,
         rangePosition: Int,
-        dataDistributionMode: DataDistributionMode,
-        dataDistributionGraph: DataDistributionGraph,
     ): StatisticsDetailStatsViewData = withContext(Dispatchers.Default) {
         val isDarkTheme = prefsInteractor.getDarkMode()
         val firstDayOfWeek = prefsInteractor.getFirstDayOfWeek()
@@ -70,8 +68,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
             },
             showComparison = showComparison,
             types = types,
-            dataDistributionMode = dataDistributionMode,
-            dataDistributionGraph = dataDistributionGraph,
             isDarkTheme = isDarkTheme,
             useMilitaryTime = useMilitaryTime,
             useProportionalMinutes = useProportionalMinutes,
@@ -98,17 +94,14 @@ class StatisticsDetailStatsInteractor @Inject constructor(
             compareFirstRecord = "",
             lastRecord = "",
             compareLastRecord = "",
-            splitData = emptyList(),
         )
     }
 
-    private suspend fun mapStatsData(
+    private fun mapStatsData(
         records: List<RecordBase>,
         compareRecords: List<RecordBase>,
         showComparison: Boolean,
         types: List<RecordType>,
-        dataDistributionMode: DataDistributionMode,
-        dataDistributionGraph: DataDistributionGraph,
         isDarkTheme: Boolean,
         useMilitaryTime: Boolean,
         useProportionalMinutes: Boolean,
@@ -135,15 +128,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
                 R.color.colorInactive
             }.let(resourceRepo::getColor),
         )
-        val splitData = dataDistributionInteractor.mapDataDistribution(
-            mode = dataDistributionMode,
-            graph = dataDistributionGraph,
-            records = records,
-            typesMap = typesMap,
-            isDarkTheme = isDarkTheme,
-            useProportionalMinutes = useProportionalMinutes,
-            showSeconds = showSeconds,
-        )
 
         fun formatInterval(value: Long?): String {
             value ?: return emptyValue
@@ -233,7 +217,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
             compareLastRecord = compareRecordsSorted.lastOrNull()?.timeEnded
                 .let(::formatDateTimeYear)
                 .let(::processComparisonString),
-            splitData = splitData,
         )
     }
 
@@ -255,7 +238,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
         compareFirstRecord: String,
         lastRecord: String,
         compareLastRecord: String,
-        splitData: List<ViewHolderType>,
     ): StatisticsDetailStatsViewData {
         return StatisticsDetailStatsViewData(
             totalDuration = listOf(
@@ -318,7 +300,6 @@ class StatisticsDetailStatsInteractor @Inject constructor(
                     description = resourceRepo.getString(R.string.statistics_detail_last_record),
                 ),
             ),
-            splitData = splitData,
         )
     }
 }

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailDataDistributionViewData.kt

@@ -0,0 +1,7 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.viewData
+
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+
+data class StatisticsDetailDataDistributionViewData(
+    val splitData: List<ViewHolderType>,
+)

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewData/StatisticsDetailStatsViewData.kt

@@ -1,11 +1,8 @@
 package com.example.util.simpletimetracker.feature_statistics_detail.viewData
 
-import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
-
 data class StatisticsDetailStatsViewData(
     val totalDuration: List<StatisticsDetailCardInternalViewData>,
     val timesTracked: List<StatisticsDetailCardInternalViewData>,
     val averageRecord: List<StatisticsDetailCardInternalViewData>,
     val datesTracked: List<StatisticsDetailCardInternalViewData>,
-    val splitData: List<ViewHolderType>,
 )

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt

@@ -30,6 +30,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.viewData.Sta
 import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewCompositeViewData
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailChartViewModelDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailDailyCalendarViewModelDelegate
+import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailDataDistributionViewModelDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailDurationSplitViewModelDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailFilterViewModelDelegate
 import com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate.StatisticsDetailGoalsViewModelDelegate
@@ -66,6 +67,7 @@ class StatisticsDetailViewModel @Inject constructor(
     private val filterDelegate: StatisticsDetailFilterViewModelDelegate,
     private val dailyCalendarDelegate: StatisticsDetailDailyCalendarViewModelDelegate,
     private val goalsDelegate: StatisticsDetailGoalsViewModelDelegate,
+    private val dataDistributionDelegate: StatisticsDetailDataDistributionViewModelDelegate,
     private val statisticsDetailOptionsListMapper: StatisticsDetailOptionsListMapper,
 ) : BaseViewModel() {
 
@@ -90,6 +92,7 @@ class StatisticsDetailViewModel @Inject constructor(
         filterDelegate,
         dailyCalendarDelegate,
         goalsDelegate,
+        dataDistributionDelegate,
     )
 
     init {
@@ -137,9 +140,9 @@ class StatisticsDetailViewModel @Inject constructor(
             StatisticsDetailBlock.SplitChartGrouping ->
                 splitChartDelegate.onSplitChartGroupingClick(viewData)
             StatisticsDetailBlock.DataDistributionMode ->
-                statsDelegate.onDataDistributionModeClick(viewData)
+                dataDistributionDelegate.onDataDistributionModeClick(viewData)
             StatisticsDetailBlock.DataDistributionGraph ->
-                statsDelegate.onDataDistributionGraphClick(viewData)
+                dataDistributionDelegate.onDataDistributionGraphClick(viewData)
             else -> {
                 // Do nothing
             }
@@ -265,6 +268,7 @@ class StatisticsDetailViewModel @Inject constructor(
         durationSplitDelegate.updateViewData()
         nextActivitiesDelegate.updateViewData()
         goalsDelegate.updateViewData()
+        dataDistributionDelegate.updateViewData()
     }
 
     private fun updateContent() {
@@ -291,6 +295,7 @@ class StatisticsDetailViewModel @Inject constructor(
             comparisonDurationSplitChartViewData = durationSplitDelegate.comparisonViewData.value,
             nextActivitiesViewData = nextActivitiesDelegate.viewData.value,
             goalsViewData = goalsDelegate.viewData.value,
+            dataDistributionViewData = dataDistributionDelegate.viewData.value,
         )
     }
 

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailDataDistributionViewModelDelegate.kt

@@ -0,0 +1,61 @@
+package com.example.util.simpletimetracker.feature_statistics_detail.viewModel.delegate
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.example.util.simpletimetracker.core.base.ViewModelDelegate
+import com.example.util.simpletimetracker.core.extension.set
+import com.example.util.simpletimetracker.core.view.buttonsRowView.ButtonsRowViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailDataDistributionInteractor
+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionMode
+import com.example.util.simpletimetracker.feature_statistics_detail.model.DataDistributionGraph
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionModeViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionGraphViewData
+import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailDataDistributionViewData
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class StatisticsDetailDataDistributionViewModelDelegate @Inject constructor(
+    private val dataDistributionInteractor: StatisticsDetailDataDistributionInteractor,
+) : StatisticsDetailViewModelDelegate, ViewModelDelegate() {
+
+    val viewData: LiveData<StatisticsDetailDataDistributionViewData?> by lazy {
+        MutableLiveData()
+    }
+
+    private var parent: StatisticsDetailViewModelDelegate.Parent? = null
+    private var dataDistributionMode = DataDistributionMode.ACTIVITY
+    private var dataDistributionGraph = DataDistributionGraph.PIE_CHART
+
+    override fun attach(parent: StatisticsDetailViewModelDelegate.Parent) {
+        this.parent = parent
+    }
+
+    fun onDataDistributionModeClick(viewData: ButtonsRowViewData) {
+        if (viewData !is StatisticsDetailDataDistributionModeViewData) return
+        this.dataDistributionMode = viewData.mode
+        updateViewData()
+    }
+
+    fun onDataDistributionGraphClick(viewData: ButtonsRowViewData) {
+        if (viewData !is StatisticsDetailDataDistributionGraphViewData) return
+        this.dataDistributionGraph = viewData.graph
+        updateViewData()
+    }
+
+    fun updateViewData() = delegateScope.launch {
+        viewData.set(loadViewData())
+        parent?.updateContent()
+    }
+
+    private suspend fun loadViewData(): StatisticsDetailDataDistributionViewData? {
+        val parent = parent ?: return null
+
+        return dataDistributionInteractor.getViewData(
+            records = parent.records,
+            rangeLength = parent.rangeLength,
+            rangePosition = parent.rangePosition,
+            dataDistributionMode = dataDistributionMode,
+            dataDistributionGraph = dataDistributionGraph,
+        )
+    }
+}

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailStatsViewModelDelegate.kt

@@ -23,25 +23,11 @@ class StatisticsDetailStatsViewModelDelegate @Inject constructor(
     }
 
     private var parent: StatisticsDetailViewModelDelegate.Parent? = null
-    private var dataDistributionMode = DataDistributionMode.ACTIVITY
-    private var dataDistributionGraph = DataDistributionGraph.PIE_CHART
 
     override fun attach(parent: StatisticsDetailViewModelDelegate.Parent) {
         this.parent = parent
     }
 
-    fun onDataDistributionModeClick(viewData: ButtonsRowViewData) {
-        if (viewData !is StatisticsDetailDataDistributionModeViewData) return
-        this.dataDistributionMode = viewData.mode
-        updateViewData()
-    }
-
-    fun onDataDistributionGraphClick(viewData: ButtonsRowViewData) {
-        if (viewData !is StatisticsDetailDataDistributionGraphViewData) return
-        this.dataDistributionGraph = viewData.graph
-        updateViewData()
-    }
-
     fun updateViewData() = delegateScope.launch {
         viewData.set(loadViewData())
         parent?.updateContent()
@@ -60,8 +46,6 @@ class StatisticsDetailStatsViewModelDelegate @Inject constructor(
             showComparison = parent.comparisonFilter.isNotEmpty(),
             rangeLength = parent.rangeLength,
             rangePosition = parent.rangePosition,
-            dataDistributionMode = dataDistributionMode,
-            dataDistributionGraph = dataDistributionGraph,
         )
     }
 }