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/screens/settings/Settings.cpp | |
parent | 4e95e4b5387dd8f4e7368021875ff1a47255e796 (diff) | |
parent | cd0d85dff95bbc5f285d92eb78a642aab1ae4b8b (diff) |
Merge pull request #298 from joaquimorg/StepsApp
New Steps app
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index e24be3d7..2c72c832 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -44,9 +44,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() { {Symbols::clock, "Wake Up", Apps::SettingWakeUp}, {Symbols::clock, "Time format", Apps::SettingTimeFormat}, {Symbols::clock, "Watch face", Apps::SettingWatchFace}, - } - - }; + }}; return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications)); } @@ -54,13 +52,11 @@ std::unique_ptr<Screen> Settings::CreateScreen1() { std::unique_ptr<Screen> Settings::CreateScreen2() { std::array<Screens::List::Applications, 4> applications {{ + {Symbols::shoe, "Steps", Apps::SettingSteps}, {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::list, "About", Apps::SysInfo}, - {"", "", Apps::None}, - } - - }; + }}; return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications)); } |