diff options
| author | Jean-François Milants <jf@codingfield.com> | 2025-12-29 22:10:11 +0100 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2026-01-05 13:19:06 +0100 |
| commit | c2e59583e19bdb2596a09717a91c77e61366a019 (patch) | |
| tree | 139ad328ba0ec889e35e832e45d2eac9caf482a9 /src/displayapp | |
| parent | c451d2ce9fae0c491a5e516a85f2faf1cf25273e (diff) | |
WatchFaceTerminal : rename a few fields to camelCase.
Diffstat (limited to 'src/displayapp')
| -rw-r--r-- | src/displayapp/screens/WatchFaceTerminal.cpp | 26 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceTerminal.h | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index 69fbc3ce..3fa80dcb 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -39,15 +39,15 @@ WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController, notificationIcon = lv_label_create(container, nullptr); - label_prompt_1 = lv_label_create(container, nullptr); - lv_obj_set_style_local_text_color(label_prompt_1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray); - lv_label_set_text_static(label_prompt_1, "user@watch:~ $ now"); + labelPrompt1 = lv_label_create(container, nullptr); + lv_obj_set_style_local_text_color(labelPrompt1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray); + lv_label_set_text_static(labelPrompt1, "user@watch:~ $ now"); - label_time = lv_label_create(container, nullptr); - lv_label_set_recolor(label_time, true); + labelTime = lv_label_create(container, nullptr); + lv_label_set_recolor(labelTime, true); - label_date = lv_label_create(container, nullptr); - lv_label_set_recolor(label_date, true); + labelDate = lv_label_create(container, nullptr); + lv_label_set_recolor(labelDate, true); batteryValue = lv_label_create(container, nullptr); lv_label_set_recolor(batteryValue, true); @@ -65,9 +65,9 @@ WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController, connectState = lv_label_create(container, nullptr); lv_label_set_recolor(connectState, true); - label_prompt_2 = lv_label_create(container, nullptr); - lv_obj_set_style_local_text_color(label_prompt_2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray); - lv_label_set_text_static(label_prompt_2, "user@watch:~ $"); + labelPrompt2 = lv_label_create(container, nullptr); + lv_obj_set_style_local_text_color(labelPrompt2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray); + lv_label_set_text_static(labelPrompt2, "user@watch:~ $"); lv_obj_align(container, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 7); @@ -106,9 +106,9 @@ void WatchFaceTerminal::Refresh() { hour = hour - 12; ampmChar[0] = 'P'; } - lv_label_set_text_fmt(label_time, "#ffffff [TIME]# #11cc55 %02d:%02d:%02d %s#", hour, minute, second, ampmChar); + lv_label_set_text_fmt(labelTime, "#ffffff [TIME]# #11cc55 %02d:%02d:%02d %s#", hour, minute, second, ampmChar); } else { - lv_label_set_text_fmt(label_time, "#ffffff [TIME]# #11cc55 %02d:%02d:%02d#", hour, minute, second); + lv_label_set_text_fmt(labelTime, "#ffffff [TIME]# #11cc55 %02d:%02d:%02d#", hour, minute, second); } currentDate = std::chrono::time_point_cast<std::chrono::days>(currentDateTime.Get()); @@ -116,7 +116,7 @@ void WatchFaceTerminal::Refresh() { uint16_t year = dateTimeController.Year(); Controllers::DateTime::Months month = dateTimeController.Month(); uint8_t day = dateTimeController.Day(); - lv_label_set_text_fmt(label_date, "#ffffff [DATE]# #007fff %04d-%02d-%02d#", short(year), char(month), char(day)); + lv_label_set_text_fmt(labelDate, "#ffffff [DATE]# #007fff %04d-%02d-%02d#", short(year), char(month), char(day)); } } diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h index 85d50b7a..04c2d361 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/screens/WatchFaceTerminal.h @@ -52,15 +52,15 @@ namespace Pinetime { lv_obj_t* container; lv_obj_t* notificationIcon; - lv_obj_t* label_prompt_1; - lv_obj_t* label_time; - lv_obj_t* label_date; + lv_obj_t* labelPrompt1; + lv_obj_t* labelTime; + lv_obj_t* labelDate; lv_obj_t* batteryValue; lv_obj_t* stepValue; lv_obj_t* heartbeatValue; lv_obj_t* weather; lv_obj_t* connectState; - lv_obj_t* label_prompt_2; + lv_obj_t* labelPrompt2; Controllers::DateTime& dateTimeController; const Controllers::Battery& batteryController; |
