From 628bbad68398d5d9740193a6e1d2e799c8805873 Mon Sep 17 00:00:00 2001 From: Julian Foad Date: Fri, 10 May 2024 10:53:27 +0100 Subject: [PATCH] Analog, Digital: lower case day/month names --- src/displayapp/screens/WatchFaceAnalog.cpp | 6 ++++-- src/displayapp/screens/WatchFaceDigital.cpp | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp index e74c441b..546a7634 100644 --- a/src/displayapp/screens/WatchFaceAnalog.cpp +++ b/src/displayapp/screens/WatchFaceAnalog.cpp @@ -121,7 +121,8 @@ WatchFaceAnalog::WatchFaceAnalog(Controllers::DateTime& dateTimeController, label_date_day = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(label_date_day, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::orange); - lv_label_set_text_fmt(label_date_day, "%s\n%02i", dateTimeController.DayOfWeekShortToString(), dateTimeController.Day()); + Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek(); + lv_label_set_text_fmt(label_date_day, "%s\n%02i", dateTimeController.DayOfWeekShortToStringLow(dayOfWeek), dateTimeController.Day()); lv_label_set_align(label_date_day, LV_LABEL_ALIGN_CENTER); lv_obj_align(label_date_day, nullptr, LV_ALIGN_CENTER, 50, 0); @@ -265,7 +266,8 @@ void WatchFaceAnalog::Refresh() { currentDate = std::chrono::time_point_cast(currentDateTime.Get()); if (currentDate.IsUpdated()) { - lv_label_set_text_fmt(label_date_day, "%s\n%02i", dateTimeController.DayOfWeekShortToString(), dateTimeController.Day()); + Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek(); + lv_label_set_text_fmt(label_date_day, "%s\n%02i", dateTimeController.DayOfWeekShortToStringLow(dayOfWeek), dateTimeController.Day()); } } } diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index d1ba9e64..a104a52f 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -137,18 +137,19 @@ void WatchFaceDigital::Refresh() { if (currentDate.IsUpdated()) { uint16_t year = dateTimeController.Year(); uint8_t day = dateTimeController.Day(); + Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek(); if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) { lv_label_set_text_fmt(label_date, "%s %d %s %d", - dateTimeController.DayOfWeekShortToString(), + dateTimeController.DayOfWeekShortToStringLow(dayOfWeek), day, - dateTimeController.MonthShortToString(), + dateTimeController.MonthShortToStringLow(), year); } else { lv_label_set_text_fmt(label_date, "%s %s %d %d", - dateTimeController.DayOfWeekShortToString(), - dateTimeController.MonthShortToString(), + dateTimeController.DayOfWeekShortToStringLow(dayOfWeek), + dateTimeController.MonthShortToStringLow(), day, year); }