From 1d3742e14f09316a1d795527713eb8f9742f0ffb Mon Sep 17 00:00:00 2001 From: Joaquim Date: Sun, 4 Apr 2021 03:08:51 +0100 Subject: Big UI and navigation Rewrite new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more... --- src/displayapp/screens/ApplicationList.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/displayapp/screens/ApplicationList.h') 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 CreateScreen1(); std::unique_ptr CreateScreen2(); - std::unique_ptr CreateScreen3(); + //std::unique_ptr CreateScreen3(); }; } } -- cgit v1.2.3