diff options
| author | Tim Keller <geekboy1011@gmail.com> | 2021-10-05 03:29:49 +0000 |
|---|---|---|
| committer | Tim Keller <geekboy1011@gmail.com> | 2022-01-04 02:01:31 +0000 |
| commit | 92b1e83e3efab14140fa48267dbb49c4210ea85c (patch) | |
| tree | 5261b61b38ba174453aa8ba09d1e7f6acb179d8e /src/displayapp/screens/settings/Settings.cpp | |
| parent | 98ac447bdbadc65b3c7cc1ee9bddee327bd41b6c (diff) | |
Remove "fancy" settings display and always show ShakeWakeThresholdSetting
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
| -rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index 0f77456a..ea72ec96 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -47,26 +47,22 @@ 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::clock, "Set date", Apps::SettingSetDate}, - {Symbols::clock, "Set time", Apps::SettingSetTime}, - {Symbols::batteryHalf, "Battery", Apps::BatteryInfo} - }}; + std::array<Screens::List::Applications, 4> applications {{{Symbols::shoe, "Steps", Apps::SettingSteps}, + {Symbols::clock, "Set date", Apps::SettingSetDate}, + {Symbols::clock, "Set time", Apps::SettingSetTime}, + {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}}}; return std::make_unique<Screens::List>(1, 3, app, settingsController, applications); } std::unique_ptr<Screen> Settings::CreateScreen3() { - std::array<Screens::List::Applications, 4> applications {{ - {Symbols::check, "Firmware", Apps::FirmwareValidation}, - {Symbols::list, "About", Apps::SysInfo}, - {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None} + std::array<Screens::List::Applications, 4> applications {{{Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, + {Symbols::none, "Wake Sense", Apps::SettingShakeThreshold}, + {Symbols::check, "Firmware", Apps::FirmwareValidation}, + {Symbols::list, "About", Apps::SysInfo} + }}; - if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake)) { - applications[1] = {Symbols::list, "Wake Sense", Apps::SettingShakeThreshold}; - } + return std::make_unique<Screens::List>(2, 3, app, settingsController, applications); }
\ No newline at end of file |