Watch: dashes for offline metrics, accent speed, gauge band follows phone

Header on the second page reads just "Disconnected" instead of "Wheel
disconnected". Every metric except speed renders as an em-dash when the
wheel isn't connected — voltage, current, power, PWM, temp, torque, trip,
and the wheel battery chip on page one. Speed stays at 0 (and is now
tinted with the accent color while disconnected so it doesn't read as a
green-tier 'idle' value).

PWM display option renamed Numbers to Text in the picker. When the
indicator is set to Text-only the watch shows "Load (PWM): N%" instead
of a bare percentage so the rider has the label without the bar.

Speed gauge color band now follows the phone Display setting
(showGaugeColorBand + orange/red threshold percentages) so toggling it
on the phone reflects on the watch within a publish cycle.

Horn and light buttons stay on the dashboard while disconnected,
greyed rather than hidden. The hasHorn / hasLight defaults flip to
true so the buttons render before the first push from the phone.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: eried

app/src/main/java/com/eried/eucplanet/wear/WearBridge.kt

@@ -76,6 +76,9 @@ class WearBridge @Inject constructor(
         private const val K_OPT_SHOW_WATCH_BATT = "wwb"
         private const val K_OPT_PWM_DISPLAY = "wpd"
         private const val K_OPT_SHOW_SPEED_UNIT = "wsu"
+        private const val K_OPT_GAUGE_BAND = "wgb"
+        private const val K_OPT_GAUGE_ORANGE = "wgo"
+        private const val K_OPT_GAUGE_RED = "wgr"
 
         private const val PATH_WAKE = "/euc/wake"
     }
@@ -169,6 +172,9 @@ class WearBridge @Inject constructor(
                 dataMap.putBoolean(K_OPT_SHOW_WATCH_BATT, settings.watchShowWatchBattery)
                 dataMap.putString(K_OPT_PWM_DISPLAY, settings.watchPwmDisplay)
                 dataMap.putBoolean(K_OPT_SHOW_SPEED_UNIT, settings.watchShowSpeedUnit)
+                dataMap.putBoolean(K_OPT_GAUGE_BAND, settings.showGaugeColorBand)
+                dataMap.putInt(K_OPT_GAUGE_ORANGE, settings.gaugeOrangeThresholdPct)
+                dataMap.putInt(K_OPT_GAUGE_RED, settings.gaugeRedThresholdPct)
                 // DataItems dedupe by content. Bumping a timestamp guarantees
                 // the watch sees every snapshot when the values stop changing
                 // (e.g. wheel idle, but we want the connection-state heartbeat).

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

@@ -98,7 +98,7 @@
     <string name="watch_show_watch_battery">Show watch battery</string>
     <string name="watch_pwm_display">Load (PWM) indicator</string>
     <string name="watch_pwm_bar">Bar</string>
-    <string name="watch_pwm_numbers">Numbers</string>
+    <string name="watch_pwm_numbers">Text</string>
     <string name="watch_pwm_both">Both</string>
     <string name="watch_show_speed_unit">Speed unit label</string>
     <string name="watch_show_speed_unit_desc">Show the unit label next to the big speed number</string>

wear/src/main/java/com/eried/eucplanet/wear/bridge/WatchBridgeService.kt

@@ -54,7 +54,10 @@ class WatchBridgeService : WearableListenerService() {
                         showPhoneBattery = map.getBoolean(WatchKeys.OPT_SHOW_PHONE_BATT, true),
                         showWatchBattery = map.getBoolean(WatchKeys.OPT_SHOW_WATCH_BATT, true),
                         pwmDisplay = map.getString(WatchKeys.OPT_PWM_DISPLAY, "BOTH") ?: "BOTH",
-                        showSpeedUnit = map.getBoolean(WatchKeys.OPT_SHOW_SPEED_UNIT, true)
+                        showSpeedUnit = map.getBoolean(WatchKeys.OPT_SHOW_SPEED_UNIT, true),
+                        showGaugeBand = map.getBoolean(WatchKeys.OPT_GAUGE_BAND, false),
+                        gaugeOrangeThresholdPct = map.getInt(WatchKeys.OPT_GAUGE_ORANGE, 65),
+                        gaugeRedThresholdPct = map.getInt(WatchKeys.OPT_GAUGE_RED, 85)
                     )
                 )
             }

wear/src/main/java/com/eried/eucplanet/wear/bridge/WatchProtocol.kt

