diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-05-15 22:32:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 22:32:40 +0200 |
| commit | 09977c28c040ebbfc258806af5c14321469a0f09 (patch) | |
| tree | f758dece777e9c708222dbd60f494e97f14d14ab /src/displayapp/DisplayApp.cpp | |
| parent | 4e95e4b5387dd8f4e7368021875ff1a47255e796 (diff) | |
| parent | cd0d85dff95bbc5f285d92eb78a642aab1ae4b8b (diff) | |
Merge pull request #298 from joaquimorg/StepsApp
New Steps app
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 9ec9640b..cc1f6b6c 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -25,6 +25,7 @@ #include "displayapp/screens/Twos.h" #include "displayapp/screens/FlashLight.h" #include "displayapp/screens/BatteryInfo.h" +#include "displayapp/screens/Steps.h" #include "drivers/Cst816s.h" #include "drivers/St7789.h" @@ -37,6 +38,7 @@ #include "displayapp/screens/settings/SettingTimeFormat.h" #include "displayapp/screens/settings/SettingWakeUp.h" #include "displayapp/screens/settings/SettingDisplay.h" +#include "displayapp/screens/settings/SettingSteps.h" using namespace Pinetime::Applications; using namespace Pinetime::Applications::Display; @@ -289,6 +291,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; + case Apps::SettingSteps: + currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController); + returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); + break; case Apps::BatteryInfo: currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); @@ -328,6 +334,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) case Apps::Motion: currentScreen = std::make_unique<Screens::Motion>(this, motionController); break; + case Apps::Steps: + currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController); + break; } currentApp = app; } |