pinetime/InfiniTime
1
0
Fork 0
Code Activity

clang-format and clang-tidy PineTimeStyle

Browse source
This commit is contained in:
Riku Isokoski 2021-11-13 13:11:32 +02:00
parent 39157f2f19
commit 2e7b51c8e1
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/displayapp/screens/PineTimeStyle.cpp
View file

@ -38,8 +38,8 @@
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
namespace { namespace {
static void event_handler(lv_obj_t* obj, lv_event_t event) { void event_handler(lv_obj_t* obj, lv_event_t event) {
PineTimeStyle* screen = static_cast<PineTimeStyle*>(obj->user_data); auto* screen = static_cast<PineTimeStyle*>(obj->user_data);
screen->UpdateSelected(obj, event); screen->UpdateSelected(obj, event);
} }
} }
@ -169,8 +169,8 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
// Step count gauge // Step count gauge
if (settingsController.GetPTSColorBar() == Pinetime::Controllers::Settings::Colors::White) { if (settingsController.GetPTSColorBar() == Pinetime::Controllers::Settings::Colors::White) {
needle_colors[0] = LV_COLOR_BLACK; needle_colors[0] = LV_COLOR_BLACK;
} else { } else {
needle_colors[0] = LV_COLOR_WHITE; needle_colors[0] = LV_COLOR_WHITE;
} }
stepGauge = lv_gauge_create(lv_scr_act(), nullptr); stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
@ -305,7 +305,7 @@ PineTimeStyle::~PineTimeStyle() {
} }
bool PineTimeStyle::OnTouchEvent(Pinetime::Applications::TouchEvents event) { bool PineTimeStyle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
if ((event == Pinetime::Applications::TouchEvents::LongTap) && (lv_obj_get_hidden(btnRandom) == true)) { if ((event == Pinetime::Applications::TouchEvents::LongTap) && lv_obj_get_hidden(btnRandom)) {
lv_obj_set_hidden(btnSet, false); lv_obj_set_hidden(btnSet, false);
savedTick = lv_tick_get(); savedTick = lv_tick_get();
return true; return true;
@ -392,7 +392,7 @@ void PineTimeStyle::Refresh() {
char hoursChar[3]; char hoursChar[3];
char ampmChar[5]; char ampmChar[5];
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) { if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
sprintf(hoursChar, "%02d", hour); sprintf(hoursChar, "%02d", hour);
} else { } else {
if (hour == 0 && hour != 12) { if (hour == 0 && hour != 12) {
hour = 12; hour = 12;
@ -447,7 +447,7 @@ void PineTimeStyle::Refresh() {
lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE); lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
} }
} }
if (lv_obj_get_hidden(btnSet) == false) { if (!lv_obj_get_hidden(btnSet)) {
if ((savedTick > 0) && (lv_tick_get() - savedTick > 3000)) { if ((savedTick > 0) && (lv_tick_get() - savedTick > 3000)) {
lv_obj_set_hidden(btnSet, true); lv_obj_set_hidden(btnSet, true);
savedTick = 0; savedTick = 0;
@ -463,8 +463,9 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_CLICKED) { if (event == LV_EVENT_CLICKED) {
if (object == btnNextTime) { if (object == btnNextTime) {
valueTime = GetNext(valueTime); valueTime = GetNext(valueTime);
if(valueTime == valueBG) if (valueTime == valueBG) {
valueTime = GetNext(valueTime); valueTime = GetNext(valueTime);
}
settingsController.SetPTSColorTime(valueTime); settingsController.SetPTSColorTime(valueTime);
lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
@ -472,8 +473,9 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
} }
if (object == btnPrevTime) { if (object == btnPrevTime) {
valueTime = GetPrevious(valueTime); valueTime = GetPrevious(valueTime);
if(valueTime == valueBG) if (valueTime == valueBG) {
valueTime = GetPrevious(valueTime); valueTime = GetPrevious(valueTime);
}
settingsController.SetPTSColorTime(valueTime); settingsController.SetPTSColorTime(valueTime);
lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
@ -481,11 +483,12 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
} }
if (object == btnNextBar) { if (object == btnNextBar) {
valueBar = GetNext(valueBar); valueBar = GetNext(valueBar);
if(valueBar == Controllers::Settings::Colors::Black) if (valueBar == Controllers::Settings::Colors::Black) {
valueBar = GetNext(valueBar); valueBar = GetNext(valueBar);
if(valueBar == Controllers::Settings::Colors::White) { }
needle_colors[0] = LV_COLOR_BLACK; if (valueBar == Controllers::Settings::Colors::White) {
} else { needle_colors[0] = LV_COLOR_BLACK;
} else {
needle_colors[0] = LV_COLOR_WHITE; needle_colors[0] = LV_COLOR_WHITE;
} }
settingsController.SetPTSColorBar(valueBar); settingsController.SetPTSColorBar(valueBar);
@ -493,11 +496,12 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
} }
if (object == btnPrevBar) { if (object == btnPrevBar) {
valueBar = GetPrevious(valueBar); valueBar = GetPrevious(valueBar);
if(valueBar == Controllers::Settings::Colors::Black) if (valueBar == Controllers::Settings::Colors::Black) {
valueBar = GetPrevious(valueBar); valueBar = GetPrevious(valueBar);
if(valueBar == Controllers::Settings::Colors::White) { }
needle_colors[0] = LV_COLOR_BLACK; if (valueBar == Controllers::Settings::Colors::White) {
} else { needle_colors[0] = LV_COLOR_BLACK;
} else {
needle_colors[0] = LV_COLOR_WHITE; needle_colors[0] = LV_COLOR_WHITE;
} }
settingsController.SetPTSColorBar(valueBar); settingsController.SetPTSColorBar(valueBar);
@ -505,15 +509,17 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
} }
if (object == btnNextBG) { if (object == btnNextBG) {
valueBG = GetNext(valueBG); valueBG = GetNext(valueBG);
if(valueBG == valueTime) if (valueBG == valueTime) {
valueBG = GetNext(valueBG); valueBG = GetNext(valueBG);
}
settingsController.SetPTSColorBG(valueBG); settingsController.SetPTSColorBG(valueBG);
lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG)); lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
} }
if (object == btnPrevBG) { if (object == btnPrevBG) {
valueBG = GetPrevious(valueBG); valueBG = GetPrevious(valueBG);
if(valueBG == valueTime) if (valueBG == valueTime) {
valueBG = GetPrevious(valueBG); valueBG = GetPrevious(valueBG);
}
settingsController.SetPTSColorBG(valueBG); settingsController.SetPTSColorBG(valueBG);
lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG)); lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
} }
@ -545,12 +551,12 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
} }
settingsController.SetPTSColorTime(static_cast<Controllers::Settings::Colors>(valueTime)); settingsController.SetPTSColorTime(static_cast<Controllers::Settings::Colors>(valueTime));
lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime)); lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Convert(valueTime));
settingsController.SetPTSColorBar(static_cast<Controllers::Settings::Colors>(valueBar)); settingsController.SetPTSColorBar(static_cast<Controllers::Settings::Colors>(valueBar));
lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar)); lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBar));
settingsController.SetPTSColorBG(static_cast<Controllers::Settings::Colors>(valueBG)); settingsController.SetPTSColorBG(static_cast<Controllers::Settings::Colors>(valueBG));
lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG)); lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Convert(valueBG));
} }
if (object == btnClose) { if (object == btnClose) {
CloseMenu(); CloseMenu();

4
src/displayapp/screens/PineTimeStyle.h
View file

@ -54,8 +54,8 @@ namespace Pinetime {
DirtyValue<uint32_t> stepCount {}; DirtyValue<uint32_t> stepCount {};
DirtyValue<bool> notificationState {}; DirtyValue<bool> notificationState {};
Pinetime::Controllers::Settings::Colors GetNext(Controllers::Settings::Colors color); static Pinetime::Controllers::Settings::Colors GetNext(Controllers::Settings::Colors color);
Pinetime::Controllers::Settings::Colors GetPrevious(Controllers::Settings::Colors color); static Pinetime::Controllers::Settings::Colors GetPrevious(Controllers::Settings::Colors color);
lv_obj_t* btnNextTime; lv_obj_t* btnNextTime;
lv_obj_t* btnPrevTime; lv_obj_t* btnPrevTime;