diff options
author | Joaquim <joaquim.org@gmail.com> | 2021-01-28 17:13:28 +0000 |
---|---|---|
committer | Joaquim <joaquim.org@gmail.com> | 2021-01-28 17:13:28 +0000 |
commit | a456887eff1bc0de6c6a8ecb49a961ffe75661db (patch) | |
tree | ef283f671a452c767a1bee0a87f1592e698e07ef /src/displayapp/screens/ApplicationList.cpp | |
parent | efa99da44d52235bfbf40120f9c1faeb42ce36a7 (diff) |
LVGL v7.10.0
Diffstat (limited to 'src/displayapp/screens/ApplicationList.cpp')
-rw-r--r-- | src/displayapp/screens/ApplicationList.cpp | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp index dd7fcd41..0218182b 100644 --- a/src/displayapp/screens/ApplicationList.cpp +++ b/src/displayapp/screens/ApplicationList.cpp @@ -8,77 +8,75 @@ using namespace Pinetime::Applications::Screens; -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 CreateScreen3(); } - } - } {} - +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 CreateScreen3(); } + }} +{ +} -ApplicationList::~ApplicationList() { +ApplicationList::~ApplicationList() +{ lv_obj_clean(lv_scr_act()); } -bool ApplicationList::Refresh() { - if(running) +bool ApplicationList::Refresh() +{ + if (running) running = screens.Refresh(); return running; } -bool ApplicationList::OnButtonPushed() { +bool ApplicationList::OnButtonPushed() +{ running = false; app->StartApp(Apps::Clock); return true; } -bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) { +bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) +{ return screens.OnTouchEvent(event); } -std::unique_ptr<Screen> ApplicationList::CreateScreen1() { - std::array<Screens::Tile::Applications, 6> applications { - {{Symbols::clock, Apps::Clock}, - {Symbols::music, Apps::Music}, - {Symbols::sun, Apps::Brightness}, - {Symbols::list, Apps::SysInfo}, - {Symbols::check, Apps::FirmwareValidation}, - {Symbols::heartBeat, Apps::HeartRate} - } - +std::unique_ptr<Screen> ApplicationList::CreateScreen1() +{ + std::array<Screens::Tile::Applications, 6> applications{ + {{Symbols::clock, Apps::Clock}, + {Symbols::music, Apps::Music}, + {Symbols::sun, Apps::Brightness}, + {Symbols::list, Apps::SysInfo}, + {Symbols::check, Apps::FirmwareValidation}, + {Symbols::heartBeat, Apps::HeartRate}} }; return std::unique_ptr<Screen>(new Screens::Tile(app, applications)); } -std::unique_ptr<Screen> ApplicationList::CreateScreen2() { - std::array<Screens::Tile::Applications, 6> applications { - {{Symbols::map, Apps::Navigation}, - {Symbols::asterisk, Apps::Meter}, - {Symbols::paintbrush, Apps::Paint}, - {Symbols::info, Apps::Notifications}, - {Symbols::paddle, Apps::Paddle}, - {"2", Apps::Twos} - } - }; +std::unique_ptr<Screen> ApplicationList::CreateScreen2() +{ + std::array<Screens::Tile::Applications, 6> applications{ + {{Symbols::map, Apps::Navigation}, + {Symbols::asterisk, Apps::Meter}, + {Symbols::paintbrush, Apps::Paint}, + {Symbols::info, Apps::Notifications}, + {Symbols::paddle, Apps::Paddle}, + {"2", Apps::Twos}}}; return std::unique_ptr<Screen>(new Screens::Tile(app, applications)); } -std::unique_ptr<Screen> ApplicationList::CreateScreen3() { - std::array<Screens::Tile::Applications, 6> applications { - {{"A", Apps::Meter}, - {"B", Apps::Gauge}, - {"C", Apps::Clock}, - {"D", Apps::Music}, - {"E", Apps::SysInfo}, - {"F", Apps::Brightness} - } - }; +std::unique_ptr<Screen> ApplicationList::CreateScreen3() +{ + std::array<Screens::Tile::Applications, 6> applications{ + {{"A", Apps::Meter}, + {"B", Apps::Gauge}, + {"C", Apps::Clock}, + {"D", Apps::Music}, + {"E", Apps::SysInfo}, + {"F", Apps::Brightness}}}; return std::unique_ptr<Screen>(new Screens::Tile(app, applications)); } - |