From 5c1bd0a50971061022b5d8d3de175b5a08f0a25d Mon Sep 17 00:00:00 2001 From: Davide Ferrari Date: Sat, 10 Jan 2026 11:54:57 +0100 Subject: [PATCH] feat: show total kWh instead of charge count in histograms The charges screen histograms now display total energy charged (kWh) per day/week/month instead of the number of charging sessions. This is more useful for users with smart charging systems (like Octopus) that optimize costs by splitting charging into multiple partial sessions. Fixes #18 Co-Authored-By: Claude Opus 4.5 --- .../matedroid/ui/screens/charges/ChargesScreen.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/matedroid/ui/screens/charges/ChargesScreen.kt b/app/src/main/java/com/matedroid/ui/screens/charges/ChargesScreen.kt index b02656d..1d190b7 100644 --- a/app/src/main/java/com/matedroid/ui/screens/charges/ChargesScreen.kt +++ b/app/src/main/java/com/matedroid/ui/screens/charges/ChargesScreen.kt @@ -606,9 +606,9 @@ private fun ChargesChart( palette: CarColorPalette ) { val title = when (granularity) { - ChartGranularity.DAILY -> "Charges per Day" - ChartGranularity.WEEKLY -> "Charges per Week" - ChartGranularity.MONTHLY -> "Charges per Month" + ChartGranularity.DAILY -> "Energy per Day" + ChartGranularity.WEEKLY -> "Energy per Week" + ChartGranularity.MONTHLY -> "Energy per Month" } Card( @@ -641,8 +641,8 @@ private fun ChargesChart( val barData = chartData.map { data -> BarChartData( label = data.label, - value = data.count.toDouble(), - displayValue = "${data.count} charges" + value = data.totalEnergy, + displayValue = "%.1f kWh".format(data.totalEnergy) ) } @@ -655,7 +655,7 @@ private fun ChargesChart( barColor = palette.accent, labelColor = palette.onSurfaceVariant, showEveryNthLabel = labelInterval, - valueFormatter = { "%.0f charges".format(it) } + valueFormatter = { "%.1f kWh".format(it) } ) } }