From 46ba3eb3fd3162d94e4c7614b35c47cca8fdd5d7 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Fri, 23 May 2025 09:44:14 -0500
Subject: [PATCH] feat(#1755): Add setting to display time in 12h format
 (#1918)

---
 .../radioconfig/components/DisplayConfigItemList.kt   | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/DisplayConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/DisplayConfigItemList.kt
index cabfb1832..602b9cb2a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/DisplayConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/DisplayConfigItemList.kt
@@ -207,6 +207,17 @@ fun DisplayConfigItemList(
         }
         item { HorizontalDivider() }
 
+        item {
+            SwitchPreference(
+                title = stringResource(R.string.use_12h_format),
+                summary = stringResource(R.string.display_time_in_12h_format),
+                enabled = enabled,
+                checked = displayInput.use12HClock,
+                onCheckedChange = { displayInput = displayInput.copy { use12HClock = it } }
+            )
+        }
+        item { HorizontalDivider() }
+
         item {
             PreferenceFooter(
                 enabled = enabled && displayInput != displayConfig,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7dd6210a..b1def8aef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -629,4 +629,6 @@
     <string name="request_metadata">Request Metadata</string>
     <string name="actions">Actions</string>
     <string name="firmware">Firmware</string>
+    <string name="use_12h_format">Use 12h clock format</string>
+    <string name="display_time_in_12h_format">When enabled, the device will display the time in 12-hour format on screen.</string>
 </resources>