fw/apps: honor preferred content size in remaining system menus

The notifications app list, its empty state, the alarms "limit reached"
cell and the Bluetooth pairing hint still drew with the platform default
fonts and cell heights, so they stayed the same size when the user
changed Text Size while every other menu around them followed it.

Switch them to the preferred content size. The notifications list picks
its cell height from the same per-size table it already had, so
ExtraLarge gets the basic menu cell height like Large does. On round
displays the focused notification cell grows from 84 to 100 px at
ExtraLarge, since the icon, title and subtitle stack no longer fits the
fixed tall cell with the larger fonts; the unfocused rows shrink
accordingly so two still fit on each side. The Bluetooth pairing hint is
drawn below the first cell outside its bounds with a fixed 83 px box,
which no longer fits the larger fonts; size the box to the remaining
display height instead and let the trailing ellipsis handle overflow.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

Author: gmarull

src/fw/apps/system/alarms/alarms.c

@@ -222,7 +222,7 @@ static void prv_alarm_list_draw_row_callback(GContext *ctx, const Layer *cell_la
       if (menu_cell_layer_is_highlighted(cell_layer)) {
         if (data->show_limit_reached_text) {
           // Trying to add a new alarm when list is already full
-          const GFont font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellSubtitle);
+          const GFont font = system_theme_get_font(TextStyleFont_MenuCellSubtitle);
 
           box = GRect(0, 0, cell_layer->bounds.size.w, fonts_get_font_height(font));
 

src/fw/apps/system/notifications.c

@@ -351,8 +351,8 @@ static void prv_draw_notification_cell_rect(GContext *ctx, const Layer *cell_lay
   mutable_cell_layer->bounds =
       grect_inset(cell_layer_bounds, GEdgeInsets(0, 5, 0, text_left_margin));
 
-  const GFont title_font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellTitle);
-  const GFont subtitle_font = system_theme_get_font_for_default_size(TextStyleFont_Caption);
+  const GFont title_font = system_theme_get_font(TextStyleFont_MenuCellTitle);
+  const GFont subtitle_font = system_theme_get_font(TextStyleFont_Caption);
   menu_cell_basic_draw_custom(ctx, cell_layer, title_font, title, NULL /* value_font */,
                               NULL /* value */, subtitle_font, subtitle, NULL /* icon */,
                               false /* icon_on_right */, GTextOverflowModeTrailingEllipsis);
@@ -426,9 +426,8 @@ static void prv_draw_notification_cell_round_selected(GContext *ctx, const Layer
   frame.origin.y += inset;
   frame.size.h -= inset * 2;
   frame.size.w -= inset * 2;
-  const GFont title_font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellTitle);
-  const GFont subtitle_font =
-      system_theme_get_font_for_default_size(TextStyleFont_MenuCellSubtitle);
+  const GFont title_font = system_theme_get_font(TextStyleFont_MenuCellTitle);
+  const GFont subtitle_font = system_theme_get_font(TextStyleFont_MenuCellSubtitle);
   prv_draw_notification_cell_round(ctx, cell_layer, &frame, title_font, title, subtitle_font,
                                    subtitle, icon);
 }
@@ -448,7 +447,7 @@ static void prv_draw_notification_cell_round_unselected(GContext *ctx, const Lay
   // Using TextStyleFont_Header here is a little bit of a hack to achieve Gothic 18 Bold on
   // Spalding's default content size (medium) while still being a little robust for any future round
   // watches that have a default content size larger than medium
-  const GFont font = system_theme_get_font_for_default_size(TextStyleFont_Header);
+  const GFont font = system_theme_get_font(TextStyleFont_Header);
   prv_draw_notification_cell_round(ctx, cell_layer, &frame, font, title, NULL, NULL, NULL);
 }
 #endif
@@ -499,25 +498,26 @@ static int16_t prv_get_cell_height(struct MenuLayer *menu_layer, MenuIndex *cell
 #if PBL_ROUND
   MenuIndex selected_index = menu_layer_get_selected_index(menu_layer);
   bool is_selected = menu_index_compare(cell_index, &selected_index) == 0;
+  const int16_t focused_cell_height =
+      (system_theme_get_content_size() == PreferredContentSizeExtraLarge)
+          ? 100
+          : MENU_CELL_ROUND_FOCUSED_TALL_CELL_HEIGHT;
   if (is_selected) {
-    return MENU_CELL_ROUND_FOCUSED_TALL_CELL_HEIGHT;
+    return focused_cell_height;
   }
 #if PBL_DISPLAY_HEIGHT >= 200
   // Larger round displays fit two unfocused rows on each side of the focused row
-  return ((DISP_ROWS - STATUS_BAR_LAYER_HEIGHT * 2) - MENU_CELL_ROUND_FOCUSED_TALL_CELL_HEIGHT) / 4;
+  return ((DISP_ROWS - STATUS_BAR_LAYER_HEIGHT * 2) - focused_cell_height) / 4;
 #endif
 #endif
-  const PreferredContentSize runtime_platform_content_size =
-      system_theme_get_default_content_size_for_runtime_platform();
   return ((int16_t[NumPreferredContentSizes]){
     //! @note this is the same as Medium until Small is designed
     [PreferredContentSizeSmall] = PBL_IF_RECT_ELSE(46, MENU_CELL_ROUND_UNFOCUSED_SHORT_CELL_HEIGHT),
     [PreferredContentSizeMedium] =
         PBL_IF_RECT_ELSE(46, MENU_CELL_ROUND_UNFOCUSED_SHORT_CELL_HEIGHT),
     [PreferredContentSizeLarge] = menu_cell_basic_cell_height(),
-    //! @note this is the same as Large until ExtraLarge is designed
     [PreferredContentSizeExtraLarge] = menu_cell_basic_cell_height(),
-  })[runtime_platform_content_size];
+  })[system_theme_get_content_size()];
 }
 
 static void prv_draw_row_callback(GContext *ctx, const Layer *cell_layer, MenuIndex *cell_index,
@@ -540,7 +540,7 @@ static void prv_draw_row_callback(GContext *ctx, const Layer *cell_layer, MenuIn
 #if PBL_ROUND
     draw_cell(ctx, cell_layer, i18n_get("Clear All", data), NULL, NULL);
 #else
-    const GFont font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellTitle);
+    const GFont font = system_theme_get_font(TextStyleFont_MenuCellTitle);
     GRect box = cell_layer->bounds;
     box.origin.y +=
         (box.size.h - fonts_get_font_height(font)) / 2 - fonts_get_font_cap_offset(font);
@@ -717,7 +717,7 @@ static void prv_window_load(Window *window) {
 
   TextLayer *text_layer = &data->text_layer;
   const int16_t horizontal_margin = 5;
-  const GFont font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellTitle);
+  const GFont font = system_theme_get_font(TextStyleFont_MenuCellTitle);
   // configure text layer to be vertically aligned (15 is hacking around our poor fonts)
   text_layer_init_with_parameters(
       text_layer,

src/fw/apps/system/settings/bluetooth.c

@@ -423,13 +423,13 @@ static void prv_draw_row_cb(SettingsCallbacks *context, GContext *ctx, const Lay
     ctx->draw_state.clip_box = ctx->dest_bitmap.bounds;
 
     graphics_context_set_text_color(ctx, GColorBlack);
-    GFont font = system_theme_get_font_for_default_size(TextStyleFont_MenuCellSubtitle);
+    GFont font = system_theme_get_font(TextStyleFont_MenuCellSubtitle);
     const int16_t horizontal_inset = menu_cell_basic_horizontal_inset() * 3;
     GRect box = cell_layer->bounds;
     box.origin.x = horizontal_inset;
     box.origin.y = menu_cell_basic_cell_height() + (int16_t)9;
     box.size.w -= horizontal_inset * 2;
-    box.size.h = 83;
+    box.size.h = DISP_ROWS - STATUS_BAR_LAYER_HEIGHT - box.origin.y;
 
     if (!data->remote_list_head) {
       if (bt_ctl_is_airplane_mode_on()) {
@@ -445,6 +445,7 @@ static void prv_draw_row_cb(SettingsCallbacks *context, GContext *ctx, const Lay
       // Position the message lower to appear below the paired phone row
       GRect msg_box = box;
       msg_box.origin.y += menu_cell_basic_cell_height() - 10;
+      msg_box.size.h -= menu_cell_basic_cell_height() - 10;
       graphics_draw_text(ctx, i18n_get("Forget this device to pair a new device.", data), font,
                          msg_box, GTextOverflowModeTrailingEllipsis, GTextAlignmentCenter, NULL);
     }