From 02aa267e8f6bdaa5b94ecd17238a5c85fd653e3e Mon Sep 17 00:00:00 2001
From: trentsuzuki <ikuzustrent@gmail.com>
Date: Tue, 14 Jan 2025 09:15:55 -0500
Subject: [PATCH] Fix AM and PM labels for 24h mode in the dashboard activity
 chart

---
 .../activities/dashboard/DashboardTodayWidget.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java
index 7e1f58b64..f216c0630 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java
@@ -179,11 +179,11 @@ public class DashboardTodayWidget extends AbstractDashboardWidget {
         boolean normalClock = DateFormat.is24HourFormat(GBApplication.getContext());
         Map<Integer, String> hours = new HashMap<Integer, String>() {
             {
-                put(0, normalClock ? (mode_24h ? "0" : "12") : "12pm");
+                put(0, normalClock ? (mode_24h ? "0" : "12") : (mode_24h ? "12am" : "12pm"));
                 put(3, "3");
                 put(6, normalClock ? "6" : "6am");
                 put(9, "9");
-                put(12, normalClock ? (mode_24h ? "12" : "0") : "12am");
+                put(12, normalClock ? (mode_24h ? "12" : "0") : (mode_24h ? "12pm" : "12am"));
                 put(15, normalClock ? "15" : "3");
                 put(18, normalClock ? "18" : "6pm");
                 put(21, normalClock ? "21" : "9");