DateTimeController: Make DayOfWeekShortToStringLow static
This allows it to be used outside of the current datetime context and makes it consistent with the MonthShortToStringLow function.
This commit is contained in:
parent
b0a0afdd4b
commit
5d971690cb
|
@ -115,8 +115,8 @@ const char* DateTime::MonthShortToStringLow(Months month) {
|
||||||
return MonthsStringLow[static_cast<uint8_t>(month)];
|
return MonthsStringLow[static_cast<uint8_t>(month)];
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* DateTime::DayOfWeekShortToStringLow() const {
|
const char* DateTime::DayOfWeekShortToStringLow(Days day) {
|
||||||
return DaysStringShortLow[static_cast<uint8_t>(DayOfWeek())];
|
return DaysStringShortLow[static_cast<uint8_t>(day)];
|
||||||
}
|
}
|
||||||
|
|
||||||
void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
|
void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
|
||||||
|
|
|
@ -122,7 +122,7 @@ namespace Pinetime {
|
||||||
const char* MonthShortToString() const;
|
const char* MonthShortToString() const;
|
||||||
const char* DayOfWeekShortToString() const;
|
const char* DayOfWeekShortToString() const;
|
||||||
static const char* MonthShortToStringLow(Months month);
|
static const char* MonthShortToStringLow(Months month);
|
||||||
const char* DayOfWeekShortToStringLow() const;
|
static const char* DayOfWeekShortToStringLow(Days day);
|
||||||
|
|
||||||
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
|
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
|
||||||
return currentDateTime;
|
return currentDateTime;
|
||||||
|
|
|
@ -426,7 +426,8 @@ void WatchFaceInfineat::Refresh() {
|
||||||
currentDate = std::chrono::time_point_cast<days>(currentDateTime.Get());
|
currentDate = std::chrono::time_point_cast<days>(currentDateTime.Get());
|
||||||
if (currentDate.IsUpdated()) {
|
if (currentDate.IsUpdated()) {
|
||||||
uint8_t day = dateTimeController.Day();
|
uint8_t day = dateTimeController.Day();
|
||||||
lv_label_set_text_fmt(labelDate, "%s %02d", dateTimeController.DayOfWeekShortToStringLow(), day);
|
Controllers::DateTime::Days dayOfWeek = dateTimeController.DayOfWeek();
|
||||||
|
lv_label_set_text_fmt(labelDate, "%s %02d", dateTimeController.DayOfWeekShortToStringLow(dayOfWeek), day);
|
||||||
lv_obj_realign(labelDate);
|
lv_obj_realign(labelDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user