Fix time picker time format

vicolo-dev · Jun 2, 2024 · 40c4552 · 40c4552
1 parent e724b98
commit 40c4552
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/common/widgets/time_picker.dart b/lib/common/widgets/time_picker.dart
@@ -2820,8 +2820,15 @@ class _TimePickerDialogState extends State<TimePickerDialog>
     TextTheme textTheme = theme.textTheme;
     ColorScheme colorScheme = theme.colorScheme;
 
-    bool use24hMode = MediaQuery.of(context).alwaysUse24HourFormat ||
-        appSettings.getSetting("Time Format").value == TimeFormat.h24;
+    TimeFormat timeFormat = appSettings.getSetting("Time Format").value;
+
+    bool use24hMode = false;
+    if (timeFormat == TimeFormat.device) {
+      use24hMode = MediaQuery.of(context).alwaysUse24HourFormat;
+    } else {
+      use24hMode =
+          appSettings.getSetting("Time Format").value == TimeFormat.h24;
+    }
 
     switch (type) {
       case TimePickerType.spinner: