feat: Android widget support for smart mode redesign

pairs with evcc-io/evcc#32490 and mirrors targets/widget/Loadpoint.swift's
handling from evcc-io#246, which this branch picked up via a rebase onto
main. Detects smart-mode servers via loadpoints[].alwaysCharge, switching the
selector to off/smart/now (with device-class labels for continuous heat pumps
and switchable devices) while old servers keep off/pv/minpv/now unchanged. A
read-only "∞" marks the Smart chip when Always charge is on/once, no toggle in
the widget yet, matching iOS.

Also fixes a bug the rebase's auto-merge introduced: the frozen pv/minpv
legacy-label loop wrote straight into `strings`, a variable that in this
branch is now built later from an intermediate `translations` map (added here
to share resolved strings between the iOS and Android generators) - it was
referencing `strings` before its declaration.

Author: webalexeu

scripts/build-widget-strings.mts

@@ -198,13 +198,12 @@ for (const [key, src] of Object.entries(KEYS)) {
   translations[key] = byLocale;
 }
 
-for (const [iosKey, frozen] of Object.entries(FROZEN)) {
-  const localizations: Record<string, unknown> = {};
+for (const [key, frozen] of Object.entries(FROZEN)) {
+  const byLocale: Record<string, string> = {};
   for (const locale of locales) {
-    const value = frozen[locale] ?? frozen[locale.split("-")[0]] ?? frozen[SOURCE_LANG];
-    localizations[locale] = { stringUnit: { state: "translated", value } };
+    byLocale[locale] = frozen[locale] ?? frozen[locale.split("-")[0]] ?? frozen[SOURCE_LANG];
   }
-  strings[iosKey] = { extractionState: "manual", localizations };
+  translations[key] = byLocale;
 }
 
 if (missing.length) {

targets/android-widget/README.md

@@ -74,6 +74,15 @@ Done:
   already resizable (`resizeMode="horizontal|vertical"`); this just makes the
   wider layout actually render something different once resized. The forecast
   widgets don't have an iOS size-variant precedent, so they stay single-size.
+- **Smart mode redesign** (mirrors iOS's `Loadpoint.swift`/#246): `Loadpoint`
+  gained `alwaysCharge`/`chargerFeatureContinuous`. Its presence detects
+  smart-mode servers (`off/smart/now`, with per-device-class labels - e.g.
+  continuous heat pumps get Normal/Boost, switchable devices get On) vs. old
+  servers (`off/pv/minpv/now`, unchanged). `modeChipLabel()` appends a
+  read-only "∞" to the Smart chip when Always charge is on/once - no toggle in
+  the widget, matching iOS. `widget.mode.pv`/`widget.mode.minpv` stay in the
+  strings script as frozen (non-Weblate) translations since evcc removed them
+  from its own i18n once the redesign shipped.
 
 Not done yet (follow-ups for parity with iOS): none currently tracked -
 remaining gaps (reload button, deep links, spline chart smoothing) are

targets/android-widget/kotlin/ApiClient.kt

@@ -100,11 +100,13 @@ data class Loadpoint(
     val sessionEnergy: Double?,
     val chargedEnergy: Double?,
     val mode: String?,
+    val alwaysCharge: String?,
     val charging: Boolean,
     val connected: Boolean,
     val enabled: Boolean,
     val chargerFeatureHeating: Boolean,
     val chargerFeatureSwitchDevice: Boolean,
+    val chargerFeatureContinuous: Boolean,
     val ui: LoadpointUi?,
 ) {
     companion object {
@@ -124,11 +126,13 @@ data class Loadpoint(
                 sessionEnergy = d("sessionEnergy"),
                 chargedEnergy = d("chargedEnergy"),
                 mode = o.optString("mode").takeIf { it.isNotEmpty() },
+                alwaysCharge = if (o.has("alwaysCharge") && !o.isNull("alwaysCharge")) o.optString("alwaysCharge") else null,
                 charging = o.optBoolean("charging", false),
                 connected = o.optBoolean("connected", false),
                 enabled = o.optBoolean("enabled", false),
                 chargerFeatureHeating = o.optBoolean("chargerFeatureHeating", false),
                 chargerFeatureSwitchDevice = o.optBoolean("chargerFeatureSwitchDevice", false),
+                chargerFeatureContinuous = o.optBoolean("chargerFeatureContinuous", false),
                 ui = ui,
             )
         }.getOrNull()

targets/android-widget/kotlin/LoadpointWidget.kt

@@ -60,13 +60,38 @@ private val WIDE_SIZE = DpSize(340.dp, 110.dp)
 // Row measurements are unreliable right at a boundary on some launchers, so
 // the switch-over threshold sits well below WIDE_SIZE's width.
 private val WIDE_THRESHOLD = 260.dp
-// visible (not private) so the config activities can reuse them for previews
-fun modeLabel(context: Context, mode: String): String = when (mode) {
-    "off" -> context.getString(R.string.widget_mode_off)
-    "pv" -> context.getString(R.string.widget_mode_pv)
-    "minpv" -> context.getString(R.string.widget_mode_minpv)
-    "now" -> context.getString(R.string.widget_mode_now)
-    else -> mode
+// visible (not private) so the config activities can reuse them for previews.
+// mirrors Loadpoint.swift's `item()` closure: on smart-mode servers (detected
+// by the presence of `alwaysCharge`) the same raw mode can carry a
+// device-class-specific label (off->Normal, now->Boost/On) for continuous
+// heat pumps / switchable devices.
+fun modeLabel(context: Context, lp: Loadpoint, mode: String): String {
+    val smartModeServer = lp.alwaysCharge != null
+    if (smartModeServer) {
+        if (mode == "off" && lp.chargerFeatureContinuous) return context.getString(R.string.widget_mode_normal)
+        if (mode == "now") {
+            if (lp.chargerFeatureContinuous) return context.getString(R.string.widget_mode_boost)
+            if (lp.chargerFeatureSwitchDevice) return context.getString(R.string.widget_mode_on)
+        }
+    }
+    return when (mode) {
+        "off" -> context.getString(R.string.widget_mode_off)
+        "smart" -> context.getString(R.string.widget_mode_smart)
+        "pv" -> context.getString(R.string.widget_mode_pv)
+        "minpv" -> context.getString(R.string.widget_mode_minpv)
+        "now" -> context.getString(R.string.widget_mode_now)
+        else -> mode
+    }
+}
+
+fun alwaysChargeActive(lp: Loadpoint): Boolean = lp.alwaysCharge == "on" || lp.alwaysCharge == "once"
+
+// label plus a read-only "∞" marker on the Smart chip when Always charge is
+// on/once (mirrors the SF Symbol "infinity" shown next to Smart in
+// LoadpointViews.swift; no toggle in the widget for now, matches iOS)
+fun modeChipLabel(context: Context, lp: Loadpoint, mode: String): String {
+    val label = modeLabel(context, lp, mode)
+    return if (mode == "smart" && alwaysChargeActive(lp)) "$label ∞" else label
 }
 
 enum class LpStatus(val active: Boolean) {
@@ -133,8 +158,11 @@ fun title(context: Context, lp: Loadpoint): String {
     return vt.ifEmpty { lp.title ?: context.getString(R.string.widget_loadpoint_name) }
 }
 
-fun modes(lp: Loadpoint): List<String> =
-    if (lp.chargerFeatureSwitchDevice) listOf("off", "pv", "now") else listOf("off", "pv", "minpv", "now")
+fun modes(lp: Loadpoint): List<String> = when {
+    lp.alwaysCharge != null -> listOf("off", "smart", "now")
+    lp.chargerFeatureSwitchDevice -> listOf("off", "pv", "now")
+    else -> listOf("off", "pv", "minpv", "now")
+}
 
 class LoadpointWidget : GlanceAppWidget() {
     override val sizeMode = SizeMode.Responsive(setOf(SMALL_SIZE, WIDE_SIZE))
@@ -266,7 +294,7 @@ class LoadpointWidget : GlanceAppWidget() {
         Row {
             modes(state.lp).forEachIndexed { i, mode ->
                 if (i > 0) Spacer(GlanceModifier.width(4.dp))
-                ModeChip(context, mode = mode, current = state.lp.mode, serverId = state.serverId, lpIndex = state.lpIndex)
+                ModeChip(context, lp = state.lp, mode = mode, serverId = state.serverId, lpIndex = state.lpIndex)
             }
         }
     }
@@ -278,7 +306,7 @@ class LoadpointWidget : GlanceAppWidget() {
         modes(state.lp).forEachIndexed { i, mode ->
             if (i > 0) Spacer(GlanceModifier.height(6.dp))
             ModeChip(
-                context, mode = mode, current = state.lp.mode, serverId = state.serverId, lpIndex = state.lpIndex,
+                context, lp = state.lp, mode = mode, serverId = state.serverId, lpIndex = state.lpIndex,
                 modifier = GlanceModifier.fillMaxWidth().defaultWeight(),
             )
         }
@@ -287,13 +315,13 @@ class LoadpointWidget : GlanceAppWidget() {
     @Composable
     private fun ModeChip(
         context: Context,
+        lp: Loadpoint,
         mode: String,
-        current: String?,
         serverId: String,
         lpIndex: Int,
         modifier: GlanceModifier = GlanceModifier,
     ) {
-        val selected = mode == current
+        val selected = mode == lp.mode
         Box(
             modifier = modifier
                 .background(if (selected) modeSelectedBackground else modeUnselectedBackground)
@@ -311,7 +339,7 @@ class LoadpointWidget : GlanceAppWidget() {
             contentAlignment = Alignment.Center,
         ) {
             Text(
-                text = modeLabel(context, mode),
+                text = modeChipLabel(context, lp, mode),
                 style = modeChipStyle.copy(color = if (selected) modeSelectedText else modeUnselectedText),
             )
         }

targets/android-widget/kotlin/WidgetPreview.kt

@@ -136,7 +136,7 @@ object WidgetPreview {
         val chipsRow = LinearLayout(context).apply { orientation = LinearLayout.HORIZONTAL }
         modes(lp).forEachIndexed { i, mode ->
             if (i > 0) chipsRow.addView(View(context).apply { layoutParams = LinearLayout.LayoutParams(d(4), 1) })
-            chipsRow.addView(chip(context, modeLabel(context, mode), mode == lp.mode, dark))
+            chipsRow.addView(chip(context, modeChipLabel(context, lp, mode), mode == lp.mode, dark))
         }
         root.addView(chipsRow)
 

targets/android-widget/res/values-b+ar/strings.xml

@@ -30,10 +30,14 @@
     <string name="widget_lpstatus_disconnected">Disconnected.</string>
     <string name="widget_lpstatus_finished">Finished.</string>
     <string name="widget_lpstatus_waitForVehicle">Ready. Waiting for vehicle…</string>
+    <string name="widget_mode_boost">Boost</string>
     <string name="widget_mode_minpv">Min+Solar</string>
+    <string name="widget_mode_normal">Normal</string>
     <string name="widget_mode_now">Fast</string>
     <string name="widget_mode_off">Off</string>
+    <string name="widget_mode_on">On</string>
     <string name="widget_mode_pv">Solar</string>
+    <string name="widget_mode_smart">Smart</string>
     <string name="widget_name_co2">CO₂</string>
     <string name="widget_name_feedin">Grid export price</string>
     <string name="widget_name_price">Grid import price</string>

targets/android-widget/res/values-b+bs/strings.xml

@@ -30,10 +30,14 @@
     <string name="widget_lpstatus_disconnected">Disconnected.</string>
     <string name="widget_lpstatus_finished">Finished.</string>
     <string name="widget_lpstatus_waitForVehicle">Ready. Waiting for vehicle…</string>
+    <string name="widget_mode_boost">Boost</string>
     <string name="widget_mode_minpv">Min+Solar</string>
+    <string name="widget_mode_normal">Normal</string>
     <string name="widget_mode_now">Fast</string>
     <string name="widget_mode_off">Off</string>
+    <string name="widget_mode_on">On</string>
     <string name="widget_mode_pv">Solar</string>
+    <string name="widget_mode_smart">Smart</string>
     <string name="widget_name_co2">CO₂</string>
     <string name="widget_name_feedin">Grid export price</string>
     <string name="widget_name_price">Grid import price</string>

targets/android-widget/res/values-b+cs/strings.xml

@@ -30,10 +30,14 @@
     <string name="widget_lpstatus_disconnected">Odpojeno.</string>
     <string name="widget_lpstatus_finished">Dokončeno.</string>
     <string name="widget_lpstatus_waitForVehicle">Připraveno. Čekám na vozidlo…</string>
+    <string name="widget_mode_boost">Boost</string>
     <string name="widget_mode_minpv">Min+Solar</string>
+    <string name="widget_mode_normal">Normal</string>
     <string name="widget_mode_now">Rychlé</string>
     <string name="widget_mode_off">Vypnuto</string>
+    <string name="widget_mode_on">On</string>
     <string name="widget_mode_pv">Solár</string>
+    <string name="widget_mode_smart">Chytrý</string>
     <string name="widget_name_co2">CO₂</string>
     <string name="widget_name_feedin">Grid export price</string>
     <string name="widget_name_price">Grid import price</string>

targets/android-widget/res/values-b+da/strings.xml

@@ -30,10 +30,14 @@
     <string name="widget_lpstatus_disconnected">Afbrudt.</string>
     <string name="widget_lpstatus_finished">Færdig.</string>
     <string name="widget_lpstatus_waitForVehicle">Parat. Venter på køretøj…</string>
+    <string name="widget_mode_boost">Boost</string>
     <string name="widget_mode_minpv">Min+Sol</string>
+    <string name="widget_mode_normal">Normal</string>
     <string name="widget_mode_now">Hurtig</string>
     <string name="widget_mode_off">Fra</string>
+    <string name="widget_mode_on">On</string>
     <string name="widget_mode_pv">Sol</string>
+    <string name="widget_mode_smart">Smart</string>
     <string name="widget_name_co2">CO₂</string>
     <string name="widget_name_feedin">Grid export price</string>
     <string name="widget_name_price">Grid import price</string>

targets/android-widget/res/values-b+de/strings.xml

@@ -30,10 +30,14 @@
     <string name="widget_lpstatus_disconnected">Nicht verbunden.</string>
     <string name="widget_lpstatus_finished">Abgeschlossen.</string>
     <string name="widget_lpstatus_waitForVehicle">Ladebereit. Warte auf Fahrzeug …</string>
+    <string name="widget_mode_boost">Boost</string>
     <string name="widget_mode_minpv">Min+PV</string>
+    <string name="widget_mode_normal">Normal</string>
     <string name="widget_mode_now">Schnell</string>
     <string name="widget_mode_off">Aus</string>
+    <string name="widget_mode_on">An</string>
     <string name="widget_mode_pv">PV</string>
+    <string name="widget_mode_smart">Smart</string>
     <string name="widget_name_co2">CO₂</string>
     <string name="widget_name_feedin">Einspeisevergütung</string>
     <string name="widget_name_price">Netzbezugspreis</string>