From ec8a84505277f2dbaaa957947d432ea03758f9bf Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Tue, 5 Jul 2022 08:41:09 +0300 Subject: Add PageIndicator widget to reduce code duplication (#1218) * Move PageIndicator widget to its own files to reduce code duplication * Use uint8_t in PageIndicator --- src/displayapp/screens/Tile.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/displayapp/screens/Tile.h') diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 48747144..ff121376 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -9,7 +9,8 @@ #include "components/settings/Settings.h" #include "components/datetime/DateTimeController.h" #include "components/battery/BatteryController.h" -#include +#include "displayapp/screens/BatteryIcon.h" +#include "displayapp/widgets/PageIndicator.h" namespace Pinetime { namespace Applications { @@ -41,12 +42,10 @@ namespace Pinetime { lv_task_t* taskUpdate; lv_obj_t* label_time; - lv_point_t pageIndicatorBasePoints[2]; - lv_point_t pageIndicatorPoints[2]; - lv_obj_t* pageIndicatorBase; - lv_obj_t* pageIndicator; lv_obj_t* btnm1; + Widgets::PageIndicator pageIndicator; + BatteryIcon batteryIcon; const char* btnmMap[8]; -- cgit v1.2.3-70-g09d2