summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-27 07:22:39 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-27 07:22:39 (GMT)
commitbedaa08f560063ce64514108d67d84a90321ad90 (patch)
tree0060c3cff306e67c511534e95ecfeba1f0c3101e
parent5313a788fed9a4cf19214eee8e9b1b4a67d043c4 (diff)
Revert "this appears to fix a simulator crash!"
This reverts commit bde464a7844fd51daf73b9ec939fbd9412424a5e.
-rw-r--r--src/displayapp/screens/settings/Settings.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 01dd534..b71e333 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -17,9 +17,6 @@ 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} {
}
@@ -37,20 +34,10 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::sun, "Display", Apps::SettingDisplay},
{Symbols::eye, "Wake Up", Apps::SettingWakeUp},
{Symbols::clock, "Time format", Apps::SettingTimeFormat},
- {Symbols::none, "None", Apps::None}
+ {Symbols::check, "Firmware", Apps::FirmwareValidation},
}};
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);
-}