summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings/Settings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r--src/displayapp/screens/settings/Settings.cpp61
1 files changed, 27 insertions, 34 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 06776525..2c72c832 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -8,27 +8,27 @@
using namespace Pinetime::Applications::Screens;
-Settings::Settings(
- Pinetime::Applications::DisplayApp *app,
- Pinetime::Controllers::Settings &settingsController) :
- Screen(app),
- settingsController{settingsController},
- screens{app,
- settingsController.GetSettingsMenu(),
- {
- [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); },
- [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); }
- },
- Screens::ScreenListModes::UpDown
- } {}
+Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+ : Screen(app),
+ settingsController {settingsController},
+ screens {app,
+ settingsController.GetSettingsMenu(),
+ {[this]() -> std::unique_ptr<Screen> {
+ return CreateScreen1();
+ },
+ [this]() -> std::unique_ptr<Screen> {
+ return CreateScreen2();
+ }},
+ Screens::ScreenListModes::UpDown} {
+}
Settings::~Settings() {
lv_obj_clean(lv_scr_act());
}
bool Settings::Refresh() {
-
- if(running)
+
+ if (running)
running = screens.Refresh();
return running;
}
@@ -39,31 +39,24 @@ bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
std::unique_ptr<Screen> Settings::CreateScreen1() {
- std::array<Screens::List::Applications, 4> applications {
- {
- {Symbols::sun, "Display", Apps::SettingDisplay},
- {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
- {Symbols::clock, "Time format", Apps::SettingTimeFormat},
- {Symbols::clock, "Watch face", Apps::SettingWatchFace},
- }
-
- };
+ std::array<Screens::List::Applications, 4> applications {{
+ {Symbols::sun, "Display", Apps::SettingDisplay},
+ {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));
}
-
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},
- }
-
- };
+ 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},
+ }};
return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications));
}