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 1ac33f93c..d6356c18c 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java @@ -3,6 +3,7 @@ package de.dennisguse.opentracks.data.models; import android.content.Context; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.ui.util.ThemeUtils; @@ -15,19 +16,19 @@ public class HeartRateZones { this.max = max; } - public int getColorForZone(Context context, HeartRate current) { + public int getTextColorForZone(Context context, HeartRate current) { if (current != null) { if (current.getBPM() >= max.getBPM() * 0.9) { - return R.color.heart_rate_zone_textcolor_5; + return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_5); } if (current.getBPM() >= max.getBPM() * 0.8) { - return R.color.heart_rate_zone_textcolor_4; + return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_4); } if (current.getBPM() >= max.getBPM() * 0.7) { - return R.color.heart_rate_zone_textcolor_3; + return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_3); } if (current.getBPM() >= max.getBPM() * 0.6) { - return R.color.heart_rate_zone_textcolor_2; + return ContextCompat.getColor(context, R.color.heart_rate_zone_textcolor_2); } } diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java index 6912faecf..6df6a44fe 100644 --- a/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java +++ b/src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java @@ -4,8 +4,6 @@ import android.util.Pair; import android.view.LayoutInflater; import android.view.View; -import androidx.core.content.ContextCompat; - import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.DistanceFormatter; import de.dennisguse.opentracks.data.models.HeartRateZones; @@ -274,10 +272,10 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder