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/Tile.h | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'src/displayapp/screens/Tile.h') diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index f717a220..54ffcdae 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -5,7 +5,10 @@ #include #include "Screen.h" #include "../Apps.h" +#include "components/datetime/DateTimeController.h" #include "components/settings/Settings.h" +#include "components/datetime/DateTimeController.h" +#include "components/battery/BatteryController.h" namespace Pinetime { namespace Applications { @@ -17,19 +20,35 @@ namespace Pinetime { Pinetime::Applications::Apps application; }; - explicit Tile(uint8_t screenID, DisplayApp* app, Controllers::Settings& settingsController, std::array& applications); + explicit Tile(uint8_t screenID, uint8_t numScreens, + DisplayApp* app, + Controllers::Settings& settingsController, + Pinetime::Controllers::Battery& batteryController, + Controllers::DateTime& dateTimeController, + std::array& applications); + ~Tile() override; bool Refresh() override; - bool OnButtonPushed() override; - + void UpdateScreen(); void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId); private: - lv_obj_t * btnm1; - bool running = true; - const char* btnm_map1[8]; + Pinetime::Controllers::Battery& batteryController; + Controllers::DateTime& dateTimeController; + + lv_task_t* taskUpdate; + + lv_obj_t* label_time; + lv_obj_t* batteryIcon; + lv_point_t pageIndicatorBasePoints[2]; + lv_point_t pageIndicatorPoints[2]; + lv_obj_t* pageIndicatorBase; + lv_obj_t* pageIndicator; + lv_obj_t* btnm1; + + const char* btnmMap[8]; Pinetime::Applications::Apps apps[6]; }; } -- cgit v1.2.3-70-g09d2