mirror of
https://github.com/oliexdev/openScale.git
synced 2025-08-18 22:41:44 +02:00
- set calories inc size to ten
- throw error on LE scan
This commit is contained in:
@@ -491,7 +491,7 @@ public abstract class BluetoothCommunication {
|
|||||||
.subscribe(bleScanResult -> {
|
.subscribe(bleScanResult -> {
|
||||||
if (bleScanResult.getBleDevice().getMacAddress().equals(macAddress)) {
|
if (bleScanResult.getBleDevice().getMacAddress().equals(macAddress)) {
|
||||||
connectToDevice(macAddress);
|
connectToDevice(macAddress);
|
||||||
}});
|
}}, throwable -> onError(throwable));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Timber.d("No coarse location permission, connecting without LE scan");
|
Timber.d("No coarse location permission, connecting without LE scan");
|
||||||
|
@@ -61,7 +61,7 @@ public abstract class FloatMeasurementView extends MeasurementView {
|
|||||||
|
|
||||||
private static final float NO_VALUE = -1.0f;
|
private static final float NO_VALUE = -1.0f;
|
||||||
private static final float AUTO_VALUE = -2.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 Date dateTime;
|
||||||
private float value = NO_VALUE;
|
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);
|
final TextView unit = view.findViewById(R.id.float_input_unit);
|
||||||
unit.setText(getUnit());
|
unit.setText(getUnit());
|
||||||
|
|
||||||
|
if (getDecimalPlaces() == 0) {
|
||||||
|
INC_DEC_DELTA = 10.0f;
|
||||||
|
} else {
|
||||||
|
INC_DEC_DELTA = 0.1f;
|
||||||
|
}
|
||||||
|
|
||||||
View.OnClickListener onClickListener = new View.OnClickListener() {
|
View.OnClickListener onClickListener = new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View button) {
|
public void onClick(View button) {
|
||||||
|
Reference in New Issue
Block a user