Move the time remaining widget to StatusIcons

src/displayapp/DisplayApp.cpp

@@ -433,6 +433,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                  batteryController,
                                                                  bleController,
                                                                  dateTimeController,
+                                                                 timer,
                                                                  filesystem,
                                                                  std::move(apps));
     } break;
@@ -486,7 +487,8 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                brightnessController,
                                                                motorController,
                                                                settingsController,
-                                                               bleController);
+                                                               bleController,
+                                                               timer);
       break;
     case Apps::Settings:
       currentScreen = std::make_unique<Screens::Settings>(this, settingsController);

src/displayapp/screens/ApplicationList.cpp

@@ -22,6 +22,7 @@ ApplicationList::ApplicationList(DisplayApp* app,
                                  const Pinetime::Controllers::Battery& batteryController,
                                  const Pinetime::Controllers::Ble& bleController,
                                  Controllers::DateTime& dateTimeController,
+                                 Controllers::Timer& timer,
                                  Pinetime::Controllers::FS& filesystem,
                                  std::array<Tile::Applications, UserAppTypes::Count>&& apps)
   : app {app},
@@ -29,6 +30,7 @@ ApplicationList::ApplicationList(DisplayApp* app,
     batteryController {batteryController},
     bleController {bleController},
     dateTimeController {dateTimeController},
+    timer {timer},
     filesystem {filesystem},
     apps {std::move(apps)},
     screens {app, settingsController.GetAppMenu(), CreateScreenList(), Screens::ScreenListModes::UpDown} {
@@ -60,5 +62,6 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen(unsigned int screenNum) co
                                          batteryController,
                                          bleController,
                                          dateTimeController,
-                                         pageApps);
+                                         pageApps,
+                                         timer);
 }

src/displayapp/screens/ApplicationList.h

@@ -19,6 +19,7 @@ namespace Pinetime {
                                  const Pinetime::Controllers::Battery& batteryController,
                                  const Pinetime::Controllers::Ble& bleController,
                                  Controllers::DateTime& dateTimeController,
+                                 Pinetime::Controllers::Timer& timer,
                                  Pinetime::Controllers::FS& filesystem,
                                  std::array<Tile::Applications, UserAppTypes::Count>&& apps);
         ~ApplicationList() override;
@@ -33,6 +34,7 @@ namespace Pinetime {
         const Pinetime::Controllers::Battery& batteryController;
         const Pinetime::Controllers::Ble& bleController;
         Controllers::DateTime& dateTimeController;
+        Pinetime::Controllers::Timer& timer;
         Pinetime::Controllers::FS& filesystem;
         std::array<Tile::Applications, UserAppTypes::Count> apps;
 

src/displayapp/screens/Tile.cpp

@@ -30,8 +30,9 @@ Tile::Tile(uint8_t screenID,
            const Controllers::Battery& batteryController,
            const Controllers::Ble& bleController,
            Controllers::DateTime& dateTimeController,
-           std::array<Applications, 6>& applications)
+           std::array<Applications, 6>& applications,
-  : app {app}, dateTimeController {dateTimeController}, pageIndicator(screenID, numScreens), statusIcons(batteryController, bleController) {
+           Controllers::Timer& timer)
+  : app {app}, dateTimeController {dateTimeController}, pageIndicator(screenID, numScreens), statusIcons(batteryController, bleController, timer) {
 
   settingsController.SetAppMenu(screenID);
 
@@ -83,7 +84,7 @@ Tile::Tile(uint8_t screenID,
   btnm1->user_data = this;
   lv_obj_set_event_cb(btnm1, event_handler);
 
-  taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this);
+  taskUpdate = lv_task_create(lv_update_task, 500, LV_TASK_PRIO_MID, this);
 
   UpdateScreen();
 }

src/displayapp/screens/Tile.h

@@ -29,7 +29,8 @@ namespace Pinetime {
                       const Controllers::Battery& batteryController,
                       const Controllers::Ble& bleController,
                       Controllers::DateTime& dateTimeController,
-                      std::array<Applications, 6>& applications);
+                      std::array<Applications, 6>& applications,
+                      Controllers::Timer& timer);
 
         ~Tile() override;
 

src/displayapp/screens/WatchFaceDigital.cpp

@@ -32,7 +32,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
     motionController {motionController},
     weatherService {weatherService},
     timer {timer},
