From 9129dc6a22d609da4c2575a125a400c0242321ce Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sun, 3 Feb 2019 14:15:49 +0100 Subject: [PATCH] - set calories inc size to ten - throw error on LE scan --- .../openscale/core/bluetooth/BluetoothCommunication.java | 2 +- .../health/openscale/gui/views/FloatMeasurementView.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java index 9ce86d88..86da7228 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java @@ -491,7 +491,7 @@ public abstract class BluetoothCommunication { .subscribe(bleScanResult -> { if (bleScanResult.getBleDevice().getMacAddress().equals(macAddress)) { connectToDevice(macAddress); - }}); + }}, throwable -> onError(throwable)); } else { Timber.d("No coarse location permission, connecting without LE scan"); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java index 53adc60f..9cb73529 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java @@ -61,7 +61,7 @@ public abstract class FloatMeasurementView extends MeasurementView { private static final float NO_VALUE = -1.0f; private static final float AUTO_VALUE = -2.0f; - private static final float INC_DEC_DELTA = 0.1f; + private static float INC_DEC_DELTA = 0.1f; private Date dateTime; private float value = NO_VALUE; @@ -634,6 +634,12 @@ public abstract class FloatMeasurementView extends MeasurementView { final TextView unit = view.findViewById(R.id.float_input_unit); unit.setText(getUnit()); + if (getDecimalPlaces() == 0) { + INC_DEC_DELTA = 10.0f; + } else { + INC_DEC_DELTA = 0.1f; + } + View.OnClickListener onClickListener = new View.OnClickListener() { @Override public void onClick(View button) {