diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
commit | 63584b6561cbc31095354b06e356f700dcf0e32b (patch) | |
tree | b8ee17d8bfdc57c3b80b7c918f3431d198939856 /src/displayapp/screens/ApplicationList.h | |
parent | 3934e9bef20c5c2ad393e20cfff3a5a1b0d24569 (diff) | |
parent | 9096d1db4c6be9f4a2cc8af99a994c219f25108c (diff) |
Merge branch 'develop' into notification-title
# Conflicts:
# src/displayapp/screens/Notifications.cpp
Diffstat (limited to 'src/displayapp/screens/ApplicationList.h')
-rw-r--r-- | src/displayapp/screens/ApplicationList.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h index 0a0c6388..e334ccde 100644 --- a/src/displayapp/screens/ApplicationList.h +++ b/src/displayapp/screens/ApplicationList.h @@ -4,6 +4,9 @@ #include "Screen.h" #include "ScreenList.h" +#include "components/datetime/DateTimeController.h" +#include "components/settings/Settings.h" +#include "components/battery/BatteryController.h" namespace Pinetime { namespace Applications { @@ -11,21 +14,22 @@ namespace Pinetime { class ApplicationList : public Screen { public: explicit ApplicationList(DisplayApp* app, - Pinetime::Controllers::Settings &settingsController); + Pinetime::Controllers::Settings &settingsController, + Pinetime::Controllers::Battery& batteryController, + Controllers::DateTime& dateTimeController); ~ApplicationList() override; bool Refresh() override; - bool OnButtonPushed() override; bool OnTouchEvent(TouchEvents event) override; private: Controllers::Settings& settingsController; - - bool running = true; + Pinetime::Controllers::Battery& batteryController; + Controllers::DateTime& dateTimeController; ScreenList<2> screens; std::unique_ptr<Screen> CreateScreen1(); std::unique_ptr<Screen> CreateScreen2(); - std::unique_ptr<Screen> CreateScreen3(); + //std::unique_ptr<Screen> CreateScreen3(); }; } } |