Fixed 12H mode displaying 24H times

Author: Aperture32GLaDOS

src/displayapp/screens/WatchFaceTrans.cpp

@@ -131,25 +131,28 @@ void WatchFaceTrans::Refresh() {
     uint8_t minute = dateTimeController.Minutes();
     uint8_t second = dateTimeController.Seconds();
 
+    if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+      if (hour == 0) {
+        ampmChar = "AM";
+        hour = 12;
+      } else if (hour == 12) {
+        ampmChar = "PM";
+      } else if (hour > 12) {
+        hour = hour - 12;
+        ampmChar = "PM";
+      }
+    }
+
     lv_label_set_text_fmt(labelTime, "#000000 %02d:%02d:%02d#", hour, minute, second);
 
     currentDate = std::chrono::time_point_cast<std::chrono::days>(currentDateTime.Get());
-    if (currentDate.IsUpdated()) {
+    if (currentDate.IsUpdated() || ampmChar.IsUpdated()) {
       uint16_t year = dateTimeController.Year();
       Controllers::DateTime::Months month = dateTimeController.Month();
       uint8_t day = dateTimeController.Day();
       Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek();
       lv_label_set_text_fmt(labelDate, "#ffffff %02d-%02d-%04d#", day, static_cast<uint8_t>(month), year);
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
-        char ampmChar[3] = "AM";
-        if (hour == 0) {
-          hour = 12;
-        } else if (hour == 12) {
-          ampmChar[0] = 'P';
-        } else if (hour > 12) {
-          hour = hour - 12;
-          ampmChar[0] = 'P';
-        }
         lv_label_set_text_fmt(labelDay, "#ffffff %s %s#", dateTimeController.DayOfWeekToStringLow(dayOfWeek), ampmChar);
       } else {
         lv_label_set_text_fmt(labelDay, "#ffffff %s#", dateTimeController.DayOfWeekToStringLow(dayOfWeek));

src/displayapp/screens/WatchFaceTrans.h

@@ -43,6 +43,8 @@ namespace Pinetime {
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<bool> notificationState {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
+        // Must be wrapped in a dirty value, since it is displayed in the day but is updated twice a day
+        Utility::DirtyValue<const char*> ampmChar {"AM"};
 
         lv_obj_t* topBlueBackground;
         lv_obj_t* topPinkBackground;