Refactor to fix some edge cases where click was not working

Author: SteveAmor

src/displayapp/DisplayApp.cpp

@@ -652,10 +652,10 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController);
       break;
     case Apps::Weather:
-      currentScreen = std::make_unique<Screens::Weather>(this, settingsController, *controllers.weatherController);
+      currentScreen = std::make_unique<Screens::Weather>(settingsController, *controllers.weatherController);
       break;
     case Apps::Steps:
-      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
+      currentScreen = std::make_unique<Screens::Steps>(motionController, settingsController);
       break;
     default: {
       const auto* d = std::ranges::find_if(userApps, [app](const AppDescription& appDescription) {

src/displayapp/screens/Steps.cpp

@@ -16,8 +16,8 @@ static void lap_event_handler(lv_obj_t* obj, lv_event_t event) {
   steps->lapBtnEventHandler(event);
 }
 
-Steps::Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController)
-  : app {app}, motionController {motionController}, settingsController {settingsController} {
+Steps::Steps(Controllers::MotionController& motionController, Controllers::Settings& settingsController)
+  : motionController {motionController}, settingsController {settingsController} {
 
   stepsArc = lv_arc_create(lv_scr_act(), nullptr);
 

src/displayapp/screens/Steps.h

@@ -19,14 +19,13 @@ namespace Pinetime {
 
       class Steps : public Screen {
       public:
-        Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController);
+        Steps(Controllers::MotionController& motionController, Controllers::Settings& settingsController);
         ~Steps() override;
 
         void Refresh() override;
         void lapBtnEventHandler(lv_event_t event);
 
       private:
-        DisplayApp* app;
         Controllers::MotionController& motionController;
         Controllers::Settings& settingsController;
 
@@ -51,7 +50,7 @@ namespace Pinetime {
       static constexpr const char* icon = Screens::Symbols::shoe;
 
       static Screens::Screen* Create(AppControllers& controllers) {
-        return new Screens::Steps(controllers.displayApp, controllers.motionController, controllers.settingsController);
+        return new Screens::Steps(controllers.motionController, controllers.settingsController);
       };
 
       static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {

src/displayapp/screens/WatchFaceDigital.cpp

@@ -23,7 +23,8 @@ namespace {
   }
 }
 
-WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
+WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
+                                   Controllers::DateTime& dateTimeController,
                                    const Controllers::Battery& batteryController,
                                    const Controllers::Ble& bleController,
                                    const Controllers::AlarmController& alarmController,
@@ -32,7 +33,8 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
                                    Controllers::HeartRateController& heartRateController,
                                    Controllers::MotionController& motionController,
                                    Controllers::SimpleWeatherService& weatherService)
-  : currentDateTime {{}},
+  : app {app},
+    currentDateTime {{}},
     dateTimeController {dateTimeController},
     notificationManager {notificationManager},
     settingsController {settingsController},

src/displayapp/screens/WatchFaceDigital.h

@@ -28,7 +28,8 @@ namespace Pinetime {
 
       class WatchFaceDigital : public Screen {
       public:
-        WatchFaceDigital(Controllers::DateTime& dateTimeController,
+        WatchFaceDigital(DisplayApp* app,
+                         Controllers::DateTime& dateTimeController,
                          const Controllers::Battery& batteryController,
                          const Controllers::Ble& bleController,
                          const Controllers::AlarmController& alarmController,
@@ -86,7 +87,8 @@ namespace Pinetime {
       static constexpr const char* name = "Digital";
 
       static Screens::Screen* Create(AppControllers& controllers) {
-        return new Screens::WatchFaceDigital(controllers.dateTimeController,
+        return new Screens::WatchFaceDigital(controllers.displayApp,
+                                             controllers.dateTimeController,
                                              controllers.batteryController,
                                              controllers.bleController,
                                              controllers.alarmController,

src/displayapp/screens/Weather.cpp

@@ -24,8 +24,8 @@ namespace {
   }
 }
 
-Weather::Weather(DisplayApp* app, Controllers::Settings& settingsController, Controllers::SimpleWeatherService& weatherService)
-  : app {app}, settingsController {settingsController}, weatherService {weatherService} {
+Weather::Weather(Controllers::Settings& settingsController, Controllers::SimpleWeatherService& weatherService)
+  : settingsController {settingsController}, weatherService {weatherService} {
 
   temperature = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(temperature, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);

src/displayapp/screens/Weather.h

@@ -20,13 +20,12 @@ namespace Pinetime {
 
       class Weather : public Screen {
       public:
-        Weather(DisplayApp* app, Controllers::Settings& settingsController, Controllers::SimpleWeatherService& weatherService);
+        Weather(Controllers::Settings& settingsController, Controllers::SimpleWeatherService& weatherService);
         ~Weather() override;
 
         void Refresh() override;
 
       private:
-        DisplayApp* app;
         Controllers::Settings& settingsController;
         Controllers::SimpleWeatherService& weatherService;
 
@@ -50,7 +49,7 @@ namespace Pinetime {
       static constexpr const char* icon = Screens::Symbols::cloudSunRain;
 
       static Screens::Screen* Create(AppControllers& controllers) {
-        return new Screens::Weather(controllers.displayApp, controllers.settingsController, *controllers.weatherController);
+        return new Screens::Weather(controllers.settingsController, *controllers.weatherController);
       };
 
       static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {