diff options
Diffstat (limited to 'src/displayapp/screens/Tile.h')
-rw-r--r-- | src/displayapp/screens/Tile.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h index 48747144..d8a68128 100644 --- a/src/displayapp/screens/Tile.h +++ b/src/displayapp/screens/Tile.h @@ -7,9 +7,9 @@ #include "displayapp/Apps.h" #include "components/datetime/DateTimeController.h" #include "components/settings/Settings.h" -#include "components/datetime/DateTimeController.h" #include "components/battery/BatteryController.h" -#include <displayapp/screens/BatteryIcon.h> +#include "displayapp/widgets/PageIndicator.h" +#include "displayapp/widgets/StatusIcons.h" namespace Pinetime { namespace Applications { @@ -25,7 +25,8 @@ namespace Pinetime { uint8_t numScreens, DisplayApp* app, Controllers::Settings& settingsController, - Pinetime::Controllers::Battery& batteryController, + Controllers::Battery& batteryController, + Controllers::Ble& bleController, Controllers::DateTime& dateTimeController, std::array<Applications, 6>& applications); @@ -35,19 +36,15 @@ namespace Pinetime { void OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId); private: - Pinetime::Controllers::Battery& batteryController; Controllers::DateTime& dateTimeController; 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; - BatteryIcon batteryIcon; + Widgets::PageIndicator pageIndicator; + Widgets::StatusIcons statusIcons; const char* btnmMap[8]; Pinetime::Applications::Apps apps[6]; |