Skip to content

Commit ec2469a

Browse files
Riksu9000Riksu9000
authored
Code cleanup (#466)
* Code cleanup * Remove override again
1 parent 34949a4 commit ec2469a

10 files changed

Lines changed: 42 additions & 66 deletions

File tree

‎src/displayapp/DisplayApp.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void DisplayApp::Refresh() {
202202
break;
203203
case Messages::TimerDone:
204204
if (currentApp == Apps::Timer) {
205-
auto *timer = static_cast<Screens::Timer*>(currentScreen.get());
205+
auto* timer = static_cast<Screens::Timer*>(currentScreen.get());
206206
timer->setDone();
207207
} else {
208208
LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down);
@@ -268,7 +268,7 @@ void DisplayApp::Refresh() {
268268
}
269269
}
270270

271-
if(nextApp != Apps::None) {
271+
if (nextApp != Apps::None) {
272272
LoadApp(nextApp, nextDirection);
273273
nextApp = Apps::None;
274274
}
@@ -383,8 +383,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
383383
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
384384
break;
385385
case Apps::SysInfo:
386-
currentScreen =
387-
std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog, motionController);
386+
currentScreen = std::make_unique<Screens::SystemInfo>(
387+
this, dateTimeController, batteryController, brightnessController, bleController, watchdog, motionController);
388388
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
389389
break;
390390
case Apps::FlashLight:
@@ -429,7 +429,7 @@ void DisplayApp::IdleState() {
429429
}
430430

431431
void DisplayApp::PushMessage(Messages msg) {
432-
if(in_isr()) {
432+
if (in_isr()) {
433433
BaseType_t xHigherPriorityTaskWoken;
434434
xHigherPriorityTaskWoken = pdFALSE;
435435
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
@@ -471,7 +471,7 @@ void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
471471
}
472472

473473
void DisplayApp::PushMessageToSystemTask(Pinetime::System::Messages message) {
474-
if(systemTask != nullptr)
474+
if (systemTask != nullptr)
475475
systemTask->PushMessage(message);
476476
}
477477

‎src/displayapp/screens/Label.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ namespace Pinetime {
1515
bool Refresh() override;
1616

1717
private:
18-
bool running = true;
19-
2018
lv_obj_t* labelText = nullptr;
2119
lv_point_t pageIndicatorBasePoints[2];
2220
lv_point_t pageIndicatorPoints[2];
@@ -25,4 +23,4 @@ namespace Pinetime {
2523
};
2624
}
2725
}
28-
}
26+
}

‎src/displayapp/screens/Motion.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
3232
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
3333
lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
3434
lv_label_set_recolor(label, true);
35-
35+
3636
labelStep = lv_label_create(lv_scr_act(), NULL);
3737
lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
3838
lv_label_set_text(labelStep, "Steps ---");
39-
4039
}
4140

4241
Motion::~Motion() {
@@ -50,13 +49,12 @@ bool Motion::Refresh() {
5049

5150
lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
5251

53-
lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
52+
lv_label_set_text_fmt(label,
53+
"X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#",
54+
motionController.X() / 0x10,
55+
motionController.Y() / 0x10,
56+
motionController.Z() / 0x10);
5457
lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
5558

5659
return running;
5760
}
58-
59-
bool Motion::OnButtonPushed() {
60-
running = false;
61-
return true;
62-
}

‎src/displayapp/screens/Motion.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ namespace Pinetime {
1818
~Motion() override;
1919

2020
bool Refresh() override;
21-
bool OnButtonPushed() override;
2221

2322
private:
2423
Controllers::MotionController& motionController;
@@ -29,10 +28,7 @@ namespace Pinetime {
2928
lv_obj_t* label;
3029

3130
lv_obj_t* labelStep;
32-
static constexpr uint8_t nbStepsBufferSize = 9;
33-
char nbStepsBuffer[nbStepsBufferSize + 1];
34-
bool running = true;
3531
};
3632
}
3733
}
38-
}
34+
}

