Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/src/displayapp/screens/HeartRate.h b/src/displayapp/screens/HeartRate.h
index b9424998..c8f36999 100644
--- a/src/displayapp/screens/HeartRate.h
+++ b/src/displayapp/screens/HeartRate.h
@@ -4,6 +4,7 @@
 #include <chrono>
 #include "Screen.h"
 #include <bits/unique_ptr.h>
+#include "systemtask/SystemTask.h"
 #include <libs/lvgl/src/lv_core/lv_style.h>
 #include <libs/lvgl/src/lv_core/lv_obj.h>
 
@@ -16,25 +17,24 @@ namespace Pinetime {
 
       class HeartRate : public Screen{
       public:
-        HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController);
+        HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask &systemTask);
         ~HeartRate() override;
 
         bool Refresh() override;
-        bool OnButtonPushed() override;
+        
         void OnStartStopEvent(lv_event_t event);
 
       private:
         Controllers::HeartRateController& heartRateController;
+        Pinetime::System::SystemTask& systemTask;
         void UpdateStartStopButton(bool isRunning);
         lv_obj_t* label_hr;
         lv_obj_t* label_bpm;
         lv_obj_t* label_status;
-        lv_style_t labelBigStyle;
-        lv_style_t* labelStyle;
         lv_obj_t* btn_startStop;
         lv_obj_t* label_startStop;
 
-        bool running = true;
+        
 
       };
     }