fix(chargepilot): eco coach speaks on calm drives, full-screen graphs get axes

The coach showed "a few minutes of driving are needed" for a whole drive
whenever nothing crossed an advice threshold. After a minute of movement
it now states the measured share of hard acceleration, and the trip
review keeps that share as a finding, so a calm drive without a trained
model is no longer "nothing measurable".

The consumption trace, in full screen and on the large overview graph,
draws both axes, their units and a legend for above, below and the
reference line: full screen leaves the text beside the graph behind.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: malys

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes follow [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ## [Unreleased]
 
+### Fixed
+
+- **The eco coach no longer waits forever on a calm drive.** It showed "a few minutes of driving
+  are needed" for a whole drive whenever nothing crossed an advice threshold. After a minute of
+  movement it now states the measured share of hard acceleration. The trip review keeps that
+  share as a finding too, so a calm drive without a trained model is no longer "nothing
+  measurable".
+- **Full-screen consumption graphs carry their axes and legend.** The trace draws both axes, the
+  kWh/100 km and "km before now" units, and a legend for above, below and the reference line,
+  since full screen leaves the text beside the graph behind.
+
 ### Added
 
 - **Speed comparison and energy breakdown answer on urban trips.** When no model can answer, both

EVHardware

@@ -19,8 +19,9 @@ import kotlin.math.min
  * The line takes the warning colour above the reference and the accent below it, and the
  * reference is a labelled dashed rule, so the colour is never the only thing saying which side
  * a stretch is on. Missing stretches break the line. A view wider than [DETAILED_MIN_DP] —
- * the large graph, or any graph opened full screen — also writes its scales; a card's
- * thumbnail, about as tall on this panel, stays a bare line.
+ * the large graph, or any graph opened full screen — also draws its axes, their units and a
+ * legend inside the plot, because full screen moves the graph away from the text beside it;
+ * a card's thumbnail, about as tall on this panel, stays a bare line.
  */
 class ConsumptionTraceView @JvmOverloads constructor(
     context: Context,
@@ -53,6 +54,11 @@ class ConsumptionTraceView @JvmOverloads constructor(
         color = context.getColor(R.color.ev_text_secondary)
         textSize = resources.getDimension(R.dimen.text_label)
     }
+    private val axisPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = context.getColor(R.color.ev_outline)
+        strokeWidth = density
+        style = Paint.Style.STROKE
+    }
 
     /**
      * @param trace kWh/100 km per equal stretch, oldest first; null where nothing was driven.
@@ -75,8 +81,9 @@ class ConsumptionTraceView @JvmOverloads constructor(
         val gutter = if (detailed) GUTTER_DP * density else 0f
         val left = inset + gutter
         val right = width - inset - gutter
-        val top = inset
-        val bottom = height - inset - if (detailed) labelPaint.textSize * 1.6f else 0f
+        // Detailed: a legend row above the plot, tick labels and the distance title below it.
+        val top = inset + if (detailed) labelPaint.textSize * 2f else 0f
+        val bottom = height - inset - if (detailed) labelPaint.textSize * 3f else 0f
         if (right <= left || bottom <= top) return
 
         val low = min(0f, min(known.min(), referenceKwhPer100Km))
@@ -117,6 +124,9 @@ class ConsumptionTraceView @JvmOverloads constructor(
         referenceY: Float,
     ) {
         val baseline = labelPaint.textSize / 3f
+        canvas.drawLine(left, top, left, bottom, axisPaint)
+        canvas.drawLine(left, bottom, right, bottom, axisPaint)
+        drawLegend(canvas, top - labelPaint.textSize)
         labelPaint.textAlign = Paint.Align.RIGHT
         for (step in 0..4) {
             val y = bottom - (bottom - top) * step / 4f
@@ -141,6 +151,35 @@ class ConsumptionTraceView @JvmOverloads constructor(
                 labelPaint,
             )
         }
+        canvas.drawText(
+            context.getString(R.string.trace_axis_distance),
+            (left + right) / 2f,
+            bottom + labelPaint.textSize * 2.8f,
+            labelPaint,
+        )
+    }
+
+    /** The vertical unit, then one swatch per line style, on one row above the plot. */
+    private fun drawLegend(canvas: Canvas, baselineY: Float) {
+        labelPaint.textAlign = Paint.Align.LEFT
+        val swatch = 20f * density
+        val gap = 8f * density
+        val swatchY = baselineY - labelPaint.textSize / 3f
+        var x = 8f * density
+        val unit = context.getString(R.string.trace_axis_consumption)
+        canvas.drawText(unit, x, baselineY, labelPaint)
+        x += labelPaint.measureText(unit) + 3 * gap
+        listOf(
+            abovePaint to R.string.trace_legend_above,
+            belowPaint to R.string.trace_legend_below,
+            referencePaint to R.string.trace_legend_reference,
+        ).forEach { (paint, label) ->
+            canvas.drawLine(x, swatchY, x + swatch, swatchY, paint)
+            x += swatch + gap
+            val text = context.getString(label)
+            canvas.drawText(text, x, baselineY, labelPaint)
+            x += labelPaint.measureText(text) + 3 * gap
+        }
     }
 
     private fun format(pattern: String, value: Number) =

app/src/main/java/com/evsuite/chargepilot/ConsumptionTraceView.kt

@@ -105,12 +105,15 @@ class EcoCoach(context: Context) {
      * an app that ignored the switch, so the enabled-but-silent case says which it is — the same
      * rule every other unavailable value on this screen follows. It stays a statement about the
      * measurement rather than a promise: the levers need either a fitted model or a few minutes
-     * of movement, and neither is a thing the driver can press.
+     * of movement, and neither is a thing the driver can press. Once that minute of movement is
+     * there and nothing crossed a threshold, the line says so with the figure it measured —
+     * a calm drive kept "a few minutes are needed" on screen for the whole of it.
      */
     fun line(verdict: EcoVerdict): String? {
         if (!adviceEnabled(app)) return null
-        val advice = verdict.advice ?: return app.getString(R.string.eco_advice_waiting)
-        return sentence(advice) ?: app.getString(R.string.eco_advice_waiting)
+        verdict.advice?.let(::sentence)?.let { return it }
+        val share = monitor.harshSharePercent() ?: return app.getString(R.string.eco_advice_waiting)
+        return app.getString(R.string.eco_advice_calm, share.roundToInt())
     }
 
     /**

app/src/main/java/com/evsuite/chargepilot/EcoCoach.kt

@@ -191,8 +191,13 @@ object EcoTripReviewer {
         )
     }
 
+    /**
+     * Whatever the share, once the track holds a minute of movement. A calm drive is a result
+     * too: below the live advice threshold it used to drop out, and a calm drive with no fitted
+     * model yet then read "nothing measurable" although its whole track had been measured.
+     */
     private fun steadiness(monitor: EcoDrivingMonitor): EcoFinding.Steadiness? =
-        monitor.steadiness()?.harshSharePercent?.let(EcoFinding::Steadiness)
+        monitor.harshSharePercent()?.let(EcoFinding::Steadiness)
 
     private fun format(value: Double): String = String.format(Locale.ROOT, "%.2f", value)
 }

app/src/main/java/com/evsuite/chargepilot/EcoTripReview.kt

@@ -483,6 +483,7 @@ Consommation %6$s %% par km</string>
     <string name="eco_advice_cruise">À %1$d plutôt que %2$d km/h, cette route coûte environ %3$d %% de moins.</string>
     <string name="eco_advice_steadiness">Accélérations franches sur %1$d %% de ce trajet ; la même route à vitesse stable coûte moins.</string>
     <string name="eco_advice_waiting">Rien à dire pour l’instant — il faut quelques minutes de route avant qu’un conseil apparaisse ici.</string>
+    <string name="eco_advice_calm">Rien à signaler : accélérations fortes sur %1$d %% de la conduite récente.</string>
     <string name="eco_settings_title">Assistant d’éco-conduite</string>
     <string name="eco_settings_advice">Afficher les conseils de conduite</string>
     <string name="eco_settings_voice">Énoncer les conseils</string>
@@ -516,6 +517,11 @@ Consommation %6$s %% par km</string>
     <string name="trip_overview_no_driving">Aucune conduite avec vitesse et puissance enregistrées sur cette fenêtre.</string>
     <string name="trip_overview_legend">Pointillés : votre référence, %1$s. Ambre au-dessus, bleu en dessous. Double tap sur un graphique pour le plein écran.</string>
     <string name="trip_overview_trace_description">Consommation nette des derniers %1$s comparée à votre référence</string>
+    <string name="trace_axis_consumption">kWh/100 km</string>
+    <string name="trace_axis_distance">km avant maintenant</string>
+    <string name="trace_legend_above">Au-dessus</string>
+    <string name="trace_legend_below">En dessous</string>
+    <string name="trace_legend_reference">Référence</string>
     <string name="trip_card_current">Trajet actuel</string>
     <string name="trip_card_since_charge">Depuis la recharge</string>
     <string name="trip_card_trip_a">Trajet A</string>

app/src/main/res/values-fr/strings.xml

@@ -493,6 +493,7 @@ Spending %6$s %% per km</string>
     <string name="eco_advice_cruise">At %1$d rather than %2$d km/h, this road costs about %3$d %% less.</string>
     <string name="eco_advice_steadiness">Hard acceleration on %1$d %% of this drive; the same road at a steady speed costs less.</string>
     <string name="eco_advice_waiting">Nothing to say yet — a few minutes of driving are needed before a line appears here.</string>
+    <string name="eco_advice_calm">Nothing to point out: hard acceleration on %1$d %% of recent driving.</string>
     <string name="eco_settings_title">Eco-driving coach</string>
     <string name="eco_settings_advice">Show driving advice</string>
     <string name="eco_settings_voice">Speak the advice</string>
@@ -527,6 +528,11 @@ Spending %6$s %% per km</string>
     <string name="trip_overview_no_driving">No driving with speed and power recorded in this window yet.</string>
     <string name="trip_overview_legend">Dashed line: your reference, %1$s. Amber above it, blue below. Double-tap a graph for full screen.</string>
     <string name="trip_overview_trace_description">Net consumption over the last %1$s against your reference</string>
+    <string name="trace_axis_consumption">kWh/100 km</string>
+    <string name="trace_axis_distance">km before now</string>
+    <string name="trace_legend_above">Above reference</string>
+    <string name="trace_legend_below">Below reference</string>
+    <string name="trace_legend_reference">Reference</string>
     <string name="trip_card_current">Current trip</string>
     <string name="trip_card_since_charge">Since last charge</string>
     <string name="trip_card_trip_a">Trip A</string>

app/src/main/res/values/strings.xml

@@ -236,7 +236,7 @@ class EcoTripReviewTest {
     @Test
     fun `nothing measurable is a stated reason rather than an empty review`() {
         val result = review(
-            trip = trip(endSoc = 89f, samples = track(speedKmh = 30f)),
+            trip = trip(endSoc = 89f, samples = null),
             socModel = null,
             attribution = null,
             whatIf = null,
@@ -247,6 +247,17 @@ class EcoTripReviewTest {
         )
     }
 
+    @Test
+    fun `a calm drive is reviewed even before any model is trained`() {
+        val result = review(
+            trip = trip(endSoc = 89f, samples = track(speedKmh = 30f)),
+            socModel = null,
+            attribution = null,
+            whatIf = null,
+        ) as EcoTripReview.Ready
+        assertEquals(listOf(EcoFinding.Steadiness(0.0)), result.findings)
+    }
+
     @Test
     fun `describe carries the verdict and every finding it kept`() {
         val lines = EcoTripReviewer.describe(review(trip = trip(samples = harshTrack())))