health: split typical pill into bin-time + daily-total on color

The activity-summary "typical" pill now exposes both the bin-aware
"by now" step count and the full-day weekday historical average,
laid out side by side on color displays (DISP_COLS > 144). Header
line stays "TYPICAL <day>"; below it a two-column row shows the bin
time on the left and the static TOTAL label on the right, each
underlined, with the corresponding value beneath. BW boards stay
two-line: TYPICAL <day> over the daily total alone, since they don't
have the room for the split.

Renderer-side changes:
- Add daily_total and bin_minute arguments to
  health_ui_render_typical_text_box. Sleep card passes -1/-1 to keep
  its single-value behavior; activity card passes the bin-aware step
  count as value_text plus the new numbers. Empty state still
  collapses to the em-dash via -1/-1.
- On color with both numbers present, the pill grows to 53px tall to
  fit the three rows. On BW (or color sleep), the pill keeps its
  original 35/36px height.

Data-layer change: re-add health_data_steps_get_current_average_minute
returning the minute-of-day of the latest completed step-average bin.
The activity card caches it on each layer update and passes it through
to the renderer. The lazy-refresh helper that backs both
health_data_steps_get_current_average and the new accessor is factored
out as prv_refresh_current_step_average.

Test fixture: pin RTC to Saturday 16:19:35 UTC and 24h clock format
so the rendered "16:15" bin time is deterministic in goldens. Each
test case seeds step_average_last_updated_time = 975 to match.
Regenerate activity-summary goldens on obelix/gabbro.

Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Ave Özkal <git@ave.zone>

Author: aveao

src/fw/apps/system/health/activity_summary_card.c

@@ -36,6 +36,7 @@ typedef struct HealthActivitySummaryCardData {
   KinoReel *icon;
   int32_t current_steps;
   int32_t typical_steps;
+  int32_t typical_steps_bin_minute;
   int32_t daily_average_steps;
 } HealthActivitySummaryCardData;
 
@@ -126,14 +127,19 @@ static void prv_render_typical_steps(GContext *ctx, Layer *base_layer) {
     snprintf(steps_buffer, sizeof(steps_buffer), EM_DASH);
   }
 