‎src/displayapp/screens/PineTimeStyle.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -264,23 +264,23 @@ bool PineTimeStyle::Refresh() {
264264
char hoursChar[3];
265265
char ampmChar[5];
266266

267-
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
268-
sprintf(hoursChar, "%02d", hour);
269-
} else {
270-
if (hour == 0 && hour != 12) {
271-
hour = 12;
272-
sprintf(ampmChar, "A\nM");
273-
} else if (hour == 12 && hour != 0) {
274-
hour = 12;
275-
sprintf(ampmChar, "P\nM");
276-
} else if (hour < 12 && hour != 0) {
277-
sprintf(ampmChar, "A\nM");
278-
} else if (hour > 12 && hour != 0) {
279-
hour = hour - 12;
280-
sprintf(ampmChar, "P\nM");
281-
}
282-
sprintf(hoursChar, "%02d", hour);
267+
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
268+
sprintf(hoursChar, "%02d", hour);
269+
} else {
270+
if (hour == 0 && hour != 12) {
271+
hour = 12;
272+
sprintf(ampmChar, "A\nM");
273+
} else if (hour == 12 && hour != 0) {
274+
hour = 12;
275+
sprintf(ampmChar, "P\nM");
276+
} else if (hour < 12 && hour != 0) {
277+
sprintf(ampmChar, "A\nM");
278+
} else if (hour > 12 && hour != 0) {
279+
hour = hour - 12;
280+
sprintf(ampmChar, "P\nM");
283281
}
282+
sprintf(hoursChar, "%02d", hour);
283+
}
284284

285285
if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
286286
minutesChar[1] != displayedChar[3]) {
@@ -292,9 +292,9 @@ bool PineTimeStyle::Refresh() {
292292
char hourStr[3];
293293
char minStr[3];
294294

295-
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
295+
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
296296
lv_label_set_text(timeAMPM, ampmChar);
297-
}
297+
}
298298

299299
/* Display the time as 2 pairs of digits */
300300
sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);

‎src/displayapp/screens/Steps.cpp‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55

66
using namespace Pinetime::Applications::Screens;
77

8-
Steps::Steps(
9-
Pinetime::Applications::DisplayApp *app,
10-
Controllers::MotionController& motionController,
11-
Controllers::Settings &settingsController)
12-
: Screen(app),
13-
motionController{motionController},
14-
settingsController{settingsController} {
8+
Steps::Steps(Pinetime::Applications::DisplayApp* app,
9+
Controllers::MotionController& motionController,
10+
Controllers::Settings& settingsController)
11+
: Screen(app), motionController {motionController}, settingsController {settingsController} {
1512

1613
stepsArc = lv_arc_create(lv_scr_act(), nullptr);
1714

@@ -34,12 +31,12 @@ Steps::Steps(
3431
lv_label_set_text_fmt(lSteps, "%li", stepsCount);
3532
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
3633

37-
lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
34+
lv_obj_t* lstepsL = lv_label_create(lv_scr_act(), nullptr);
3835
lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
3936
lv_label_set_text_static(lstepsL, "Steps");
4037
lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
4138

42-
lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
39+
lv_obj_t* lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
4340
lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
4441
lv_label_set_text_fmt(lstepsGoal, "Goal\n%lu", settingsController.GetStepsGoal());
4542
lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
@@ -59,10 +56,10 @@ Steps::~Steps() {
5956
bool Steps::Refresh() {
6057

6158
stepsCount = motionController.NbSteps();
62-
59+
6360
lv_label_set_text_fmt(lSteps, "%li", stepsCount);
6461
lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
65-
62+
6663
lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
6764

6865
return running;

‎src/displayapp/screens/SystemInfo.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ bool SystemInfo::Refresh() {
7070
return running;
7171
}
7272

73-
bool SystemInfo::OnButtonPushed() {
74-
running = false;
75-
return true;
76-
}
77-
7873
bool SystemInfo::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
7974
return screens.OnTouchEvent(event);
8075
}

‎src/displayapp/screens/SystemInfo.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ namespace Pinetime {
3131
Pinetime::Controllers::MotionController& motionController);
3232
~SystemInfo() override;
3333
bool Refresh() override;
34-
bool OnButtonPushed() override;
3534
bool OnTouchEvent(TouchEvents event) override;
3635

3736
private:
38-
bool running = true;
39-
4037
Pinetime::Controllers::DateTime& dateTimeController;
4138
Pinetime::Controllers::Battery& batteryController;
4239
Pinetime::Controllers::BrightnessController& brightnessController;
@@ -56,4 +53,4 @@ namespace Pinetime {
5653
};
5754
}
5855
}
59-
}
56+
}

‎src/displayapp/screens/settings/QuickSettings.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
2727
batteryController {batteryController},
2828
dateTimeController {dateTimeController},
2929
brightness {brightness},
30-
motorController{motorController},
30+
motorController {motorController},
3131
settingsController {settingsController} {
3232

3333
// Time
@@ -154,10 +154,6 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
154154
}
155155
}
156156

157-
bool QuickSettings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
158-
return false;
159-
}
160-
161157
bool QuickSettings::Refresh() {
162158
return running;
163159
}

‎src/displayapp/screens/settings/QuickSettings.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ namespace Pinetime {
2929

3030
bool Refresh() override;
3131

32-
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
3332
void OnButtonEvent(lv_obj_t* object, lv_event_t event);
3433

3534
void UpdateScreen();

0 commit comments

Comments
 (0)