Skip to content

Commit 807a19d

Browse files
RaupingerRaupinger
committed
Style improvements
1 parent 63484f1 commit 807a19d

6 files changed

Lines changed: 52 additions & 40 deletions

File tree

‎src/components/timer/TimerController.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ using namespace Pinetime::Controllers;
1313
APP_TIMER_DEF(timerAppTimer);
1414

1515

16-
TimerController::TimerController(System::SystemTask& systemTask) : systemTask {systemTask} {
16+
TimerController::TimerController(System::SystemTask& systemTask) : systemTask{systemTask} {
1717
}
1818

1919

2020
void TimerController::Init() {
2121
app_timer_create(&timerAppTimer, APP_TIMER_MODE_SINGLE_SHOT, timerEnd);
22-
22+
2323
}
2424

2525
void TimerController::StartTimer(uint32_t duration) {
@@ -30,7 +30,7 @@ void TimerController::StartTimer(uint32_t duration) {
3030
//you might be wondering why im not simply using app_timer_cnt_get() here. I am too. It is in app_timer.h, but the compiler says it
3131
// doesnt exist
3232
endTime = ((static_cast<float >(xTaskGetTickCount()) / static_cast<float >(configTICK_RATE_HZ)) * 1000 + APP_TIMER_TICKS(duration)) -
33-
APP_TIMER_TICKS(duration) * 0.024;
33+
APP_TIMER_TICKS(duration) * 0.024;
3434
timerRunning = true;
3535
}
3636

@@ -44,7 +44,7 @@ uint32_t TimerController::GetTimeRemaining() {
4444

4545
void TimerController::timerEnd(void* p_context) {
4646

47-
auto *controller = static_cast<Controllers::TimerController*> (p_context);
47+
auto* controller = static_cast<Controllers::TimerController*> (p_context);
4848
controller->timerRunning = false;
4949
controller->systemTask.PushMessage(System::SystemTask::Messages::OnTimerDone);
5050
}

‎src/components/timer/TimerController.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,23 @@ namespace Pinetime {
1212
class TimerController {
1313
public:
1414
TimerController(Pinetime::System::SystemTask& systemTask);
15+
1516
void Init();
17+
1618
void StartTimer(uint32_t duration);
19+
1720
void StopTimer();
21+
1822
uint32_t GetTimeRemaining();
19-
bool IsRunning();
2023

24+
bool IsRunning();
25+
2126
private:
2227
System::SystemTask& systemTask;
28+
2329
static void timerEnd(void* p_context);
24-
uint32_t endTime;
30+
31+
uint32_t endTime{};
2532
bool timerRunning = false;
2633
};
2734
}

‎src/displayapp/DisplayApp.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
276276
ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
277277
break;
278278
case Apps::Timer:
279-
currentScreen = std::make_unique<Screens::Timer>(
280-
this, timerController);
279+
currentScreen = std::make_unique<Screens::Timer>(this, timerController);
281280
break;
282281

283282
// Settings

‎src/displayapp/screens/Timer.cpp‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "lvgl/lvgl.h"
66

77

8-
98
using namespace Pinetime::Applications::Screens;
109

1110

@@ -36,7 +35,7 @@ void Timer::createButtons() {
3635
btnSecondsUp = lv_btn_create(lv_scr_act(), nullptr);
3736
btnSecondsUp->user_data = this;
3837
lv_obj_set_event_cb(btnSecondsUp, btnEventHandler);
39-
lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID,10 , -80);
38+
lv_obj_align(btnSecondsUp, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 10, -80);
4039
lv_obj_set_height(btnSecondsUp, 40);
4140
lv_obj_set_width(btnSecondsUp, 60);
4241
txtSUp = lv_label_create(btnSecondsUp, nullptr);
@@ -56,16 +55,16 @@ void Timer::createButtons() {
5655

5756
Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
5857
: Screen(app),
59-
running {true},
60-
timerController {timerController}{
58+
running{true},
59+
timerController{timerController} {
6160

6261
time = lv_label_create(lv_scr_act(), nullptr);
6362
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
6463
lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
65-
66-
uint32_t seconds = timerController.GetTimeRemaining()/1000;
67-
lv_label_set_text_fmt(time, "%02d:%02d" , seconds/60, seconds%60);
68-
64+
65+
uint32_t seconds = timerController.GetTimeRemaining() / 1000;
66+
lv_label_set_text_fmt(time, "%02d:%02d", seconds / 60, seconds % 60);
67+
6968
lv_obj_align(time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, -20);
7069

7170
btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
@@ -91,8 +90,8 @@ Timer::~Timer() {
9190

9291
bool Timer::Refresh() {
9392
if (timerController.IsRunning()) {
94-
uint32_t seconds = timerController.GetTimeRemaining()/1000;
95-
lv_label_set_text_fmt(time, "%02d:%02d" , seconds/60, seconds%60);
93+
uint32_t seconds = timerController.GetTimeRemaining() / 1000;
94+
lv_label_set_text_fmt(time, "%02d:%02d", seconds / 60, seconds % 60);
9695
}
9796
return running;
9897
}
@@ -102,15 +101,15 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
102101
if (obj == btnPlayPause) {
103102
if (timerController.IsRunning()) {
104103
lv_label_set_text(txtPlayPause, Symbols::play);
105-
uint32_t seconds = timerController.GetTimeRemaining()/1000;
106-
minutesToSet = seconds/60;
107-
secondsToSet = seconds%60;
104+
uint32_t seconds = timerController.GetTimeRemaining() / 1000;
105+
minutesToSet = seconds / 60;
106+
secondsToSet = seconds % 60;
108107
timerController.StopTimer();
109108
createButtons();
110-
109+
111110
} else if (secondsToSet + minutesToSet > 0) {
112111
lv_label_set_text(txtPlayPause, Symbols::pause);
113-
timerController.StartTimer((secondsToSet + minutesToSet * 60)*1000);
112+
timerController.StartTimer((secondsToSet + minutesToSet * 60) * 1000);
114113

115114
lv_obj_del(btnSecondsDown);
116115
btnSecondsDown = nullptr;
@@ -120,43 +119,42 @@ void Timer::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
120119
btnMinutesDown = nullptr;
121120
lv_obj_del(btnMinutesUp);
122121
btnMinutesUp = nullptr;
123-
122+
124123
}
125-
}
126-
else {
124+
} else {
127125
if (!timerController.IsRunning()) {
128126
if (obj == btnMinutesUp) {
129127
if (minutesToSet >= 59) {
130128
minutesToSet = 0;
131129
} else {
132130
minutesToSet++;
133131
}
134-
lv_label_set_text_fmt(time, "%02d:%02d" , minutesToSet, secondsToSet);
135-
132+
lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
133+
136134
} else if (obj == btnMinutesDown) {
137135
if (minutesToSet == 0) {
138136
minutesToSet = 59;
139137
} else {
140138
minutesToSet--;
141139
}
142-
lv_label_set_text_fmt(time, "%02d:%02d" , minutesToSet, secondsToSet);
143-
140+
lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
141+
144142
} else if (obj == btnSecondsUp) {
145143
if (secondsToSet >= 59) {
146144
secondsToSet = 0;
147145
} else {
148146
secondsToSet++;
149147
}
150-
lv_label_set_text_fmt(time, "%02d:%02d" , minutesToSet, secondsToSet);
151-
148+
lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
149+
152150
} else if (obj == btnSecondsDown) {
153151
if (secondsToSet == 0) {
154152
secondsToSet = 59;
155153
} else {
156154
secondsToSet--;
157155
}
158-
lv_label_set_text_fmt(time, "%02d:%02d" , minutesToSet, secondsToSet);
159-
156+
lv_label_set_text_fmt(time, "%02d:%02d", minutesToSet, secondsToSet);
157+
160158
}
161159
}
162160

‎src/displayapp/screens/Timer.h‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,19 @@ namespace Pinetime::Applications::Screens {
1212

1313
class Timer : public Screen {
1414
public:
15-
16-
enum class Modes { Normal, Done };
15+
16+
enum class Modes {
17+
Normal, Done
18+
};
19+
1720
Timer(DisplayApp* app, Controllers::TimerController& timerController);
21+
1822
~Timer() override;
23+
1924
bool Refresh() override;
2025

2126
void setDone();
27+
2228
void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
2329

2430
private:
@@ -30,7 +36,7 @@ namespace Pinetime::Applications::Screens {
3036

3137
void createButtons();
3238

33-
lv_obj_t *time, *msecTime, *btnPlayPause, *txtPlayPause, *btnMinutesUp, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
34-
*txtMDown, *txtSUp, *txtSDown;
39+
lv_obj_t* time, * msecTime, * btnPlayPause, * txtPlayPause, * btnMinutesUp, * btnMinutesDown, * btnSecondsUp, * btnSecondsDown, * txtMUp,
40+
* txtMDown, * txtSUp, * txtSDown;
3541
};
3642
}

‎src/systemtask/SystemTask.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,16 @@ void SystemTask::Work() {
228228
displayApp->PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime);
229229
break;
230230
case Messages::OnNewNotification:
231-
if (isSleeping && !isWakingUp)
231+
if (isSleeping && !isWakingUp) {
232232
GoToRunning();
233+
}
233234
motorController.SetDuration(35);
234235
displayApp->PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
235236
break;
236237
case Messages::OnTimerDone:
237-
if (isSleeping && !isWakingUp)
238+
if (isSleeping && !isWakingUp) {
238239
GoToRunning();
240+
}
239241
motorController.SetDuration(35);
240242
displayApp->PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
241243
break;

0 commit comments

Comments
 (0)