summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings/Settings.cpp
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-08-28 18:56:34 (GMT)
committerGitHub <noreply@github.com>2021-08-28 18:56:34 (GMT)
commitef9f809e14155ff304b8f047aa3beae3dabb78e8 (patch)
treec155a5efa01b181994b9cb976d686a37fc89c89c /src/displayapp/screens/settings/Settings.cpp
parent2870d3ae6c00f127883e6cedecda328994b0fec7 (diff)
parent8ac1ae70cc97840c5464287331b17f6319669d2c (diff)
Merge pull request #458 from kieranc/pinetimestyle-colorpicker
Add color picker for PineTimeStyle watchface
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r--src/displayapp/screens/settings/Settings.cpp19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 48e3afb..f82b03c 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen2();
+ },
+ [this]() -> std::unique_ptr<Screen> {
+ return CreateScreen3();
}},
Screens::ScreenListModes::UpDown} {
}
@@ -39,7 +42,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::home, "Watch face", Apps::SettingWatchFace},
}};
- return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
+ return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
}
std::unique_ptr<Screen> Settings::CreateScreen2() {
@@ -51,5 +54,17 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
{Symbols::list, "About", Apps::SysInfo},
}};
- return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+ 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::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
+ {Symbols::none, "None", Apps::None},
+ {Symbols::none, "None", Apps::None},
+ {Symbols::none, "None", Apps::None},
+ }};
+
+ return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
}