From 674d231b7ad0492372e66668a067fa24101c1597 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Fri, 27 Jan 2023 02:00:38 +0100
Subject: [PATCH] Bug: textcolor for heartrate zone 1 was ignoring theme.

Fixes #1455.
---
 .../dennisguse/opentracks/data/models/HeartRateZones.java | 8 ++++++--
 .../viewmodels/GenericStatisticsViewHolder.java           | 4 ++--
 src/main/res/values/colors.xml                            | 1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java b/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java
index 3fe04de03..1ac33f93c 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java
@@ -1,8 +1,11 @@
 package de.dennisguse.opentracks.data.models;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.ui.util.ThemeUtils;
 
 public class HeartRateZones {
 
@@ -12,7 +15,7 @@ public class HeartRateZones {
         this.max = max;
     }
 
-    public int getColorForZone(HeartRate current) {
+    public int getColorForZone(Context context, HeartRate current) {
         if (current != null) {
             if (current.getBPM() >= max.getBPM() * 0.9) {
                 return R.color.heart_rate_zone_textcolor_5;
@@ -28,6 +31,7 @@ public class HeartRateZones {
             }
         }
 
-        return R.color.heart_rate_zone_textcolor_1;
+        // Zone 1
+        return ThemeUtils.getTextColorPrimary(context);
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
index 7dcb6099b..6912faecf 100644
--- a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
@@ -274,10 +274,10 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
                 valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
                 sensorName = sensorDataSet.getHeartRate().second;
-                textColor = zones.getColorForZone(sensorDataSet.getHeartRate().first);
+                textColor = zones.getColorForZone(getContext(), sensorDataSet.getHeartRate().first);
             } else {
                 valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
-                textColor = zones.getColorForZone(null);
+                textColor = zones.getColorForZone(getContext(), null);
             }
 
             getBinding().statsValue.setText(valueAndUnit.first);
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 73fb3deaa..e8d0adc43 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -61,5 +61,4 @@ limitations under the License.
     <color name="heart_rate_zone_textcolor_4">#FFBD04</color>
     <color name="heart_rate_zone_textcolor_3">#6ACC2B</color>
     <color name="heart_rate_zone_textcolor_2">#64D1FD</color>
-    <color name="heart_rate_zone_textcolor_1">@color/opentracks_on_primary_color</color>
 </resources>
\ No newline at end of file