diff options
Diffstat (limited to 'src/displayapp/screens/ApplicationList.cpp')
| -rw-r--r-- | src/displayapp/screens/ApplicationList.cpp | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp index 29c8aff..e2b5322 100644 --- a/src/displayapp/screens/ApplicationList.cpp +++ b/src/displayapp/screens/ApplicationList.cpp @@ -19,13 +19,9 @@ ApplicationList::ApplicationList(Pinetime::Applications::DisplayApp* app, screens {app, settingsController.GetAppMenu(), { - [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 CreateScreen1(); }, + [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); }, + [this]() -> std::unique_ptr<Screen> { return CreateScreen3(); } }, Screens::ScreenListModes::UpDown} { } @@ -40,40 +36,41 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) { std::unique_ptr<Screen> ApplicationList::CreateScreen1() { std::array<Screens::Tile::Applications, 6> applications {{ - {Symbols::stopWatch, Apps::StopWatch}, {Symbols::music, Apps::Music}, - {Symbols::map, Apps::Navigation}, {Symbols::shoe, Apps::Steps}, + {Symbols::stopWatch, Apps::StopWatch}, {Symbols::heartBeat, Apps::HeartRate}, {Symbols::hourGlass, Apps::Timer}, + {Symbols::clock, Apps::Alarm}, }}; - return std::make_unique<Screens::Tile>(0, 2, app, settingsController, batteryController, dateTimeController, applications); + return std::make_unique<Screens::Tile>(0, 3, app, settingsController, batteryController, dateTimeController, applications); } std::unique_ptr<Screen> ApplicationList::CreateScreen2() { std::array<Screens::Tile::Applications, 6> applications {{ + {Symbols::drum, Apps::Jumpscore}, + {Symbols::map, Apps::Navigation}, + {Symbols::drum, Apps::Metronome}, {Symbols::paintbrush, Apps::Paint}, {Symbols::paddle, Apps::Paddle}, {"2", Apps::Twos}, - {Symbols::chartLine, Apps::Motion}, - {Symbols::drum, Apps::Metronome}, - {Symbols::clock, Apps::Alarm}, }}; - return std::make_unique<Screens::Tile>(1, 2, app, settingsController, batteryController, dateTimeController, applications); + return std::make_unique<Screens::Tile>(1, 3, app, settingsController, batteryController, dateTimeController, applications); } -/*std::unique_ptr<Screen> ApplicationList::CreateScreen3() { +std::unique_ptr<Screen> ApplicationList::CreateScreen3() { std::array<Screens::Tile::Applications, 6> applications { - {{"A", Apps::Meter}, - {"B", Apps::Navigation}, - {"C", Apps::Clock}, - {"D", Apps::Music}, - {"E", Apps::SysInfo}, - {"F", Apps::Brightness} - } + {Symbols::chartLine, Apps::Motion}, + // {{"A", Apps::Meter}, + // {"B", Apps::Navigation}, + // {"C", Apps::Clock}, + // {"D", Apps::Music}, + // {"E", Apps::SysInfo}, + // {"F", Apps::Brightness} + // } }; return std::make_unique<Screens::Tile>(2, 3, app, settingsController, batteryController, dateTimeController, applications); -}*/ +} |
