mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-17 22:11:35 +02:00
Code Issues Releases Wiki Activity

- set calories inc size to ten

Browse Source 
- throw error on LE scan
This commit is contained in:
oliexdev
2019-02-03 14:15:49 +01:00
parent acdd63a655
commit 9129dc6a22
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -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");

8
android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
View File

@@ -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) {