diff options
Diffstat (limited to 'src/displayapp/screens/settings')
-rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 83 | ||||
-rw-r--r-- | src/displayapp/screens/settings/Settings.h | 41 |
2 files changed, 54 insertions, 70 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index a91b8f77..ffa01d18 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -1,33 +1,27 @@ #include "displayapp/screens/settings/Settings.h" #include <lvgl/lvgl.h> -#include <array> -#include "displayapp/screens/List.h" +#include <functional> #include "displayapp/Apps.h" #include "displayapp/DisplayApp.h" -#include "displayapp/screens/Symbols.h" using namespace Pinetime::Applications::Screens; +constexpr std::array<List::Applications, Settings::entries.size()> Settings::entries; + +auto Settings::CreateScreenList() const { + std::array<std::function<std::unique_ptr<Screen>()>, nScreens> screens; + for (size_t i = 0; i < screens.size(); i++) { + screens[i] = [this, i]() -> std::unique_ptr<Screen> { + return CreateScreen(i); + }; + } + return 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(); - }, - [this]() -> std::unique_ptr<Screen> { - return CreateScreen3(); - }, - [this]() -> std::unique_ptr<Screen> { - return CreateScreen4(); - }, - }, - Screens::ScreenListModes::UpDown} { + screens {app, settingsController.GetSettingsMenu(), CreateScreenList(), Screens::ScreenListModes::UpDown} { } Settings::~Settings() { @@ -38,48 +32,11 @@ bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) { return screens.OnTouchEvent(event); } -std::unique_ptr<Screen> Settings::CreateScreen1() { - std::array<Screens::List::Applications, 4> applications {{ - {Symbols::sun, "Display", Apps::SettingDisplay}, - {Symbols::eye, "Wake Up", Apps::SettingWakeUp}, - {Symbols::clock, "Time format", Apps::SettingTimeFormat}, - {Symbols::home, "Watch face", Apps::SettingWatchFace}, - }}; - - return std::make_unique<Screens::List>(0, 4, app, settingsController, applications); -} - -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}, - }}; - - return std::make_unique<Screens::List>(1, 4, app, settingsController, applications); -} - -std::unique_ptr<Screen> Settings::CreateScreen3() { - - std::array<Screens::List::Applications, 4> applications {{ - {Symbols::clock, "Chimes", Apps::SettingChimes}, - {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, - {Symbols::check, "Firmware", Apps::FirmwareValidation}, - {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth}, - }}; - - return std::make_unique<Screens::List>(2, 4, app, settingsController, applications); -} - -std::unique_ptr<Screen> Settings::CreateScreen4() { - - std::array<Screens::List::Applications, 4> applications {{ - {Symbols::list, "About", Apps::SysInfo}, - {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None}, - }}; +std::unique_ptr<Screen> Settings::CreateScreen(unsigned int screenNum) const { + std::array<List::Applications, entriesPerScreen> screens; + for (int i = 0; i < entriesPerScreen; i++) { + screens[i] = entries[screenNum * entriesPerScreen + i]; + } - return std::make_unique<Screens::List>(3, 4, app, settingsController, applications); + return std::make_unique<Screens::List>(screenNum, nScreens, app, settingsController, screens); } diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h index be090075..a86db44f 100644 --- a/src/displayapp/screens/settings/Settings.h +++ b/src/displayapp/screens/settings/Settings.h @@ -1,8 +1,11 @@ #pragma once -#include <cstdint> +#include <array> +#include <memory> #include "displayapp/screens/Screen.h" #include "displayapp/screens/ScreenList.h" +#include "displayapp/screens/Symbols.h" +#include "displayapp/screens/List.h" namespace Pinetime { @@ -17,14 +20,38 @@ namespace Pinetime { bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override; private: - Controllers::Settings& settingsController; + auto CreateScreenList() const; + std::unique_ptr<Screen> CreateScreen(unsigned int screenNum) const; - ScreenList<4> screens; + Controllers::Settings& settingsController; - std::unique_ptr<Screen> CreateScreen1(); - std::unique_ptr<Screen> CreateScreen2(); - std::unique_ptr<Screen> CreateScreen3(); - std::unique_ptr<Screen> CreateScreen4(); + static constexpr int entriesPerScreen = 4; + + // Increment this when more space is needed + static constexpr int nScreens = 4; + + static constexpr std::array<List::Applications, entriesPerScreen * nScreens> entries {{ + {Symbols::sun, "Display", Apps::SettingDisplay}, + {Symbols::eye, "Wake Up", Apps::SettingWakeUp}, + {Symbols::clock, "Time format", Apps::SettingTimeFormat}, + {Symbols::home, "Watch face", Apps::SettingWatchFace}, + + {Symbols::shoe, "Steps", Apps::SettingSteps}, + {Symbols::clock, "Set date", Apps::SettingSetDate}, + {Symbols::clock, "Set time", Apps::SettingSetTime}, + {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}, + + {Symbols::clock, "Chimes", Apps::SettingChimes}, + {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, + {Symbols::check, "Firmware", Apps::FirmwareValidation}, + {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth}, + + {Symbols::list, "About", Apps::SysInfo}, + {Symbols::none, "None", Apps::None}, + {Symbols::none, "None", Apps::None}, + {Symbols::none, "None", Apps::None}, + }}; + ScreenList<nScreens> screens; }; } } |