upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-03 09:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug: crash due to color not found.

Browse Source 
Introduced in 674d231b7a
This commit is contained in:
Dennis Guse
2023-01-29 21:41:11 +01:00
parent 8cc4fd1d4f
commit c666d55211
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/models/HeartRateZones.java
+6 -5
View File
@@ -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);
}
}
src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java
+3 -5
View File
@@ -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<St
if (sensorDataSet != null && sensorDataSet.getHeartRate() != null) {
valueAndUnit = StringUtils.getHeartRateParts(getContext(), sensorDataSet.getHeartRate().first);
sensorName = sensorDataSet.getHeartRate().second;
textColor = zones.getColorForZone(getContext(), sensorDataSet.getHeartRate().first);
textColor = zones.getTextColorForZone(getContext(), sensorDataSet.getHeartRate().first);
} else {
valueAndUnit = StringUtils.getHeartRateParts(getContext(), null);
textColor = zones.getColorForZone(getContext(), null);
textColor = zones.getTextColorForZone(getContext(), null);
}
getBinding().statsValue.setText(valueAndUnit.first);
@@ -287,7 +285,7 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
getBinding().statsDescriptionSecondary.setVisibility(View.VISIBLE);
getBinding().statsDescriptionSecondary.setText(sensorName);
getBinding().statsValue.setTextColor(ContextCompat.getColor(getContext(), textColor));
getBinding().statsValue.setTextColor(textColor);
}
}