HealthStatsDialog: show per-weekday typical step totals

Surfaces the seven <weekday>_steps typical totals computed by
computeAllWeekdayTypicalSteps in the Health Debug Stats dialog so
the values pushed to the watch can be sanity-checked from the phone.
Each row sums the 96 15-min bins of that weekday's payload
(matching the firmware's prv_cur_step_avg sum semantics), or
shows "--" for weekdays below the 2-day minimum-history threshold.

New decodeTypicalStepTotal helper in HealthStatsSync encapsulates the
wire-format knowledge; HealthDebugStats gains a weekdayTypicalSteps
field; Health.getHealthDebugStats and FakeLibPebble.getHealthDebugStats
populate it; the iOS healthDebugStatsToJson includes it.

Author: aveao

libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/connection/FakeLibPebble.kt

@@ -379,7 +379,8 @@ class FakeLibPebble : LibPebble {
             todaySteps = 0L,
             lastNightSleepHours = null,
             latestDataTimestamp = null,
-            daysOfData = 0
+            daysOfData = 0,
+            weekdayTypicalSteps = emptyMap(),
         )
     }
 

libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/health/Health.kt

@@ -19,6 +19,8 @@ import io.rebble.libpebblecommon.datalogging.HealthDataProcessor
 import io.rebble.libpebblecommon.di.LibPebbleCoroutineScope
 import io.rebble.libpebblecommon.services.DailySleep
 import io.rebble.libpebblecommon.services.calculateHealthAverages
+import io.rebble.libpebblecommon.services.computeAllWeekdayTypicalSteps
+import io.rebble.libpebblecommon.services.decodeTypicalStepTotal
 import io.rebble.libpebblecommon.services.groupSleepSessions
 import io.rebble.libpebblecommon.services.fetchAndGroupDailySleep
 import io.rebble.libpebblecommon.services.updateHealthStatsInDatabase
