Add bar for daily exercise target completion

Add screen title text
Anticipate resting heart rate tracking (some max heart rate tracking algorithms use this)

Author: Andersama

src/components/heartrate/HeartRateController.cpp

@@ -7,6 +7,7 @@ using namespace Pinetime::Controllers;
 HeartRateZoneSettings::HeartRateZoneSettings() {
   version = 0;
   adjustMsDelay = 300000;
+  exerciseMsTarget = 1800000;
   age = 25;
   maxHeartRate = maxHeartRateEstimate(age);
   percentTarget = {50, 60, 70, 80, 90};

src/components/heartrate/HeartRateController.h

@@ -19,7 +19,7 @@ namespace Pinetime {
     template <typename T>
     struct HeartRateZones {
       // 1440 minutes in a day (11 bits), 86400 seconds (17 bits)
-      std::array<T,5> zoneTime = {};
+      std::array<T, 5> zoneTime = {};
 
       T totalTime() const {
         return zoneTime[0] + zoneTime[1] + zoneTime[2] + zoneTime[3] + zoneTime[4];
@@ -49,7 +49,8 @@ namespace Pinetime {
 
     struct HeartRateZoneSettings {
       uint32_t version = 0;
-      uint32_t adjustMsDelay = 300000;
+      uint32_t adjustMsDelay = 300000;     // 5 minutes
+      uint32_t exerciseMsTarget = 1800000; // hour 3600'000
       uint8_t age = 25;
       uint8_t maxHeartRate = 195;
       std::array<uint8_t, 5> percentTarget = {50, 60, 70, 80, 90};
@@ -86,6 +87,10 @@ namespace Pinetime {
         return currentActivity;
       }
 
+      HeartRateZoneSettings hrzSettings() const {
+        return zSettings;
+      }
+
       void SetService(Pinetime::Controllers::HeartRateService* service);
 
       void AdvanceDay();
@@ -95,6 +100,7 @@ namespace Pinetime {
       Applications::HeartRateTask* task = nullptr;
       States state = States::Stopped;
       uint8_t heartRate = 0;
+      uint8_t restingHeartRate = 0;
       Pinetime::Controllers::HeartRateService* service = nullptr;
       Pinetime::Controllers::FS& fs;
 

src/displayapp/screens/HeartRateZone.cpp

@@ -10,14 +10,35 @@ using namespace Pinetime::Applications::Screens;
 HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateController, System::SystemTask& systemTask)
   : heartRateController {heartRateController}, wakeLock(systemTask) {
   auto activity = heartRateController.Activity();
+  auto settings = heartRateController.hrzSettings();
   uint32_t total = 0;
 
-  auto hundreths_of_hour = pdMS_TO_TICKS(10*60*60);
+  auto hundreths_of_hour = pdMS_TO_TICKS(10 * 60 * 60);
+  auto exercise_target = pdMS_TO_TICKS(settings.exerciseMsTarget);
+  uint32_t offset = 25 * (zone_bar.size() + 2);
 
   lv_obj_t* screen = lv_scr_act();
+
+  title = lv_label_create(screen);
+  lv_label_set_text_static(title, "BPM Breakdown");
+  lv_obj_align(title, screen, LV_ALIGN_IN_TOP_MID, 0, 20);
+
+  total_bar = lv_bar_create(screen, nullptr);
+  lv_obj_set_style_local_bg_opa(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);
+  lv_obj_set_style_local_line_color(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, Colors::bgAlt);
+  lv_obj_set_style_local_border_width(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, 2);
+  lv_obj_set_style_local_radius(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, 0);
+  lv_obj_set_style_local_line_color(zone_bar[0], LV_BAR_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_NAVY);
+
+  lv_obj_align(total_bar, screen, LV_ALIGN_IN_TOP_MID, 0, offset - (zone_bar.size() * 25));
+
+  total_label = lv_label_create(zone_bar[i], nullptr);
+  lv_obj_align(total_label, zone_bar[i], LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_local_text_color(total_label, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
+
   for (uint8_t i = 0; i < zone_bar.size(); i++) {
     zone_bar[i] = lv_bar_create(screen, nullptr);
-    
+
     total += activity.zoneTime[i];
 
     lv_obj_set_style_local_bg_opa(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);
@@ -26,9 +47,9 @@ HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateControll
     lv_obj_set_style_local_radius(zone_bar[i], LV_BAR_PART_BG, LV_STATE_DEFAULT, 0);
 
     lv_obj_set_size(zone_bar[i], 240, 20);
-    lv_obj_align(zone_bar[i], screen, LV_ALIGN_IN_TOP_MID, 0, 25 * i);
+    lv_obj_align(zone_bar[i], screen, LV_ALIGN_IN_TOP_MID, 0, offset - i * 25);
 
-    label_time[i] = lv_label_create(zone_bar[i],nullptr);
+    label_time[i] = lv_label_create(zone_bar[i], nullptr);
     lv_obj_align(label_time[i], zone_bar[i], LV_ALIGN_CENTER, 0, 0);
 
     lv_obj_set_style_local_text_color(label_time[i], LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
@@ -39,6 +60,7 @@ HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateControll
   lv_label_set_text_static(label_time[2], "Aerobic");
   lv_label_set_text_static(label_time[3], "Threshold");
   lv_label_set_text_static(label_time[4], "Anaerobic");
+  lv_label_set_text_static(total_label, "Goal");
 
   lv_obj_set_style_local_line_color(zone_bar[0], LV_BAR_PART_INDIC, LV_STATE_DEFAULT, Colors::blue);
   lv_obj_set_style_local_line_color(zone_bar[1], LV_BAR_PART_INDIC, LV_STATE_DEFAULT, Colors::green);
@@ -54,6 +76,9 @@ HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateControll
     lv_bar_set_value(zone_bar[i], percent, LV_ANIM_OFF);
   }
 
+  lv_bar_set_range(total_bar, 0, exercise_target);
+  lv_bar_set_value(total_bar, total > exercise_target ? exercise_target : total, LV_ANIM_OFF);
+
   taskRefresh = lv_task_create(RefreshTaskCallback, 5000, LV_TASK_PRIO_MID, this);
 }
 
@@ -79,4 +104,7 @@ void HeartRateZone::Refresh() {
     lv_bar_set_range(zone_bar[i], 0, bar_limit);
     lv_bar_set_value(zone_bar[i], percent, LV_ANIM_OFF);
   }
+
+  lv_bar_set_range(total_bar, 0, exercise_target);
+  lv_bar_set_value(total_bar, total > exercise_target ? exercise_target : total, LV_ANIM_OFF);
 }

src/displayapp/screens/HeartRateZone.h

@@ -29,8 +29,11 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Pinetime::System::WakeLock wakeLock;
 
-        std::array<lv_obj_t*,5> zone_bar;
-        std::array<lv_obj_t*,5> label_time;
+        std::array<lv_obj_t*, 5> zone_bar = {};
+        std::array<lv_obj_t*, 5> label_time = {};
+        lv_obj_t* total_bar = nullptr;
+        lv_obj_t* total_label = nullptr;
+        lv_obj_t* title = nullptr;
 
         lv_task_t* taskRefresh;
       };