Update MeasurementChart.kt, PeriodChart.kt, and MeasurementChartLayers.kt to improve X-axis formatting and label placement based on the active aggregation level (Day, Week, Month, Year).

Author: oliexdev

android_app/app/src/main/java/com/health/openscale/ui/screen/components/MeasurementChart.kt

@@ -52,6 +52,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.health.openscale.R
+import com.health.openscale.core.data.AggregationLevel
 import com.health.openscale.core.data.InputFieldType
 import com.health.openscale.core.data.MeasurementType
 import com.health.openscale.core.data.MeasurementTypeKey
@@ -168,6 +169,7 @@ fun MeasurementChart(
     val isSmoothingActive by remember {
         sharedViewModel.selectedSmoothingAlgorithm.map { it != SmoothingAlgorithm.NONE }
     }.collectAsStateWithLifecycle(initialValue = false)
+    val activeAggregationLevel by rememberResolvedAggregationLevel(screenContextName, sharedViewModel)
 
     // ── Time range — still needed for the filter title label and period chart ─
     // Note: start/end are NOT passed to the data pipeline anymore (that happens
@@ -483,10 +485,24 @@ fun MeasurementChart(
 
                 val xAxis = if (targetMeasurementTypeId == null) {
                     HorizontalAxis.rememberBottom(
-                        valueFormatter = rememberXAxisValueFormatter(chartSeries),
-                        guideline      = null,
+                        valueFormatter = rememberXAxisValueFormatter(chartSeries, activeAggregationLevel),
+                        itemPlacer = remember(activeAggregationLevel) {
+                            val spacing = when (activeAggregationLevel) {
+                                AggregationLevel.NONE    -> 1
+                                AggregationLevel.DAY   -> 1
+                                AggregationLevel.WEEK  -> 7
+                                AggregationLevel.MONTH -> 30
+                                AggregationLevel.YEAR  -> 365
+                            }
+                            HorizontalAxis.ItemPlacer.aligned(
+                                spacing = { spacing },
+                                addExtremeLabelPadding = true,
+                            )
+                        },
+                        guideline = null,
                     )
                 } else null
+
                 val startYAxis = if (showYAxis)
                     VerticalAxis.rememberStart(valueFormatter = CartesianValueFormatter.decimal())
                 else null

android_app/app/src/main/java/com/health/openscale/ui/screen/components/MeasurementChartLayers.kt

@@ -24,9 +24,13 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import com.health.openscale.R
+import com.health.openscale.core.data.AggregationLevel
 import com.health.openscale.core.data.MeasurementType
 import com.health.openscale.core.data.UnitType
 import com.health.openscale.core.data.UserGoals
@@ -56,6 +60,7 @@ import com.patrykandpatrick.vico.compose.common.data.ExtraStore
 import java.time.LocalDate
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
 import kotlin.math.ceil
 import kotlin.math.floor
 
@@ -374,14 +379,30 @@ internal fun rememberMarkerVisibilityListener(
 
 /**
  * Remembers a [CartesianValueFormatter] for the X-axis that formats epoch day floats
- * back to human-readable date strings.
+ * back to human-readable date strings. The date format adapts to the current [aggregationLevel]:
  */
 @Composable
-internal fun rememberXAxisValueFormatter(chartSeries: List<ChartSeries>): CartesianValueFormatter =
-    remember(chartSeries) {
+internal fun rememberXAxisValueFormatter(
+    chartSeries: List<ChartSeries>,
+    aggregationLevel: AggregationLevel = AggregationLevel.NONE,
+): CartesianValueFormatter {
+    val weekAbbrev = stringResource(R.string.calendar_week_abbrev)
+    return remember(chartSeries, aggregationLevel, weekAbbrev) {
         val xToDatesMap = chartSeries.flatMap { it.points }.associate { it.x to it.date }
+
+        val pattern = when (aggregationLevel) {
+            AggregationLevel.NONE  -> "d MMM"
+            AggregationLevel.DAY   -> "d MMM"
+            AggregationLevel.WEEK  -> "'${weekAbbrev}'w MMM"
+            AggregationLevel.MONTH -> "MMM yy"
+            AggregationLevel.YEAR  -> "yyyy"
+        }
+
+        val formatter = DateTimeFormatter.ofPattern(pattern)
+
         CartesianValueFormatter { _, value, _ ->
             (xToDatesMap[value.toFloat()] ?: LocalDate.ofEpochDay(value.toLong()))
-                .format(DateTimeFormatter.ofPattern("d MMM"))
+                .format(formatter)
         }
-    }
+    }
+}

android_app/app/src/main/java/com/health/openscale/ui/screen/components/PeriodChart.kt

@@ -117,14 +117,16 @@ fun PeriodChart(
         columnLayer,
         startAxis = null,
         bottomAxis = HorizontalAxis.rememberBottom(
-            itemPlacer = HorizontalAxis.ItemPlacer.segmented(),
+            itemPlacer = HorizontalAxis.ItemPlacer.aligned(
+                addExtremeLabelPadding = true,
+            ),
             valueFormatter = CartesianValueFormatter { context, x, _ ->
                 val labels = context.model.extraStore[BottomAxisLabelKey]
                 if (labels.isNotEmpty() && x.toInt() in labels.indices) labels[x.toInt()] else ""
             },
             guideline = null,
             label = rememberAxisLabelComponent(
-                lineCount = 2,       // allow wrapping if needed
+                lineCount = 1,       // no wrap
             )
         ),
         marker = rememberMarker(