diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:29:45 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:29:45 (GMT) |
| commit | 4bead413bbbb3e9c59d2030e02fdd5a80b66ae79 (patch) | |
| tree | c1eb1fc2e3a570bdc9967e284e118027bed4ccb2 | |
| parent | 7c21234cd3c2e008e10ac210bb5acf45f8c51f93 (diff) | |
Revert "Revert "this appears to fix a simulator crash!""
This reverts commit bedaa08f560063ce64514108d67d84a90321ad90.
| -rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index b71e333..01dd534 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -17,6 +17,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); }, + [this]() -> std::unique_ptr<Screen> { + return CreateScreen2(); + }, }, Screens::ScreenListModes::UpDown} { } @@ -34,10 +37,20 @@ std::unique_ptr<Screen> Settings::CreateScreen1() { {Symbols::sun, "Display", Apps::SettingDisplay}, {Symbols::eye, "Wake Up", Apps::SettingWakeUp}, {Symbols::clock, "Time format", Apps::SettingTimeFormat}, - {Symbols::check, "Firmware", Apps::FirmwareValidation}, + {Symbols::none, "None", Apps::None} }}; return std::make_unique<Screens::List>(0, 1, app, settingsController, applications); } +std::unique_ptr<Screen> Settings::CreateScreen2() { + std::array<Screens::List::Applications, 4> applications {{ + {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, + {Symbols::check, "Firmware", Apps::FirmwareValidation}, + {Symbols::none, "None", Apps::None}, + {Symbols::none, "None", Apps::None} +}}; + + return std::make_unique<Screens::List>(1, 2, app, settingsController, applications); +} |
