tag values statistics bar chart zoom axis

Author: Razeeman

domain/src/main/java/com/example/util/simpletimetracker/domain/prefs/interactor/PrefsInteractor.kt

@@ -1291,18 +1291,18 @@ class PrefsInteractor @Inject constructor(
                 val modeInt = parts.getOrNull(1)?.toIntOrNull().orZero()
                 val multiplyInt = parts.getOrNull(2)?.toIntOrNull().orZero()
                 val fillInt = parts.getOrNull(3)?.toIntOrNull().orZero()
+                val zoomInt = parts.getOrNull(4)?.toIntOrNull().orZero()
                 val chartValueMode = when (modeInt) {
                     0 -> ChartValueMode.TOTAL
                     1 -> ChartValueMode.AVERAGE
                     else -> ChartValueMode.TOTAL
                 }
-                val multiplyDuration = multiplyInt == 1
-                val fillEmptyPeriods = fillInt == 1
                 tagId to StatisticsDetailTagValueSettings(
                     tagId = tagId,
                     chartValueMode = chartValueMode,
-                    multiplyDuration = multiplyDuration,
-                    fillEmptyPeriods = fillEmptyPeriods,
+                    multiplyDuration = multiplyInt == 1,
+                    fillEmptyPeriods = fillInt == 1,
+                    yAxisZoomed = zoomInt == 1,
                 )
             }
         }?.toMap().orEmpty()
@@ -1325,6 +1325,8 @@ class PrefsInteractor @Inject constructor(
                 append(if (settings.multiplyDuration) 1 else 0)
                 append(STATISTICS_DETAIL_TAG_VALUE_DELIMITER)
                 append(if (settings.fillEmptyPeriods) 1 else 0)
+                append(STATISTICS_DETAIL_TAG_VALUE_DELIMITER)
+                append(if (settings.yAxisZoomed) 1 else 0)
             }
         }.toSet()
     }

domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/model/StatisticsDetailTagValueSettings.kt

@@ -5,6 +5,7 @@ data class StatisticsDetailTagValueSettings(
     val chartValueMode: ChartValueMode,
     val multiplyDuration: Boolean,
     val fillEmptyPeriods: Boolean,
+    val yAxisZoomed: Boolean,
 ) {
 
     companion object {
@@ -14,6 +15,7 @@ data class StatisticsDetailTagValueSettings(
                 chartValueMode = ChartValueMode.TOTAL,
                 multiplyDuration = false,
                 fillEmptyPeriods = false,
+                yAxisZoomed = false,
             )
         }
     }

features/feature_settings/api/src/main/java/com/example/util/simpletimetracker/feature_settings/api/SettingsBlock.kt

@@ -156,4 +156,5 @@ enum class SettingsBlock {
     StatisticsTagValuesChartValueMode,
     StatisticsTagValuesMultiplyDuration,
     StatisticsTagValuesFillEmptyPeriods,
+    StatisticsTagValuesZoomYAxis,
 }

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/adapter/StatisticsDetailBarChartAdapterDelegate.kt

@@ -28,6 +28,7 @@ fun createStatisticsDetailBarChartAdapterDelegate(
             selectedBarPosition = viewData.selectedBarPosition,
             animate = viewData.animate.getValue().orFalse(),
         )
+        setYAxisZoomed(viewData.yAxisZoomed)
         setLegendTextSuffix(viewData.legendSuffix)
         shouldAddLegendToSelectedBar(viewData.addLegendToSelectedBar)
         shouldDrawHorizontalLegends(viewData.shouldDrawHorizontalLegends)

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

