diff options
author | JF <jf@codingfield.com> | 2020-08-17 15:19:46 +0200 |
---|---|---|
committer | Gitea <gitea@fake.local> | 2020-08-17 15:19:46 +0200 |
commit | 18686ac2cbf6b97dd0250234ce128bd9ad350d6e (patch) | |
tree | c6be1439802b7087874bc0753036c62232783569 /src/DisplayApp/Screens/ApplicationList.cpp | |
parent | 32f20fa994fec9e21d2af4d7bd287b94316b3970 (diff) | |
parent | 1eceafee1c97c64a1fa936e29915daca4051bb05 (diff) |
Merge branch 'manualValidation' of JF/PineTime into develop
Diffstat (limited to 'src/DisplayApp/Screens/ApplicationList.cpp')
-rw-r--r-- | src/DisplayApp/Screens/ApplicationList.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/DisplayApp/Screens/ApplicationList.cpp b/src/DisplayApp/Screens/ApplicationList.cpp index c7c096f4..575426f0 100644 --- a/src/DisplayApp/Screens/ApplicationList.cpp +++ b/src/DisplayApp/Screens/ApplicationList.cpp @@ -11,7 +11,7 @@ ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp *app) : Screen(app), screens{app, { [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); }, - //[this]() -> std::unique_ptr<Screen> { return CreateScreen2(); }, + [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); }, //[this]() -> std::unique_ptr<Screen> { return CreateScreen3(); } } } {} @@ -39,13 +39,15 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) { std::unique_ptr<Screen> ApplicationList::CreateScreen1() { std::array<Screens::Tile::Applications, 6> applications { - {{Symbols::asterisk, Apps::Meter}, - {Symbols::tachometer, Apps::Gauge}, - {Symbols::clock, Apps::Clock}, - {Symbols::music, Apps::Music}, - {Symbols::list, Apps::SysInfo}, - {Symbols::sun, Apps::Brightness} + {{Symbols::clock, Apps::Clock}, + {Symbols::music, Apps::Music}, + {Symbols::sun, Apps::Brightness}, + {Symbols::list, Apps::SysInfo}, + {Symbols::check, Apps::FirmwareValidation}, + {Symbols::none, Apps::None} } + + }; return std::unique_ptr<Screen>(new Screens::Tile(app, applications)); @@ -53,12 +55,12 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() { std::unique_ptr<Screen> ApplicationList::CreateScreen2() { std::array<Screens::Tile::Applications, 6> applications { - {{"0", Apps::Meter}, - {"1", Apps::Gauge}, - {"2", Apps::Clock}, - {"3", Apps::Music}, - {"4", Apps::SysInfo}, - {"5", Apps::Brightness} + {{Symbols::tachometer, Apps::Gauge}, + {Symbols::asterisk, Apps::Meter}, + {Symbols::none, Apps::None}, + {Symbols::none, Apps::None}, + {Symbols::none, Apps::None}, + {Symbols::none, Apps::None} } }; |