will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "fancy" settings display and always show ShakeWakeThresholdSetting

Browse Source
This commit is contained in:
Tim Keller 2021-10-05 03:29:49 +00:00
parent 98ac447bdb
commit 92b1e83e3e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/displayapp/screens/settings/Settings.cpp
View File

@ -47,26 +47,22 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
std::unique_ptr<Screen> Settings::CreateScreen2() { std::unique_ptr<Screen> Settings::CreateScreen2() {
std::array<Screens::List::Applications, 4> applications {{ std::array<Screens::List::Applications, 4> applications {{{Symbols::shoe, "Steps", Apps::SettingSteps},
{Symbols::shoe, "Steps", Apps::SettingSteps}, {Symbols::clock, "Set date", Apps::SettingSetDate},
{Symbols::clock, "Set date", Apps::SettingSetDate}, {Symbols::clock, "Set time", Apps::SettingSetTime},
{Symbols::clock, "Set time", Apps::SettingSetTime}, {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}}};
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo}
}};
return std::make_unique<Screens::List>(1, 3, app, settingsController, applications); return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
} }
std::unique_ptr<Screen> Settings::CreateScreen3() { std::unique_ptr<Screen> Settings::CreateScreen3() {
std::array<Screens::List::Applications, 4> applications {{ std::array<Screens::List::Applications, 4> applications {{{Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
{Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::none, "Wake Sense", Apps::SettingShakeThreshold},
{Symbols::list, "About", Apps::SysInfo}, {Symbols::check, "Firmware", Apps::FirmwareValidation},
{Symbols::none, "None", Apps::None}, {Symbols::list, "About", Apps::SysInfo}
{Symbols::none, "None", Apps::None}
}}; }};
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); return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
} }