@@ -304,6 +304,7 @@ class StatisticsDetailDataDistributionInteractor @Inject constructor(
             showSelectedBarOnStart = false,
             selectedBarPosition = selectedBarPosition,
             goalValue = 0f,
+            yAxisZoomed = false,
             useSingleColor = true,
             drawRoundCaps = true,
             animate = OneShotValue(animate),

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

@@ -41,6 +41,7 @@ class StatisticsDetailTagValueInteractor @Inject constructor(
         currentChartValueMode: ChartValueMode,
         multiplyDuration: Boolean,
         fillEmptyPeriods: Boolean,
+        yAxisZoomed: Boolean,
         rangeLength: RangeLength,
         rangePosition: Int,
     ): StatisticsDetailTagValuesCompositeViewData = withContext(Dispatchers.Default) {
@@ -121,6 +122,7 @@ class StatisticsDetailTagValueInteractor @Inject constructor(
             appliedChartLength = compositeData.appliedChartLength,
             chartMode = chartMode,
             chartValueMode = currentChartValueMode,
+            yAxisZoomed = yAxisZoomed,
             valueSuffix = valuedTag.valueSuffix,
             durationFormat = durationFormat,
             showSeconds = showSeconds,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailGoalsViewDataMapper.kt

@@ -123,6 +123,7 @@ class StatisticsDetailGoalsViewDataMapper @Inject constructor(
             goal = 0, // Don't show goal on goal graph.
             rangeLength = rangeLength,
             chartMode = chartMode,
+            yAxisZoomed = false,
             showSelectedBarOnStart = true,
             useSingleColor = false,
             drawRoundCaps = true,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailTagValuesViewDataMapper.kt

@@ -36,6 +36,7 @@ class StatisticsDetailTagValuesViewDataMapper @Inject constructor(
         appliedChartLength: ChartLength,
         chartMode: ChartMode.TAG_VALUE,
         chartValueMode: ChartValueMode,
+        yAxisZoomed: Boolean,
         valueSuffix: String,
         durationFormat: DurationFormat,
         showSeconds: Boolean,
@@ -48,6 +49,7 @@ class StatisticsDetailTagValuesViewDataMapper @Inject constructor(
             goal = 0, // Don't show goal.
             rangeLength = rangeLength,
             chartMode = chartMode,
+            yAxisZoomed = yAxisZoomed,
             showSelectedBarOnStart = true,
             useSingleColor = true,
             drawRoundCaps = true,

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/mapper/StatisticsDetailViewDataMapper.kt

@@ -311,6 +311,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             goal = goalValue,
             rangeLength = rangeLength,
             chartMode = chartMode,
+            yAxisZoomed = false,
             showSelectedBarOnStart = true,
             useSingleColor = !chartIsSplitByActivity,
             drawRoundCaps = !chartIsSplitByActivity,
@@ -320,6 +321,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             goal = compareGoalValue,
             rangeLength = rangeLength,
             chartMode = chartMode,
+            yAxisZoomed = false,
             showSelectedBarOnStart = false,
             useSingleColor = !chartComparisonIsSplitByActivity,
             drawRoundCaps = !chartComparisonIsSplitByActivity,
@@ -386,6 +388,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             showSelectedBarOnStart = false,
             selectedBarPosition = null,
             goalValue = 0f,
+            yAxisZoomed = false,
             drawRoundCaps = true,
             useSingleColor = true,
             animate = OneShotValue(true),
@@ -438,6 +441,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             showSelectedBarOnStart = false,
             selectedBarPosition = null,
             goalValue = 0f,
+            yAxisZoomed = false,
             useSingleColor = true,
             drawRoundCaps = true,
             animate = OneShotValue(true),
@@ -470,6 +474,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             showSelectedBarOnStart = false,
             selectedBarPosition = null,
             goalValue = 0f,
+            yAxisZoomed = false,
             useSingleColor = true,
             drawRoundCaps = true,
             animate = OneShotValue(true),
@@ -526,6 +531,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             showSelectedBarOnStart = false,
             selectedBarPosition = null,
             goalValue = 0f,
+            yAxisZoomed = false,
             useSingleColor = true,
             drawRoundCaps = true,
             animate = OneShotValue(true),
@@ -723,6 +729,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
         goal: Long,
         rangeLength: RangeLength,
         chartMode: ChartMode,
+        yAxisZoomed: Boolean,
         showSelectedBarOnStart: Boolean,
         useSingleColor: Boolean,
         drawRoundCaps: Boolean,
@@ -768,6 +775,7 @@ class StatisticsDetailViewDataMapper @Inject constructor(
             showSelectedBarOnStart = showSelectedBarOnStart,
             selectedBarPosition = null,
             goalValue = formatInterval(goal),
+            yAxisZoomed = yAxisZoomed,
             useSingleColor = useSingleColor,
             drawRoundCaps = drawRoundCaps,
             animate = OneShotValue(true),

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

@@ -37,6 +37,13 @@ class StatisticsTagValuesSettingsViewDataInteractor @Inject constructor(
                 title = resourceRepo.getString(R.string.statistics_detail_tag_values_fill_empty_periods),
                 subtitle = "",
                 isChecked = settings.fillEmptyPeriods,
+                backgroundIsVisible = false,
+            ),
+            SettingsCheckboxViewData(
+                block = SettingsBlock.StatisticsTagValuesZoomYAxis,
+                title = resourceRepo.getString(R.string.statistics_detail_tag_values_zoom_y_axis),
+                subtitle = "",
+                isChecked = settings.yAxisZoomed,
                 dividerIsVisible = false,
                 backgroundIsVisible = false,
             ),