Skip to content

Commit 815833a

Browse files
committed
refactor statistics detail view data mappers
1 parent 90c8106 commit 815833a

File tree

5 files changed

+575
-527
lines changed

5 files changed

+575
-527
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.domain.recordType.model.RecordType
1313
import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
1414
import com.example.util.simpletimetracker.domain.record.model.RecordsFilter
1515
import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailChartInteractor.CompositeChartData
16+
import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailGoalsViewDataMapper
1617
import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailViewDataMapper
1718
import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartGrouping
1819
import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartLength
@@ -25,6 +26,7 @@ import javax.inject.Inject
2526
class StatisticsDetailGoalsInteractor @Inject constructor(
2627
private val chartInteractor: StatisticsDetailChartInteractor,
2728
private val statisticsDetailViewDataMapper: StatisticsDetailViewDataMapper,
29+
private val statisticsDetailGoalsViewDataMapper: StatisticsDetailGoalsViewDataMapper,
2830
private val prefsInteractor: PrefsInteractor,
2931
private val statisticsDetailGetGoalFromFilterInteractor: StatisticsDetailGetGoalFromFilterInteractor,
3032
private val recordTypeInteractor: RecordTypeInteractor,
@@ -95,7 +97,7 @@ class StatisticsDetailGoalsInteractor @Inject constructor(
9597
splitSortMode = ChartSplitSortMode.ACTIVITY_ORDER,
9698
)
9799

98-
val statsViewData = statisticsDetailViewDataMapper.mapGoalStatsViewData(
100+
val statsViewData = statisticsDetailGoalsViewDataMapper.mapGoalStatsViewData(
99101
records = records,
100102
currentRangeGoal = getGoal(
101103
goals = goals,
@@ -108,7 +110,7 @@ class StatisticsDetailGoalsInteractor @Inject constructor(
108110
firstDayOfWeek = firstDayOfWeek,
109111
startOfDayShift = startOfDayShift,
110112
)
111-
val chartViewData = statisticsDetailViewDataMapper.mapGoalChartViewData(
113+
val chartViewData = statisticsDetailGoalsViewDataMapper.mapGoalChartViewData(
112114
data = data,
113115
prevData = prevData,
114116
chartGoal = chartGoal,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTyp
1111
import com.example.util.simpletimetracker.domain.recordType.model.RecordType
1212
import com.example.util.simpletimetracker.domain.statistics.model.RangeLength
1313
import com.example.util.simpletimetracker.feature_statistics_detail.interactor.StatisticsDetailPreviewInteractor.PreviewType
14-
import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailViewDataMapper
14+
import com.example.util.simpletimetracker.feature_statistics_detail.mapper.StatisticsDetailTagValuesViewDataMapper
1515
import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartGrouping
1616
import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartLength
1717
import com.example.util.simpletimetracker.feature_statistics_detail.model.ChartMode
@@ -25,7 +25,7 @@ class StatisticsDetailTagValueInteractor @Inject constructor(
2525
private val prefsInteractor: PrefsInteractor,
2626
private val chartInteractor: StatisticsDetailChartInteractor,
2727
private val statisticsDetailPreviewInteractor: StatisticsDetailPreviewInteractor,
28-
private val statisticsDetailViewDataMapper: StatisticsDetailViewDataMapper,
28+
private val statisticsDetailTagValuesViewDataMapper: StatisticsDetailTagValuesViewDataMapper,
2929
private val recordTypeInteractor: RecordTypeInteractor,
3030
private val recordTagInteractor: RecordTagInteractor,
3131
) {
@@ -100,7 +100,7 @@ class StatisticsDetailTagValueInteractor @Inject constructor(
100100
splitSortMode = ChartSplitSortMode.ACTIVITY_ORDER,
101101
)
102102

103-
val chartViewData = statisticsDetailViewDataMapper.mapTagValueChartViewData(
103+
val chartViewData = statisticsDetailTagValuesViewDataMapper.mapTagValueChartViewData(
104104
data = data,
105105
prevData = prevData,
106106
rangeLength = rangeLength,

0 commit comments

Comments
 (0)