Resolved duplication for Digital Watch Face

Author: Paarth-Shirsat

src/displayapp/screens/WatchFaceDigital.cpp

@@ -13,7 +13,6 @@
 #include "components/motion/MotionController.h"
 #include "components/ble/SimpleWeatherService.h"
 #include "components/settings/Settings.h"
-#include "components/alarm/AlarmController.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -25,16 +24,14 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
                                    Controllers::Settings& settingsController,
                                    Controllers::HeartRateController& heartRateController,
                                    Controllers::MotionController& motionController,
-                                   Controllers::SimpleWeatherService& weatherService,
-                                   Controllers::AlarmController& alarmController)
+                                   Controllers::SimpleWeatherService& weatherService)
   : currentDateTime {{}},
     dateTimeController {dateTimeController},
     notificationManager {notificationManager},
     settingsController {settingsController},
     heartRateController {heartRateController},
     motionController {motionController},
     weatherService {weatherService},
-    alarmController {alarmController},
     statusIcons(batteryController, bleController, alarmController) {
 
   statusIcons.Create();
@@ -89,11 +86,6 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
   lv_label_set_text_static(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-  alarmIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7));
-  lv_label_set_text_static(alarmIcon, Symbols::bell);
-  lv_obj_align(alarmIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
-
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   Refresh();
 }
@@ -199,13 +191,4 @@ void WatchFaceDigital::Refresh() {
     lv_obj_realign(temperature);
     lv_obj_realign(weatherIcon);
   }
-
-  alarmSet = alarmController.IsEnabled();
-  if (alarmSet.Get()) {
-    lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x6AA84F));
-    lv_obj_realign(alarmIcon);
-  } else {
-    lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x1B1B1B));
-    lv_obj_realign(alarmIcon);
-  }
 }

src/displayapp/screens/WatchFaceDigital.h

@@ -21,7 +21,6 @@ namespace Pinetime {
     class NotificationManager;
     class HeartRateController;
     class MotionController;
-    class AlarmController;
   }
 
   namespace Applications {
@@ -37,8 +36,7 @@ namespace Pinetime {
                          Controllers::Settings& settingsController,
                          Controllers::HeartRateController& heartRateController,
                          Controllers::MotionController& motionController,
-                         Controllers::SimpleWeatherService& weather,
-                         Controllers::AlarmController& alarmController);
+                         Controllers::SimpleWeatherService& weather);
         ~WatchFaceDigital() override;
 
         void Refresh() override;
@@ -53,7 +51,6 @@ namespace Pinetime {
         Utility::DirtyValue<bool> heartbeatRunning {};
         Utility::DirtyValue<bool> notificationState {};
         Utility::DirtyValue<std::optional<Pinetime::Controllers::SimpleWeatherService::CurrentWeather>> currentWeather {};
-        Utility::DirtyValue<bool> alarmSet {};
 
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::days>> currentDate;
 
@@ -67,15 +64,13 @@ namespace Pinetime {
         lv_obj_t* notificationIcon;
         lv_obj_t* weatherIcon;
         lv_obj_t* temperature;
-        lv_obj_t* alarmIcon;
 
         Controllers::DateTime& dateTimeController;
         Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
         Controllers::SimpleWeatherService& weatherService;
-        Controllers::AlarmController& alarmController;
 
         lv_task_t* taskRefresh;
         Widgets::StatusIcons statusIcons;
@@ -96,8 +91,7 @@ namespace Pinetime {
                                              controllers.settingsController,
                                              controllers.heartRateController,
                                              controllers.motionController,
-                                             *controllers.weatherController,
-                                             controllers.alarmController);
+                                             *controllers.weatherController);
       };
 
       static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {