will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TimerController: Rename to Timer

Browse Source
This commit is contained in:
Riku Isokoski
2023-04-11 12:18:49 +03:00
parent 661ffbeb1e
commit 40f7e1c7be
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/displayapp/screens/Timer.cpp
View File

@@ -17,7 +17,7 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
}
}
Timer::Timer(Controllers::TimerController& timerController) : timerController {timerController} {
Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {
lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@@ -85,7 +85,7 @@ void Timer::MaskReset() {
buttonPressing = false;
// A click event is processed before a release event,
// so the release event would override the "Pause" text without this check
if (!timerController.IsRunning()) {
if (!timer.IsRunning()) {
lv_label_set_text_static(txtPlayPause, "Start");
}
maskPosition = 0;
@@ -103,8 +103,8 @@ void Timer::UpdateMask() {
}
void Timer::Refresh() {
if (timerController.IsRunning()) {
auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timerController.GetTimeRemaining());
if (timer.IsRunning()) {
auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timer.GetTimeRemaining());
minuteCounter.SetValue(secondsRemaining.count() / 60);
secondCounter.SetValue(secondsRemaining.count() % 60);
} else if (buttonPressing && xTaskGetTickCount() > pressTime + pdMS_TO_TICKS(150)) {
@@ -132,15 +132,15 @@ void Timer::SetTimerStopped() {
}
void Timer::ToggleRunning() {
if (timerController.IsRunning()) {
auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timerController.GetTimeRemaining());
if (timer.IsRunning()) {
auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timer.GetTimeRemaining());
minuteCounter.SetValue(secondsRemaining.count() / 60);
secondCounter.SetValue(secondsRemaining.count() % 60);
timerController.StopTimer();
timer.StopTimer();
SetTimerStopped();
} else if (secondCounter.GetValue() + minuteCounter.GetValue() > 0) {
auto timerDuration = std::chrono::minutes(minuteCounter.GetValue()) + std::chrono::seconds(secondCounter.GetValue());
timerController.StartTimer(timerDuration);
timer.StartTimer(timerDuration);
Refresh();
SetTimerRunning();
}

6
src/displayapp/screens/Timer.h
View File

@@ -7,12 +7,12 @@
#include "displayapp/widgets/Counter.h"
#include <lvgl/lvgl.h>
#include "components/timer/TimerController.h"
#include "components/timer/Timer.h"
namespace Pinetime::Applications::Screens {
class Timer : public Screen {
public:
Timer(Controllers::TimerController& timerController);
Timer(Controllers::Timer& timerController);
~Timer() override;
void Refresh() override;
void Reset();
@@ -24,7 +24,7 @@ namespace Pinetime::Applications::Screens {
void SetTimerRunning();
void SetTimerStopped();
void UpdateMask();
Controllers::TimerController& timerController;
Controllers::Timer& timer;
lv_obj_t* btnPlayPause;
lv_obj_t* txtPlayPause;