scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Close menu with button

Browse source
This commit is contained in:
Riku Isokoski 2021-11-13 13:02:00 +02:00
parent 18e3cc7038
commit 39157f2f19
5 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/displayapp/DisplayApp.cpp
View file

@ -249,10 +249,10 @@ void DisplayApp::Refresh() {
} }
} break; } break;
case Messages::ButtonPushed: case Messages::ButtonPushed:
if (currentApp == Apps::Clock) { if (!currentScreen->OnButtonPushed()) {
PushMessageToSystemTask(System::Messages::GoToSleep); if (currentApp == Apps::Clock) {
} else { PushMessageToSystemTask(System::Messages::GoToSleep);
if (!currentScreen->OnButtonPushed()) { } else {
LoadApp(returnToApp, returnDirection); LoadApp(returnToApp, returnDirection);
brightnessController.Set(settingsController.GetBrightness()); brightnessController.Set(settingsController.GetBrightness());
brightnessController.Backup(); brightnessController.Backup();

4
src/displayapp/screens/Clock.cpp
View file

@ -54,6 +54,10 @@ bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
return screen->OnTouchEvent(event); return screen->OnTouchEvent(event);
} }
bool Clock::OnButtonPushed() {
return screen->OnButtonPushed();
}
std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() { std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
return std::make_unique<Screens::WatchFaceDigital>(app, return std::make_unique<Screens::WatchFaceDigital>(app,
dateTimeController, dateTimeController,

1
src/displayapp/screens/Clock.h
View file

@ -32,6 +32,7 @@ namespace Pinetime {
~Clock() override; ~Clock() override;
bool OnTouchEvent(TouchEvents event) override; bool OnTouchEvent(TouchEvents event) override;
bool OnButtonPushed() override;
private: private:
Controllers::DateTime& dateTimeController; Controllers::DateTime& dateTimeController;

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

@ -316,6 +316,27 @@ bool PineTimeStyle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
return false; return false;
} }
void PineTimeStyle::CloseMenu() {
settingsController.SaveSettings();
lv_obj_set_hidden(btnNextTime, true);
lv_obj_set_hidden(btnPrevTime, true);
lv_obj_set_hidden(btnNextBar, true);
lv_obj_set_hidden(btnPrevBar, true);
lv_obj_set_hidden(btnNextBG, true);
lv_obj_set_hidden(btnPrevBG, true);
lv_obj_set_hidden(btnReset, true);
lv_obj_set_hidden(btnRandom, true);
lv_obj_set_hidden(btnClose, true);
}
bool PineTimeStyle::OnButtonPushed() {
if (!lv_obj_get_hidden(btnClose)) {
CloseMenu();
return true;
}
return false;
}
void PineTimeStyle::SetBatteryIcon() { void PineTimeStyle::SetBatteryIcon() {
auto batteryPercent = batteryPercentRemaining.Get(); auto batteryPercent = batteryPercentRemaining.Get();
lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent)); lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
@ -532,16 +553,7 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
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) {
settingsController.SaveSettings(); CloseMenu();
lv_obj_set_hidden(btnNextTime, true);
lv_obj_set_hidden(btnPrevTime, true);
lv_obj_set_hidden(btnNextBar, true);
lv_obj_set_hidden(btnPrevBar, true);
lv_obj_set_hidden(btnNextBG, true);
lv_obj_set_hidden(btnPrevBG, true);
lv_obj_set_hidden(btnReset, true);
lv_obj_set_hidden(btnRandom, true);
lv_obj_set_hidden(btnClose, true);
} }
if (object == btnSet) { if (object == btnSet) {
lv_obj_set_hidden(btnSet, true); lv_obj_set_hidden(btnSet, true);
@ -579,4 +591,4 @@ Pinetime::Controllers::Settings::Colors PineTimeStyle::GetPrevious(Pinetime::Con
prevColor = static_cast<Controllers::Settings::Colors>(16); prevColor = static_cast<Controllers::Settings::Colors>(16);
} }
return prevColor; return prevColor;
} }

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

@ -31,6 +31,7 @@ namespace Pinetime {
~PineTimeStyle() override; ~PineTimeStyle() override;
bool OnTouchEvent(TouchEvents event) override; bool OnTouchEvent(TouchEvents event) override;
bool OnButtonPushed() override;
void Refresh() override; void Refresh() override;
@ -96,9 +97,10 @@ namespace Pinetime {
Controllers::MotionController& motionController; Controllers::MotionController& motionController;
void SetBatteryIcon(); void SetBatteryIcon();
void CloseMenu();
lv_task_t* taskRefresh; lv_task_t* taskRefresh;
}; };
} }
} }
} }