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

Added new menu entries to Settings page

Browse Source
This commit is contained in:
timaios 2021-07-09 14:22:45 +02:00 committed by GitHub
parent f3f5eb5739
commit 5ae4192d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
}, },
[this]() -> std::unique_ptr<Screen> { [this]() -> std::unique_ptr<Screen> {
return CreateScreen2(); return CreateScreen2();
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen3();
}}, }},
Screens::ScreenListModes::UpDown} { Screens::ScreenListModes::UpDown} {
} }
@ -46,7 +49,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::clock, "Watch face", Apps::SettingWatchFace}, {Symbols::clock, "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() { std::unique_ptr<Screen> Settings::CreateScreen2() {
@ -58,5 +61,15 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
{Symbols::list, "About", Apps::SysInfo}, {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::clock, "Set date", Apps::SettingSetDate},
{Symbols::clock, "Set time", Apps::SettingSetTime},
}};
return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
} }

3
src/displayapp/screens/settings/Settings.h
View File

@ -21,10 +21,11 @@ namespace Pinetime {
private: private:
Controllers::Settings& settingsController; Controllers::Settings& settingsController;
ScreenList<2> screens; ScreenList<3> screens;
std::unique_ptr<Screen> CreateScreen1(); std::unique_ptr<Screen> CreateScreen1();
std::unique_ptr<Screen> CreateScreen2(); std::unique_ptr<Screen> CreateScreen2();
std::unique_ptr<Screen> CreateScreen3();
}; };
} }
} }