@@ -49,6 +49,13 @@ object WatchKeys {
     /** "BAR" / "NUMBERS" / "BOTH". */
     const val OPT_PWM_DISPLAY = "wpd"
     const val OPT_SHOW_SPEED_UNIT = "wsu"
+    /** Phone's `showGaugeColorBand` toggle. When false, the gauge stays
+     *  monochrome on the watch too. */
+    const val OPT_GAUGE_BAND = "wgb"
+    /** Phone's orange-zone threshold percentage of the speed range. */
+    const val OPT_GAUGE_ORANGE = "wgo"
+    /** Phone's red-zone threshold percentage. */
+    const val OPT_GAUGE_RED = "wgr"
 }
 
 object WatchControl {
@@ -90,8 +97,12 @@ data class WatchState(
     val torque: Float = 0f,
     val lightOn: Boolean = false,
     val maxSpeedKmh: Float = 0f,
-    val hasHorn: Boolean = false,
-    val hasLight: Boolean = false,
+    // Default both to true so the disconnected dashboard still renders the
+    // (greyed) horn + light buttons — V14 family always has these and the
+    // watch never sees a wheel without them. Phone's WearBridge will overwrite
+    // with the wheel's actual capabilities once telemetry starts.
+    val hasHorn: Boolean = true,
+    val hasLight: Boolean = true,
     val imperialUnits: Boolean = false,
     val accentKey: String = "default",
     // Watch UI options sourced from phone Settings.
@@ -100,5 +111,8 @@ data class WatchState(
     val showPhoneBattery: Boolean = true,
     val showWatchBattery: Boolean = true,
     val pwmDisplay: String = "BOTH",
-    val showSpeedUnit: Boolean = true
+    val showSpeedUnit: Boolean = true,
+    val showGaugeBand: Boolean = false,
+    val gaugeOrangeThresholdPct: Int = 65,
+    val gaugeRedThresholdPct: Int = 85
 )

wear/src/main/java/com/eried/eucplanet/wear/ui/WatchApp.kt

@@ -58,6 +58,9 @@ import com.eried.eucplanet.wear.bridge.WatchControl
 import com.eried.eucplanet.wear.bridge.WatchState
 import com.eried.eucplanet.wear.bridge.WatchStateRepository
 
+/** Em-dash placeholder used when a metric isn't live. Matches the phone dashboard. */
+private const val DASH = "—"
+
 /**
  * Two-page horizontal pager: page 0 is the dashboard (gauge + horn/light);
  * page 1 is the detail strip (voltage / current / PWM / temp / trip / torque).
@@ -108,13 +111,17 @@ private fun MainScreen(state: WatchState, accent: Color) {
         val centerOffsetY = -(sw * 0.06f).coerceIn(18f, 28f).dp
         val watchPercent = rememberWatchBatteryPercent()
 
-        // Full-bleed dial as the background frame.
+        // Full-bleed dial as the background frame. Color-band visibility and
+        // its orange/red thresholds follow the phone's Display settings so the
+        // two surfaces always agree.
         SpeedGauge(
             speed = state.speedKmh,
             maxSpeed = maxSpeed,
             imperial = state.imperialUnits,
             accent = accent,
-            showColorBand = true,
+            showColorBand = state.showGaugeBand,
+            orangeThresholdPct = state.gaugeOrangeThresholdPct,
+            redThresholdPct = state.gaugeRedThresholdPct,
             fullBleed = true,
             drawSpeedText = false,
             modifier = Modifier.fillMaxSize()
@@ -150,7 +157,11 @@ private fun MainScreen(state: WatchState, accent: Color) {
                     text = "%.0f".format(WatchUnits.speed(state.speedKmh, state.imperialUnits)),
                     fontSize = speedFontSp,
                     fontWeight = FontWeight.Bold,
-                    color = speedTierColor(state.speedKmh, maxSpeed)
+                    // Disconnected: use the accent color so the dashboard
+                    // matches the gauge's safe-band tint instead of the
+                    // green-tier "0" that reads as if the wheel were idle.
+                    color = if (state.connected) speedTierColor(state.speedKmh, maxSpeed)
+                            else accent
                 )
                 if (state.showSpeedUnit) {
                     Spacer(Modifier.width(3.dp))
@@ -183,11 +194,20 @@ private fun MainScreen(state: WatchState, accent: Color) {
                     }
                     if (showBar && showPwmNumber) Spacer(Modifier.width(6.dp))
                     if (showPwmNumber) {
+                        // When the bar is alongside, the "%" is enough — the
+                        // bar itself is the visual context. Text-only mode
+                        // gets a full "Load (PWM): N%" label since there's no
+                        // bar to clue the rider in.
+                        val pwmText = when {
+                            !state.connected -> if (showBar) DASH else "Load (PWM): $DASH"
+                            showBar -> "%.0f%%".format(state.pwmPercent)
+                            else -> "Load (PWM): %.0f%%".format(state.pwmPercent)
+                        }
                         Text(
-                            text = "%.0f%%".format(state.pwmPercent),
+                            text = pwmText,
                             fontSize = pwmNumberSp,
                             fontWeight = FontWeight.Medium,
-                            color = pwmTierColor(state.pwmPercent)
+                            color = if (state.connected) pwmTierColor(state.pwmPercent) else Color(0xFF606060)
                         )
                     }
                 }
@@ -204,9 +224,10 @@ private fun MainScreen(state: WatchState, accent: Color) {
             verticalArrangement = Arrangement.spacedBy((sw * 0.018f).coerceIn(5f, 9f).dp)
         ) {
             BatteryRow(
-                wheelPercent = state.batteryPercent.takeIf { state.showWheelBattery },
+                wheelPercent = state.batteryPercent.takeIf { state.showWheelBattery && state.connected },
                 phonePercent = state.phoneBatteryPercent.takeIf { state.showPhoneBattery },
                 watchPercent = watchPercent.takeIf { state.showWatchBattery },
+                showWheelChip = state.showWheelBattery,
                 fontSize = batteryFontSp,
                 iconSize = batteryIconDp,
                 spacing = batterySpacingDp
@@ -259,6 +280,7 @@ private fun BatteryRow(
     wheelPercent: Int?,
     phonePercent: Int?,
     watchPercent: Int?,
+    showWheelChip: Boolean,
     fontSize: TextUnit,
     iconSize: Dp,
     spacing: Dp
@@ -267,9 +289,14 @@ private fun BatteryRow(
         horizontalArrangement = Arrangement.spacedBy(spacing),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        if (wheelPercent != null) BatteryChip(Icons.Filled.ElectricScooter, wheelPercent, fontSize, iconSize)
-        if (phonePercent != null) BatteryChip(Icons.Filled.PhoneAndroid, phonePercent, fontSize, iconSize)
-        if (watchPercent != null) BatteryChip(Icons.Filled.Watch, watchPercent, fontSize, iconSize)
+        // Wheel chip is visible when the user enabled it; disconnected shows
+        // an em-dash so the row layout stays put rather than collapsing the
+        // moment a wheel drops out.
+        if (showWheelChip) {
+            BatteryChip(Icons.Filled.ElectricScooter, wheelPercent, fontSize, iconSize)
+        }
+        phonePercent?.let { BatteryChip(Icons.Filled.PhoneAndroid, it, fontSize, iconSize) }
+        watchPercent?.let { BatteryChip(Icons.Filled.Watch, it, fontSize, iconSize) }
     }
 }
 
@@ -281,8 +308,8 @@ private fun pwmTierColor(percent: Float): Color = when {
 }
 
 @Composable
-private fun BatteryChip(icon: ImageVector, percent: Int, fontSize: TextUnit, iconSize: Dp) {
-    val tint = batteryTint(percent)
+private fun BatteryChip(icon: ImageVector, percent: Int?, fontSize: TextUnit, iconSize: Dp) {
+    val tint = if (percent != null) batteryTint(percent) else Color(0xFF606060)
     Row(verticalAlignment = Alignment.CenterVertically) {
         Icon(
             imageVector = icon,
@@ -292,7 +319,7 @@ private fun BatteryChip(icon: ImageVector, percent: Int, fontSize: TextUnit, ico
         )
         Spacer(Modifier.width(2.dp))
         Text(
-            text = "$percent",
+            text = percent?.toString() ?: DASH,
             fontSize = fontSize,
             color = tint,
             fontWeight = FontWeight.Medium
@@ -429,13 +456,14 @@ private fun DetailsScreen(state: WatchState, accent: Color) {
                 color = Color.White
             )
             Spacer(Modifier.height(4.dp))
-            DetailRow(R.string.watch_voltage_label, "%.1f V".format(state.voltage), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_current_label, "%.1f A".format(state.current), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_power_label, "%.0f W".format(powerW), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_pwm_label, "%.0f %%".format(state.pwmPercent), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_temp_label, "%.0f %s".format(tempDisplay, tempUnit), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_torque_label, "%.1f".format(state.torque), labelSp, valueSp, labelWidth, valueWidth)
-            DetailRow(R.string.watch_trip_label, "%.2f %s".format(tripDisplay, distUnit), labelSp, valueSp, labelWidth, valueWidth)
+            val live = state.connected
+            DetailRow(R.string.watch_voltage_label, if (live) "%.1f V".format(state.voltage) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_current_label, if (live) "%.1f A".format(state.current) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_power_label, if (live) "%.0f W".format(powerW) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_pwm_label, if (live) "%.0f %%".format(state.pwmPercent) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_temp_label, if (live) "%.0f %s".format(tempDisplay, tempUnit) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_torque_label, if (live) "%.1f".format(state.torque) else DASH, labelSp, valueSp, labelWidth, valueWidth)
+            DetailRow(R.string.watch_trip_label, if (live) "%.2f %s".format(tripDisplay, distUnit) else DASH, labelSp, valueSp, labelWidth, valueWidth)
         }
     }
 }

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

@@ -3,7 +3,7 @@
     <string name="app_name">EUC Planet</string>
     <string name="watch_waiting_phone">Open EUC Planet\non your phone</string>
     <string name="watch_waiting_wheel">Connect a wheel\nin EUC Planet</string>
-    <string name="watch_disconnected">Wheel disconnected</string>
+    <string name="watch_disconnected">Disconnected</string>
     <string name="watch_horn">Horn</string>
     <string name="watch_light">Light</string>
     <string name="watch_speed_unit">km/h</string>