@@ -94,6 +96,9 @@ class Health(
         val lastNightSleepHours =
             if (lastNightSleepSeconds > 0) lastNightSleepSeconds / 3600f else null
 
+        val weekdayTypicalSteps = computeAllWeekdayTypicalSteps(healthDao, today, timeZone)
+            .mapValues { (_, payload) -> decodeTypicalStepTotal(payload) }
+
         return HealthDebugStats(
             totalSteps30Days = averages.totalSteps,
             averageStepsPerDay = averages.averageStepsPerDay,
@@ -102,7 +107,8 @@ class Health(
             todaySteps = todaySteps,
             lastNightSleepHours = lastNightSleepHours,
             latestDataTimestamp = latestTimestamp,
-            daysOfData = daysOfData
+            daysOfData = daysOfData,
+            weekdayTypicalSteps = weekdayTypicalSteps,
         )
     }
 

libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/health/HealthRecords.kt

@@ -77,6 +77,10 @@ class RawOverlayRecord : StructMappable() {
 
 /**
  * Debug statistics for health data, used for diagnostics and testing.
+ *
+ * [weekdayTypicalSteps] carries the per-weekday typical-step totals computed for the
+ * `<weekday>_steps` BlobDB rows; absent keys are weekdays where the user has insufficient
+ * same-weekday history (we don't write a row for them, so the watch shows no comparison).
  */
 data class HealthDebugStats(
     val totalSteps30Days: Long,
@@ -86,5 +90,6 @@ data class HealthDebugStats(
     val todaySteps: Long,
     val lastNightSleepHours: Float?,
     val latestDataTimestamp: Long?,
-    val daysOfData: Int
+    val daysOfData: Int,
+    val weekdayTypicalSteps: Map<kotlinx.datetime.DayOfWeek, Int> = emptyMap(),
 )

libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/services/HealthStatsSync.kt

@@ -247,6 +247,29 @@ internal fun buildWeekdayTypicalsFromData(
  * Returns one entry per weekday that has at least [MIN_DAYS_FOR_TYPICAL] distinct matching days
  * in the queried window. Empty map when there's no data or no weekday clears the threshold.
  */
+/**
+ * Sums the 96 little-endian UShort step counts in a typical-step payload, skipping the
+ * UNKNOWN sentinel — i.e., "total typical steps for the day represented by this payload."
+ *
+ * Used by the debug stats dialog to surface the per-weekday typical totals; mirrors the
+ * watch firmware's [`prv_cur_step_avg`](activity_insights.c:1143) which sums the same
+ * array.
+ */
+internal fun decodeTypicalStepTotal(payload: ByteArray): Int {
+    require(payload.size == TYPICAL_STEP_BINS * UShort.SIZE_BYTES) {
+        "typical-step payload must be ${TYPICAL_STEP_BINS * UShort.SIZE_BYTES} bytes, got ${payload.size}"
+    }
+    var total = 0
+    for (slot in 0 until TYPICAL_STEP_BINS) {
+        val byteOffset = slot * 2
+        val lo = payload[byteOffset].toInt() and 0xFF
+        val hi = payload[byteOffset + 1].toInt() and 0xFF
+        val v = (hi shl 8) or lo
+        if (v != UNKNOWN_TYPICAL_STEPS.toInt()) total += v
+    }
+    return total
+}
+
 internal suspend fun computeAllWeekdayTypicalSteps(
     healthDao: HealthDao,
     today: LocalDate,

pebble/src/commonMain/kotlin/coredevices/pebble/ui/HealthStatsDialog.kt

@@ -35,6 +35,7 @@ import io.rebble.libpebblecommon.connection.LibPebble
 import io.rebble.libpebblecommon.health.HealthDebugStats
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.datetime.DayOfWeek
 import kotlin.time.Duration.Companion.seconds
 
 private val logger = Logger.withTag("HealthStatsDialog")
@@ -171,6 +172,35 @@ fun HealthStatsDialog(libPebble: LibPebble, onDismissRequest: () -> Unit) {
                                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
+
+                        Spacer(Modifier.height(4.dp))
+
+                        Text(
+                            "Typical steps by weekday",
+                            style = MaterialTheme.typography.bodyMedium,
+                        )
+                        for (wd in DayOfWeek.entries) {
+                            val total = s.weekdayTypicalSteps[wd]
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween
+                            ) {
+                                Text(
+                                    wd.name.lowercase().replaceFirstChar { it.uppercase() },
+                                    style = MaterialTheme.typography.bodySmall,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                )
+                                Text(
+                                    total?.toString() ?: "--",
+                                    style = MaterialTheme.typography.bodySmall,
+                                    color = if (total != null) {
+                                        MaterialTheme.colorScheme.onSurface
+                                    } else {
+                                        MaterialTheme.colorScheme.onSurfaceVariant
+                                    },
+                                )
+                            }
+                        }
                     }
                 } else {
                     Text(

pebble/src/iosMain/kotlin/coredevices/pebble/actions/watch/HealthStats.kt

@@ -8,5 +8,7 @@ import io.rebble.libpebblecommon.health.HealthDebugStats
 fun healthDebugStatsToJson(stats: HealthDebugStats): String {
     val lastNight = stats.lastNightSleepHours?.toString() ?: "null"
     val latestTs = stats.latestDataTimestamp?.toString() ?: "null"
-    return """{"totalSteps30Days":${stats.totalSteps30Days},"averageStepsPerDay":${stats.averageStepsPerDay},"totalSleepSeconds30Days":${stats.totalSleepSeconds30Days},"averageSleepSecondsPerDay":${stats.averageSleepSecondsPerDay},"todaySteps":${stats.todaySteps},"lastNightSleepHours":$lastNight,"latestDataTimestamp":$latestTs,"daysOfData":${stats.daysOfData}}"""
+    val typicalSteps = stats.weekdayTypicalSteps.entries
+        .joinToString(prefix = "{", postfix = "}") { (wd, total) -> "\"$wd\":$total" }
+    return """{"totalSteps30Days":${stats.totalSteps30Days},"averageStepsPerDay":${stats.averageStepsPerDay},"totalSleepSeconds30Days":${stats.totalSleepSeconds30Days},"averageSleepSecondsPerDay":${stats.averageSleepSecondsPerDay},"todaySteps":${stats.todaySteps},"lastNightSleepHours":$lastNight,"latestDataTimestamp":$latestTs,"daysOfData":${stats.daysOfData},"weekdayTypicalSteps":$typicalSteps}"""
 }