Add function to switch between 12h and 24h clock

lib/app.dart

@@ -10,6 +10,7 @@ import 'l10n/app_localizations.dart';
 import 'notify/notification_service.dart';
 import 'notify/tap_router.dart';
 import 'state/app_state.dart';
+import 'state/clock_format.dart';
 import 'state/locale_controller.dart';
 import 'state/prefs.dart';
 import 'telemetry/telemetry_service.dart';
@@ -152,14 +153,55 @@ class _OpenStrapAppState extends State<OpenStrapApp> with WidgetsBindingObserver
         }
         return const Locale('en');
       },
-      builder: (context, child) =>
-          ThemeSwitchOverlay(key: themeSwitchKey, child: child!),
+      builder: (context, child) => _ClockScope(
+          child: ThemeSwitchOverlay(key: themeSwitchKey, child: child!)),
       navigatorObservers: [TelemetryNavigatorObserver()],
       home: const _Gate(),
     );
   }
 }
 
+/// Applies the 12/24-hour choice: overrides MediaQuery for time pickers, hands
+/// the locale's AM/PM text to `formatClock*`, and rebuilds everything below
+/// once when either flips, since those context-free helpers can't register a
+/// dependency.
+class _ClockScope extends StatefulWidget {
+  const _ClockScope({required this.child});
+  final Widget child;
+
+  @override
+  State<_ClockScope> createState() => _ClockScopeState();
+}
+
+class _ClockScopeState extends State<_ClockScope> {
+  (bool, Locale)? _last;
+
+  @override
+  Widget build(BuildContext context) {
+    final use24 = context
+        .watch<ClockFormatController>()
+        .resolve24h(MediaQuery.alwaysUse24HourFormatOf(context));
+    bindClockLocalizations(MaterialLocalizations.of(context));
+    final now = (use24, Localizations.localeOf(context));
+    if (_last != null && _last != now) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted) return;
+        void mark(Element e) {
+          e.markNeedsBuild();
+          e.visitChildren(mark);
+        }
+
+        (context as Element).visitChildren(mark);
+      });
+    }
+    _last = now;
+    return MediaQuery(
+      data: MediaQuery.of(context).copyWith(alwaysUse24HourFormat: use24),
+      child: widget.child,
+    );
+  }
+}
+
 // ══════════════════ THE ONBOARDING GATE ══════════════════
 
 /// The gate, as a pure function of its inputs. Onboarding order bugs are

lib/coach/coach_actions.dart

@@ -443,7 +443,7 @@ class CoachActions {
       ],
       'today': [
         for (final s in slots)
-          {'name': s.def.label, 'time': s.timeLabel, 'state': s.state.name},
+          {'name': s.def.label, 'time': s.timeMachine, 'state': s.state.name},
       ],
     });
   }

lib/data/journal_fields.dart

@@ -15,6 +15,8 @@ import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
 