-    statusIcons(batteryController, bleController) {
+    statusIcons(batteryController, bleController, timer) {
 
   statusIcons.Create();
 
@@ -53,16 +53,6 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
   lv_label_set_text(temperature, "");
   lv_obj_align(temperature, nullptr, LV_ALIGN_IN_TOP_MID, 20, 50);
 
-  timerIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(timerIcon, Symbols::hourGlass);
-  lv_obj_set_style_local_text_color(timerIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
-  lv_obj_align(timerIcon, lv_scr_act(), LV_ALIGN_IN_TOP_MID, -32, 60);
-
-  timeRemaining = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeRemaining, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
-  lv_label_set_text(timeRemaining, "00:00");
-  lv_obj_align(timeRemaining, nullptr, LV_ALIGN_IN_TOP_MID, 10, 60);
-
   label_date = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_CENTER, 0, 60);
   lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
@@ -113,20 +103,6 @@ void WatchFaceDigital::Refresh() {
     lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
   }
 
-  if (timer.IsRunning()) {
-    auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timer.GetTimeRemaining());
-
-    uint8_t minutes = secondsRemaining.count() / 60;
-    uint8_t seconds = secondsRemaining.count() % 60;
-    lv_label_set_text_fmt(timeRemaining, "%02d:%02d", minutes, seconds);
-
-    lv_obj_set_hidden(timeRemaining, false);
-    lv_obj_set_hidden(timerIcon, false);
-  } else {
-    lv_obj_set_hidden(timeRemaining, true);
-    lv_obj_set_hidden(timerIcon, true);
-  }
-
   currentDateTime = std::chrono::time_point_cast<std::chrono::minutes>(dateTimeController.CurrentDateTime());
 
   if (currentDateTime.IsUpdated()) {

src/displayapp/screens/WatchFaceDigital.h

@@ -58,8 +58,6 @@ namespace Pinetime {
 
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
 
-        lv_obj_t* timerIcon;
-        lv_obj_t* timeRemaining;
         lv_obj_t* label_time;
         lv_obj_t* label_time_ampm;
         lv_obj_t* label_date;

src/displayapp/screens/settings/QuickSettings.cpp

@@ -33,13 +33,14 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
                              Controllers::BrightnessController& brightness,
                              Controllers::MotorController& motorController,
                              Pinetime::Controllers::Settings& settingsController,
-                             const Controllers::Ble& bleController)
+                             const Controllers::Ble& bleController,
+                             Controllers::Timer& timer)
   : app {app},
     dateTimeController {dateTimeController},
     brightness {brightness},
     motorController {motorController},
     settingsController {settingsController},
-    statusIcons(batteryController, bleController) {
+    statusIcons(batteryController, bleController, timer) {
 
   statusIcons.Create();
 
@@ -118,7 +119,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
   lv_label_set_text_static(lbl_btn, Symbols::settings);
 
-  taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this);
+  taskUpdate = lv_task_create(lv_update_task, 500, LV_TASK_PRIO_MID, this);
 
   UpdateScreen();
 }

src/displayapp/screens/settings/QuickSettings.h

@@ -23,7 +23,8 @@ namespace Pinetime {
                       Controllers::BrightnessController& brightness,
                       Controllers::MotorController& motorController,
                       Pinetime::Controllers::Settings& settingsController,
-                      const Controllers::Ble& bleController);
+                      const Controllers::Ble& bleController,
+                      Controllers::Timer& timer);
 
         ~QuickSettings() override;
 

src/displayapp/widgets/StatusIcons.cpp

@@ -3,11 +3,22 @@
 
 using namespace Pinetime::Applications::Widgets;
 
-StatusIcons::StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController)
+StatusIcons::StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, Controllers::Timer& timer)
-  : batteryIcon(true), batteryController {batteryController}, bleController {bleController} {
+  : batteryIcon(true), batteryController {batteryController}, bleController {bleController}, timer {timer} {
 }
 
 void StatusIcons::Create() {
+  timerIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(timerIcon, Screens::Symbols::hourGlass);
+  lv_obj_set_style_local_text_color(timerIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
+  lv_obj_align(timerIcon, lv_scr_act(), LV_ALIGN_IN_TOP_MID, -32, 0);
+
+  timeRemaining = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeRemaining, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
+  lv_label_set_text(timeRemaining, "00:00");
+  lv_obj_align(timeRemaining, nullptr, LV_ALIGN_IN_TOP_MID, 10, 0);
+
+
   container = lv_cont_create(lv_scr_act(), nullptr);
   lv_cont_set_layout(container, LV_LAYOUT_ROW_TOP);
   lv_cont_set_fit(container, LV_FIT_TIGHT);
@@ -26,6 +37,20 @@ void StatusIcons::Create() {
 }
 
 void StatusIcons::Update() {
+  if (timer.IsRunning()) {
+    auto secondsRemaining = std::chrono::duration_cast<std::chrono::seconds>(timer.GetTimeRemaining());
+
+    uint8_t minutes = secondsRemaining.count() / 60;
+    uint8_t seconds = secondsRemaining.count() % 60;
+    lv_label_set_text_fmt(timeRemaining, "%02d:%02d", minutes, seconds);
+
+    lv_obj_set_hidden(timeRemaining, false);
+    lv_obj_set_hidden(timerIcon, false);
+  } else {
+    lv_obj_set_hidden(timeRemaining, true);
+    lv_obj_set_hidden(timerIcon, true);
+  }
+
   powerPresent = batteryController.IsPowerPresent();
   if (powerPresent.IsUpdated()) {
     lv_obj_set_hidden(batteryPlug, !powerPresent.Get());

src/displayapp/widgets/StatusIcons.h

@@ -13,7 +13,7 @@ namespace Pinetime {
     namespace Widgets {
       class StatusIcons {
       public:
-        StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController);
+        StatusIcons(const Controllers::Battery& batteryController, const Controllers::Ble& bleController, Controllers::Timer& timer);
         void Align();
         void Create();
 
@@ -27,12 +27,15 @@ namespace Pinetime {
         Screens::BatteryIcon batteryIcon;
         const Pinetime::Controllers::Battery& batteryController;
         const Controllers::Ble& bleController;
+        Controllers::Timer& timer;
 
         Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
         Utility::DirtyValue<bool> powerPresent {};
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
 
+        lv_obj_t* timerIcon;
+        lv_obj_t* timeRemaining;
         lv_obj_t* bleIcon;
         lv_obj_t* batteryPlug;
         lv_obj_t* container;