From 82ec4863efbf799be2bd8a4850ef3c1589f50d84 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Wed, 22 Nov 2017 22:51:03 +0100 Subject: [PATCH] Make incValue and decValue handle edge case better Instead of blocking a dec when the value is 0.01, set it to 0. Similar for incValue. --- .../openscale/gui/views/MeasurementView.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index 351d5b87..837896b1 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -219,19 +219,13 @@ public abstract class MeasurementView extends TableLayout { } public void incValue() { - float incValue = getValue() + 0.1f; - - if (incValue <= getMaxValue()) { - setValueOnView(dateTime, incValue); - } + float incValue = Math.min(getMaxValue(), getValue() + 0.1f); + setValueOnView(dateTime, incValue); } public void decValue() { - float decValue = getValue() - 0.1f; - - if (decValue >= 0) { - setValueOnView(dateTime, decValue); - } + float decValue = Math.max(0.0f, getValue() - 0.1f); + setValueOnView(dateTime, decValue); } public String getValueAsString() {