From 1aeb9ca3326cd36d59d37cc6c40bba0a8a9c575f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Mon, 19 Sep 2022 22:14:08 +0200 Subject: [PATCH] Heartrate zones: adding preference for max heartrate. Part of #1118. --- .../de/dennisguse/opentracks/data/models/TrackPoint.java | 4 ---- .../de/dennisguse/opentracks/settings/PreferencesUtils.java | 5 +++++ src/main/res/values/settings.xml | 3 +++ src/main/res/values/strings.xml | 4 +++- src/main/res/xml/settings_sensors.xml | 6 ++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java index 883818e7e..f7f42d54a 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackPoint.java @@ -385,10 +385,6 @@ public class TrackPoint { return this; } - public boolean hasSensorData() { - return hasHeartRate() || hasCadence() || hasPower(); - } - public boolean hasHeartRate() { return heartRate != null; } diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 2b8a6e426..31666e758 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -279,6 +279,11 @@ public class PreferencesUtils { return getBoolean(R.string.settings_sensor_bluetooth_service_filter_enabled_key, DEFAULT); } + public static int getMaxHeartrate() { + final int DEFAULT = Integer.parseInt(resources.getString(R.string.settings_sensor_heart_rate_max_default)); + return getInt(R.string.settings_sensor_heart_rate_max_key, DEFAULT); + } + public static boolean shouldShowStatsOnLockscreen() { final boolean STATS_SHOW_ON_LOCKSCREEN_DEFAULT = resources.getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default); return getBoolean(R.string.stats_show_on_lockscreen_while_recording_key, STATS_SHOW_ON_LOCKSCREEN_DEFAULT); diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 5b12fb8d1..b7e6abb86 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -44,6 +44,9 @@ true + maxHeartRate + 220 + showOnMapFormatKey totalRowsDeletedKey diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 99549cc76..dec125e1d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -434,6 +434,8 @@ limitations under the License. Wheel Circumference (mm) Only show Bluetooth devices that announce required services + Zones: maximum Heart rate (bpm) + Preferred rate Imperial (mi, ft) @@ -479,7 +481,7 @@ limitations under the License. Distance Total time Split interval - Heart Rate + Heart rate Cadence Power Clock diff --git a/src/main/res/xml/settings_sensors.xml b/src/main/res/xml/settings_sensors.xml index 23a4be516..1a8130066 100644 --- a/src/main/res/xml/settings_sensors.xml +++ b/src/main/res/xml/settings_sensors.xml @@ -9,6 +9,12 @@ android:defaultValue="@string/sensor_type_value_none" android:key="@string/settings_sensor_bluetooth_heart_rate_key" android:title="@string/sensor_state_heart_rate" /> +