From eac8f5f8c7280a3e2896bd2a8aa7cc0d9939f011 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sun, 15 Oct 2017 22:12:37 +0200 Subject: [PATCH] Extract isValidHeartRate() method to HeartRateUtils --- .../gadgetbridge/activities/HeartRateUtils.java | 4 ++++ .../activities/charts/AbstractChartFragment.java | 6 +----- .../activities/charts/LiveActivityFragment.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java index 3c7f9b394..bb9f3d2be 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HeartRateUtils.java @@ -27,4 +27,8 @@ public class HeartRateUtils { * Value is in minutes */ public static final int MAX_HR_MEASUREMENTS_GAP_MINUTES = 10; + + public static boolean isValidHeartRateValue(int value) { + return value > HeartRateUtils.MIN_HEART_RATE_VALUE && value < HeartRateUtils.MAX_HEART_RATE_VALUE; + } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java index a2b0cb8c0..0abd1b47b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java @@ -486,7 +486,7 @@ public abstract class AbstractChartFragment extends AbstractGBFragment { colors.add(akActivity.color); } activityEntries.add(createBarEntry(value, ts)); - if (hr && isValidHeartRateValue(sample.getHeartRate())) { + if (hr && HeartRateUtils.isValidHeartRateValue(sample.getHeartRate())) { if (lastHrSampleIndex > -1 && ts - lastHrSampleIndex > 1800*HeartRateUtils.MAX_HR_MEASUREMENTS_GAP_MINUTES) { heartrateEntries.add(createLineEntry(0, lastHrSampleIndex + 1)); heartrateEntries.add(createLineEntry(0, ts - 1)); @@ -550,10 +550,6 @@ public abstract class AbstractChartFragment extends AbstractGBFragment { return new DefaultChartsData(combinedData, xValueFormatter); } - protected boolean isValidHeartRateValue(int value) { - return value > HeartRateUtils.MIN_HEART_RATE_VALUE && value < HeartRateUtils.MAX_HEART_RATE_VALUE; - } - /** * Implement this to supply the samples to be displayed. * diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java index c91023035..a292dfd4c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LiveActivityFragment.java @@ -168,7 +168,7 @@ public class LiveActivityFragment extends AbstractChartFragment { private void addSample(ActivitySample sample) { int heartRate = sample.getHeartRate(); int timestamp = tsTranslation.shorten(sample.getTimestamp()); - if (isValidHeartRateValue(heartRate)) { + if (HeartRateUtils.isValidHeartRateValue(heartRate)) { setCurrentHeartRate(heartRate, timestamp); } int steps = sample.getSteps();