+import '../state/clock_format.dart';
+
 /// What a field measures, which decides how it is entered and read back.
 enum JournalFieldKind {
   /// A subjective 1–5 self-report (mood, sleep quality). Ordinal: the gap
@@ -305,11 +307,6 @@ String customJournalFieldKey(String label) {
   return 'custom_$slug';
 }
 
-/// Local minutes past midnight → "7:05 AM".
-String formatMinuteOfDay(int minuteOfDay) {
-  final m = minuteOfDay % (24 * 60);
-  final h24 = m ~/ 60;
-  final mm = (m % 60).toString().padLeft(2, '0');
-  final h = h24 % 12 == 0 ? 12 : h24 % 12;
-  return '$h:$mm ${h24 < 12 ? 'AM' : 'PM'}';
-}
+/// Local minutes past midnight → "7:05 AM" or "07:05", per the user's clock
+/// format ([formatClockMinute]).
+String formatMinuteOfDay(int minuteOfDay) => formatClockMinute(minuteOfDay);

lib/data/med_store.dart

@@ -18,6 +18,7 @@ import 'dart:convert';
 
 import 'package:sqflite/sqflite.dart';
 
+import '../state/clock_format.dart' show formatClockMinute;
 import 'day_label.dart';
 
 // ══════════════════ SCHEMA ══════════════════
@@ -165,10 +166,14 @@ class MedSlot {
   final int slotMin;
   final DoseState state;
 
-  String get timeLabel {
-    final h = (slotMin ~/ 60).toString().padLeft(2, '0');
-    final m = (slotMin % 60).toString().padLeft(2, '0');
-    return '$h:$m';
+  /// Display only, per the user's clock format — never a storage key.
+  String get timeLabel => formatClockMinute(slotMin);
+
+  /// `HH:mm` for payloads and the coach, whatever the clock format.
+  String get timeMachine {
+    final h = slotMin ~/ 60;
+    final m = slotMin % 60;
+    return '${h.toString().padLeft(2, '0')}:${m.toString().padLeft(2, '0')}';
   }
 
   /// A slot that has passed and was neither taken nor deliberately skipped.

lib/l10n/app_de.arb

@@ -2147,6 +2147,10 @@
   "settingsGroupPreferences": "Einstellungen",
   "settingsUnitsRowTitle": "Einheiten",
   "settingsAppearanceRowTitle": "Erscheinungsbild",
+  "settingsClockFormatRowTitle": "Uhrzeitformat",
+  "settingsClockFormatSystem": "System",
+  "settingsClockFormat24h": "24 Stunden",
+  "settingsClockFormat12h": "12 Stunden",
   "settingsCycleTrackingRowTitle": "Zyklus-Tracking",
   "settingsCycleTrackingRowSub": "Fügt den Tab Zyklus zu Wellness hinzu. Aus blendet ihn aus und behält alles bereits Erfasste",
   "settingsGroupYourData": "Deine Daten",

lib/l10n/app_en.arb

@@ -11253,6 +11253,22 @@
   "@settingsAppearanceRowTitle": {
     "description": "Settings row title cycling the app theme"
   },
+  "settingsClockFormatRowTitle": "Time format",
+  "@settingsClockFormatRowTitle": {
+    "description": "Settings row title cycling the 12/24-hour clock format"
+  },
+  "settingsClockFormatSystem": "System",
+  "@settingsClockFormatSystem": {
+    "description": "Clock format value: follow the operating system setting"
+  },
+  "settingsClockFormat24h": "24-hour",
+  "@settingsClockFormat24h": {
+    "description": "Clock format value: 24-hour clock (e.g. 19:30)"
+  },
+  "settingsClockFormat12h": "12-hour",
+  "@settingsClockFormat12h": {
+    "description": "Clock format value: 12-hour clock with AM/PM (e.g. 7:30 PM)"
+  },
   "settingsCycleTrackingRowTitle": "Cycle tracking",
   "@settingsCycleTrackingRowTitle": {
     "description": "Settings row title toggling cycle tracking"

lib/l10n/app_es.arb

@@ -2159,6 +2159,10 @@
   "settingsGroupPreferences": "Preferencias",
   "settingsUnitsRowTitle": "Unidades",
   "settingsAppearanceRowTitle": "Apariencia",
+  "settingsClockFormatRowTitle": "Formato de hora",
+  "settingsClockFormatSystem": "Sistema",
+  "settingsClockFormat24h": "24 horas",
+  "settingsClockFormat12h": "12 horas",
   "settingsCycleTrackingRowTitle": "Seguimiento del ciclo",
   "settingsCycleTrackingRowSub": "Agrega la pestaña Ciclo a Bienestar. Desactivado la oculta y conserva todo lo ya registrado",
   "settingsGroupYourData": "Tus datos",

lib/l10n/app_fr.arb

@@ -2147,6 +2147,10 @@
   "settingsGroupPreferences": "Préférences",
   "settingsUnitsRowTitle": "Unités",
   "settingsAppearanceRowTitle": "Apparence",
+  "settingsClockFormatRowTitle": "Format de l’heure",
+  "settingsClockFormatSystem": "Système",
+  "settingsClockFormat24h": "24 heures",
+  "settingsClockFormat12h": "12 heures",
   "settingsCycleTrackingRowTitle": "Suivi du cycle",
   "settingsCycleTrackingRowSub": "Ajoute l’onglet Cycle à Bien-être. Désactivé le masque et conserve tout ce qui est déjà enregistré",
   "settingsGroupYourData": "Vos données",

lib/l10n/app_hi.arb

@@ -2147,6 +2147,10 @@
   "settingsGroupPreferences": "प्राथमिकताएं",
   "settingsUnitsRowTitle": "इकाइयां",
   "settingsAppearanceRowTitle": "रूप",
+  "settingsClockFormatRowTitle": "समय प्रारूप",
+  "settingsClockFormatSystem": "सिस्टम",
+  "settingsClockFormat24h": "24 घंटे",
+  "settingsClockFormat12h": "12 घंटे",
   "settingsCycleTrackingRowTitle": "चक्र ट्रैकिंग",
   "settingsCycleTrackingRowSub": "वेलनेस में साइकिल टैब जोड़ता है। बंद करने पर यह छिप जाता है और पहले से लॉग किया गया सब कुछ बना रहता है",
   "settingsGroupYourData": "आपका डेटा",

lib/l10n/app_zh.arb

@@ -2147,6 +2147,10 @@
   "settingsGroupPreferences": "偏好设置",
   "settingsUnitsRowTitle": "单位",
   "settingsAppearanceRowTitle": "外观",
+  "settingsClockFormatRowTitle": "时间格式",
+  "settingsClockFormatSystem": "跟随系统",
+  "settingsClockFormat24h": "24 小时制",
+  "settingsClockFormat12h": "12 小时制",
   "settingsCycleTrackingRowTitle": "周期追踪",
   "settingsCycleTrackingRowSub": "在“健康”中添加“周期”标签页。关闭后会隐藏该标签页，但已记录的内容仍会保留",
   "settingsGroupYourData": "你的数据",

lib/main.dart

@@ -9,6 +9,7 @@ import 'notify/notification_service.dart';
 import 'coach/coach_config.dart';
 import 'state/app_state.dart';
 import 'state/prefs.dart';
+import 'state/clock_format.dart';
 import 'state/locale_controller.dart';
 import 'state/units_controller.dart';
 import 'sync/headless_boot.dart';
@@ -160,6 +161,16 @@ Future<void> main() async {
     units = UnitsController.seed(UnitSystem.metric);
   }
 
+  // Local 12/24-hour clock preference. Best-effort; defaults to the OS setting.
+  // The timeout lives inside bootstrap() so a late load can't replace the seed.
+  ClockFormatController clockFormat;
+  try {
+    clockFormat = await ClockFormatController.bootstrap(timeout: _kStartupInitTimeout);
+  } catch (e, st) {
+    debugPrint('[main] ClockFormatController.bootstrap failed, using system: $e\n$st');
+    clockFormat = ClockFormatController.seed(ClockFormat.system);
+  }
+
   // Local language override (null = system default).
   LocaleController locale;
   try {
@@ -189,6 +200,7 @@ Future<void> main() async {
         ChangeNotifierProvider(create: (_) => AppState(), lazy: false),
         ChangeNotifierProvider<ThemeController>.value(value: theme),
         ChangeNotifierProvider<UnitsController>.value(value: units),
+        ChangeNotifierProvider<ClockFormatController>.value(value: clockFormat),
         ChangeNotifierProvider<LocaleController>.value(value: locale),
         ChangeNotifierProvider<CoachConfig>.value(value: coachConfig),
       ],

lib/notify/battery_forecast.dart

@@ -25,6 +25,8 @@
 
 import 'dart:math' as math;
 
+import '../state/clock_format.dart' show formatClockOf;
+
 /// One battery observation from `band_battery`.
 class BatterySample {
   const BatterySample({
@@ -355,9 +357,8 @@ class BatteryForecaster {
     final pct = f.currentPct;
     final empty = f.predictedEmptyAt;
     if (rate == null || pct == null || empty == null) return '';
-    final h = empty.hour.toString().padLeft(2, '0');
-    final m = empty.minute.toString().padLeft(2, '0');
-    final head = 'At ${rate.toStringAsFixed(1)}%/h it runs out around $h:$m';
+    final head = 'At ${rate.toStringAsFixed(1)}%/h it runs out around '
+        '${formatClockOf(empty)}';
     if (empty.isBefore(wakeAt)) {
       return '$head — before you wake. Charge it now to keep tonight\'s sleep.';
     }

lib/notify/notification_center.dart

@@ -33,6 +33,7 @@ import '../ai/reminder_plan.dart';
 import '../data/day_label.dart';
 import '../data/journal_fields.dart';
 import '../data/med_store.dart';
+import '../state/clock_format.dart' show formatClockMinute;
 import 'fired_keys.dart';
 import 'notification_event.dart';
 import 'notification_prefs.dart';
@@ -531,12 +532,8 @@ class NotificationCenter {
     return t;
   }
 
-  /// Two-digit HH:MM from minutes-past-midnight (notification bodies).
-  static String _hhmm(int minuteOfDay) {
-    final m = minuteOfDay % 1440;
-    return '${(m ~/ 60).toString().padLeft(2, '0')}:'
-        '${(m % 60).toString().padLeft(2, '0')}';
-  }
+  /// Minutes-past-midnight → the user's clock format (notification bodies).
+  static String _hhmm(int minuteOfDay) => formatClockMinute(minuteOfDay);
 
   // ── the weekly lookback finding ─────────────────────────────────────────