diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
commit | cf9e149b33885c67c84697a9b422e123c090bc72 (patch) | |
tree | c59c322655180d670ebaa3a47e9686eaada5eff7 /src/displayapp/DisplayApp.cpp | |
parent | 977faebcb8b26212e0868b30e1af5c38076ff6cb (diff) | |
parent | 3e9c30a18fb0a0fa7cc69e62821ca0d11e518f47 (diff) |
Merge with develop and fix conflicts from timaios:set-datetime-manually.
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r-- | src/displayapp/DisplayApp.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 837082dd..e763cda6 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -44,6 +44,8 @@ #include "displayapp/screens/settings/SettingDisplay.h" #include "displayapp/screens/settings/SettingSteps.h" #include "displayapp/screens/settings/SettingPineTimeStyle.h" +#include "displayapp/screens/settings/SettingSetDate.h" +#include "displayapp/screens/settings/SettingSetTime.h" #include "libs/lv_conf.h" @@ -365,6 +367,14 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; + case Apps::SettingSetDate: + currentScreen = std::make_unique<Screens::SettingSetDate>(this, dateTimeController); + ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); + break; + case Apps::SettingSetTime: + currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController); + ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); + break; case Apps::SettingPineTimeStyle: currentScreen = std::make_unique<Screens::SettingPineTimeStyle>(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); |