A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
0

Configure Feed

Select the types of activity you want to include in your feed.

fix filtered activities still showing in goals on statistics tab

razeeman (Aug 5, 2023, 2:25 PM +0300) a329bbc0 817375b9

+4
+2
core/src/main/java/com/example/util/simpletimetracker/core/mapper/GoalViewDataMapper.kt
··· 87 87 goals: List<RecordTypeGoal>, 88 88 types: Map<Long, RecordType>, 89 89 filterType: ChartFilterType, 90 + filteredIds: List<Long>, 90 91 rangeLength: RangeLength, 91 92 statistics: List<Statistics>, 92 93 data: Map<Long, StatisticsDataHolder>, ··· 107 108 when { 108 109 type == null -> false 109 110 type.hidden -> false 111 + type.id in filteredIds -> false 110 112 rangeLength is RangeLength.Day -> it.range is RecordTypeGoal.Range.Daily 111 113 rangeLength is RangeLength.Week -> it.range is RecordTypeGoal.Range.Weekly 112 114 rangeLength is RangeLength.Month -> it.range is RecordTypeGoal.Range.Monthly
+1
features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/interactor/GoalsViewDataInteractor.kt
··· 103 103 goals = goals, 104 104 types = types, 105 105 filterType = filterType, 106 + filteredIds = emptyList(), 106 107 rangeLength = rangeLength, 107 108 statistics = statistics, 108 109 data = dataHolders,
+1
features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/interactor/StatisticsViewDataInteractor.kt
··· 157 157 goals = goals, 158 158 types = types, 159 159 filterType = filterType, 160 + filteredIds = filteredIds, 160 161 rangeLength = rangeLength, 161 162 statistics = statistics.filterNot { it.id in filteredIds }, 162 163 data = dataHolders,