-  health_ui_render_typical_text_box(ctx, base_layer, steps_buffer);
+  // Only enable the split layout when the bin-aware count is known.
+  const int32_t daily_total = (data->typical_steps > 0) ? data->daily_average_steps : -1;
+  const int32_t bin_minute = (data->typical_steps > 0) ? data->typical_steps_bin_minute : -1;
+  health_ui_render_typical_text_box(ctx, base_layer, steps_buffer, daily_total, bin_minute);
 }
 
 static void prv_base_layer_update_proc(Layer *base_layer, GContext *ctx) {
   HealthActivitySummaryCardData *data = layer_get_data(base_layer);
 
   data->current_steps = health_data_current_steps_get(data->health_data);
   data->typical_steps = health_data_steps_get_current_average(data->health_data);
+  data->typical_steps_bin_minute =
+      health_data_steps_get_current_average_minute(data->health_data);
   data->daily_average_steps = health_data_steps_get_cur_wday_average(data->health_data);
 
   prv_render_icon(ctx, base_layer);

src/fw/apps/system/health/data.c

@@ -213,7 +213,7 @@ static int32_t prv_health_data_get_n_average_chunks(HealthData *health_data, int
   return total_steps_avg;
 }
 
-int32_t health_data_steps_get_current_average(HealthData *health_data) {
+static void prv_refresh_current_step_average(HealthData *health_data) {
   // get the current minutes into today
   time_t utc_sec = rtc_get_time();
   struct tm local_tm;
@@ -230,9 +230,18 @@ int32_t health_data_steps_get_current_average(HealthData *health_data) {
     health_data->step_average_last_updated_time =
         (today_min / k_minutes_per_step_avg) * k_minutes_per_step_avg;
   }
+}
+
+int32_t health_data_steps_get_current_average(HealthData *health_data) {
+  prv_refresh_current_step_average(health_data);
   return health_data->current_step_average;
 }
 
+int32_t health_data_steps_get_current_average_minute(HealthData *health_data) {
+  prv_refresh_current_step_average(health_data);
+  return health_data->step_average_last_updated_time;
+}
+
 int32_t health_data_steps_get_cur_wday_average(HealthData *health_data) {
   return prv_health_data_get_n_average_chunks(health_data, ACTIVITY_NUM_METRIC_AVERAGES);
 }

src/fw/apps/system/health/data.h

@@ -90,6 +90,13 @@ int32_t health_data_current_calories_get(HealthData *health_data);
 //! @return The integer number of steps that should be taken by this time today
 int32_t health_data_steps_get_current_average(HealthData *health_data);
 
+//! Get the minute-of-day timestamp of the latest completed step-average bin.
+//! Returns a value in [0, MINUTES_PER_DAY) representing the start minute of the
+//! current incomplete bin (i.e., the end of the latest completed bin).
+//! @param health_data A pointer to the health data to use
+//! @return The minute-of-day of the latest completed bin boundary
+int32_t health_data_steps_get_current_average_minute(HealthData *health_data);
+
 //! Get the step average for the current day of the week
 //! @param health_data A pointer to the health data to use
 //! @return An integer value for the number of steps that are typically taken on this week day

src/fw/apps/system/health/sleep_summary_card.c

@@ -201,7 +201,7 @@ static void prv_render_typical_sleep_text(GContext *ctx, Layer *base_layer) {
     snprintf(sleep_text, sizeof(sleep_text), EM_DASH);
   }
 
-  health_ui_render_typical_text_box(ctx, base_layer, sleep_text);
+  health_ui_render_typical_text_box(ctx, base_layer, sleep_text, -1, -1);
 }
 
 static void prv_render_no_sleep_data_text(GContext *ctx, Layer *base_layer) {

src/fw/apps/system/health/ui.c

@@ -3,10 +3,14 @@
 
 #include "ui.h"
 
+#include <inttypes.h>
+
 #include "applib/pbl_std/pbl_std.h"
 #include "board/display.h"
+#include "pbl/services/clock.h"
 #include "pbl/services/i18n/i18n.h"
 #include "util/string.h"
+#include "util/time/time.h"
 
 // Compile-time display offset calculations
 #define HEALTH_X_OFFSET ((DISP_COLS - LEGACY_2X_DISP_COLS) / 2)
@@ -47,41 +51,116 @@ void health_ui_draw_text_in_box(GContext *ctx, const char *text, const GRect dra
   }
 }
 
-void health_ui_render_typical_text_box(GContext *ctx, Layer *layer, const char *value_text) {
+void health_ui_render_typical_text_box(GContext *ctx, Layer *layer, const char *value_text,
+                                       int32_t daily_total, int32_t bin_minute) {
   time_t now = rtc_get_time();
   struct tm time_tm;
   localtime_r(&now, &time_tm);
   char weekday[8];
   strftime(weekday, sizeof(weekday), "%a", &time_tm);
   toupper_str(weekday);
 
-  char typical_text[32];
+  char typical_text[16];
   snprintf(typical_text, sizeof(typical_text), i18n_get("TYPICAL %s", layer), weekday);
 
+  // Color displays with both bin and daily-total data get the 3-row split
+  // layout (time + value on the left, TOTAL + daily on the right). Everything
+  // else (BW, sleep, em-dash fallback) renders a single value below the
+  // TYPICAL <day> header.
+  const bool is_split = PBL_IF_COLOR_ELSE(daily_total > 0 && bin_minute >= 0, false);
+  const int pill_height = is_split ? 53 : PBL_IF_RECT_ELSE(35, 36);
+
   const int y = PBL_IF_RECT_ELSE(PBL_IF_BW_ELSE(122, 120), 125) + HEALTH_Y_OFFSET;
-  GRect rect = GRect(0, y, layer->bounds.size.w, PBL_IF_RECT_ELSE(35, 36));
+  GRect rect = GRect(0, y, layer->bounds.size.w, pill_height);
 #if PBL_RECT
   rect = grect_inset(rect, GEdgeInsets(0, HEALTH_INSET));
 #endif
 
   const GColor bg_color = PBL_IF_COLOR_ELSE(GColorYellow, GColorBlack);
   const GColor text_color = PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite);
   const GFont font = fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD);
+  const GFont small_font = fonts_get_system_font(FONT_KEY_GOTHIC_14_BOLD);
 
   graphics_context_set_fill_color(ctx, bg_color);
   graphics_fill_round_rect(ctx, &rect, 3, GCornersAll);
 
+  // Compensate for the text renderer's top padding so the header glyphs sit
+  // just inside the pill's visual top edge.
   rect.origin.y -= PBL_IF_RECT_ELSE(3, 2);
-  // Restrict the rect to draw one line at a time to prevent them from wrapping into each other
-  rect.size.h = 16;
 
   graphics_context_set_text_color(ctx, text_color);
 
-  graphics_draw_text(ctx, typical_text, font, rect,
+  // Row 1: TYPICAL <day>, full width.
+  GRect header_rect = rect;
+  header_rect.size.h = 16;
+  graphics_draw_text(ctx, typical_text, font, header_rect,
                      GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
 
-  rect.origin.y += 16;
+  if (!is_split) {
+    GRect value_rect = header_rect;
+    value_rect.origin.y += 16;
+
+    const char *bottom_text = value_text;
+    char bottom_buf[12];
+    if (daily_total > 0) {
+      snprintf(bottom_buf, sizeof(bottom_buf), "%"PRId32, daily_total);
+      bottom_text = bottom_buf;
+    }
+    graphics_draw_text(ctx, bottom_text, font, value_rect,
+                       GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
+    return;
+  }
 
-  graphics_draw_text(ctx, value_text, font, rect,
+  // 3-row split layout (color activity only).
+  char time_text[12];
+  clock_format_time(time_text, sizeof(time_text),
+                    bin_minute / MINUTES_PER_HOUR,
+                    bin_minute % MINUTES_PER_HOUR,
+                    false /* add_space */);
+
+  char total_value[12];
+  snprintf(total_value, sizeof(total_value), "%"PRId32, daily_total);
+
+  const char *total_label = i18n_get("TOTAL", layer);
+
+  // Row 2: subheaders (TOTAL | time). Reserve room below the header so the
+  // subheaders aren't crowded against the TYPICAL line.
+  GRect sub_left = GRect(rect.origin.x, rect.origin.y + 19,
+                         rect.size.w / 2, 14);
+  GRect sub_right = sub_left;
+  sub_right.origin.x += sub_left.size.w;
+  graphics_draw_text(ctx, time_text, small_font, sub_left,
+                     GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
+  graphics_draw_text(ctx, total_label, small_font, sub_right,
+                     GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
+
+  // Underline each subheader. Each underline tracks the rendered text width.
+  const int16_t underline_y = sub_left.origin.y + 15;
+  graphics_context_set_stroke_color(ctx, text_color);
+  graphics_context_set_stroke_width(ctx, 1);
+
+  const GSize time_size = app_graphics_text_layout_get_content_size(
+      time_text, small_font, sub_left, GTextOverflowModeWordWrap, GTextAlignmentCenter);
+  const int16_t time_under_x =
+      sub_left.origin.x + (sub_left.size.w - time_size.w) / 2;
+  graphics_draw_line(ctx, GPoint(time_under_x, underline_y),
+                     GPoint(time_under_x + time_size.w, underline_y));
+
+  const GSize total_size = app_graphics_text_layout_get_content_size(
+      total_label, small_font, sub_right, GTextOverflowModeWordWrap, GTextAlignmentCenter);
+  const int16_t total_under_x =
+      sub_right.origin.x + (sub_right.size.w - total_size.w) / 2;
+  graphics_draw_line(ctx, GPoint(total_under_x, underline_y),
+                     GPoint(total_under_x + total_size.w, underline_y));
+
+  // Row 3: values (value_text | daily_total). Tightened against the subheaders.
+  GRect val_left = sub_left;
+  val_left.origin.y += 12;
+  val_left.size.h = 16;
+  GRect val_right = val_left;
+  val_right.origin.x += val_left.size.w;
+  graphics_draw_text(ctx, value_text, font, val_left,
+                     GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
+  graphics_draw_text(ctx, total_value, font, val_right,
                      GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
 }

src/fw/apps/system/health/ui.h

@@ -9,4 +9,17 @@ void health_ui_draw_text_in_box(GContext *ctx, const char *text, const GRect dra
                                 const int16_t y_offset, const GFont small_font, GColor box_color,
                                 GColor text_color);
 
-void health_ui_render_typical_text_box(GContext *ctx, Layer *layer, const char *value_text);
+//! Render the "typical" pill used by the health summary cards.
+//!
+//! @param value_text Pre-formatted value text for the lower line. On color
+//!   activity the bin-aware step count; on sleep the typical sleep duration.
+//! @param daily_total Full-day weekday-average step count, or <= 0 if not
+//!   applicable. Triggers the split layout on color and replaces value_text
+//!   on BW.
+//! @param bin_minute Minute-of-day of the latest completed step-average bin,
+//!   or < 0 if not applicable. Together with a positive daily_total enables
+//!   the split layout on color.
+void health_ui_render_typical_text_box(GContext *ctx, Layer *layer,
+                                       const char *value_text,
+                                       int32_t daily_total,
+                                       int32_t bin_minute);

tests/fw/apps/system_apps/health/test_health_activity_summary_card.c

@@ -19,7 +19,16 @@ GContext *graphics_context_get_current_context(void) {
   return &s_ctx;
 }
 
+// Override fake_clock's WEAK default so the split layout's bin time renders
+// in a stable 24h format.
+bool clock_is_24h_style(void) {
+  return true;
+}
+
 void test_health_activity_summary_card__initialize(void) {
+  // Pin RTC to 2024-01-06 16:19:35 UTC (Saturday 16:19 -> bin minute 975 = 16:15).
+  rtc_set_time(1704557975);
+
   // Setup graphics context
   framebuffer_init(&s_fb, &(GSize) {DISP_COLS, DISP_ROWS});
   framebuffer_clear(&s_fb);
@@ -79,6 +88,7 @@ void test_health_activity_summary_card__no_current_steps(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 750,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -99,6 +109,7 @@ void test_health_activity_summary_card__render_current_behind_typical1(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 340,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -119,6 +130,7 @@ void test_health_activity_summary_card__render_current_behind_typical2(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 340,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -139,6 +151,7 @@ void test_health_activity_summary_card__render_current_behind_typical3(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 555,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -159,6 +172,7 @@ void test_health_activity_summary_card__render_current_behind_typical4(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 840,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -179,6 +193,7 @@ void test_health_activity_summary_card__render_current_behind_typical5(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 914,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -199,6 +214,7 @@ void test_health_activity_summary_card__render_current_equals_typical(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 837,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -219,6 +235,7 @@ void test_health_activity_summary_card__render_current_above_typical1(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 170,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -239,6 +256,7 @@ void test_health_activity_summary_card__render_current_above_typical2(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 379,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -259,6 +277,7 @@ void test_health_activity_summary_card__render_current_above_typical3(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 480,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -279,6 +298,7 @@ void test_health_activity_summary_card__render_current_above_typical4(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 700,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -299,6 +319,7 @@ void test_health_activity_summary_card__render_current_above_typical5(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 900,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);
@@ -319,6 +340,7 @@ void test_health_activity_summary_card__render_current_above_expected(void) {
                       10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                       10, 10, 10, 10, 10, 50}, // 1000
     .current_step_average = 800,
+    .step_average_last_updated_time = 975,
   };
 
   prv_create_card_and_render(&health_data);