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

update openScale to version 2.1.0

Browse Source
This commit is contained in:
oliexdev
2019-06-02 15:59:39 +02:00
parent 63e382f323
commit 2cf521fc25
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/build.gradle
View File

@@ -7,8 +7,8 @@ android {
testApplicationId "com.health.openscale.test" testApplicationId "com.health.openscale.test"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 44 versionCode 45
versionName "2.0.3" versionName "2.1.0"
manifestPlaceholders = [ manifestPlaceholders = [
appIcon: "@drawable/ic_launcher_openscale" appIcon: "@drawable/ic_launcher_openscale"

4
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java
View File

@@ -40,14 +40,14 @@ public class BluetoothFactory {
|| name.equals("BF700".toLowerCase(Locale.US))) { || name.equals("BF700".toLowerCase(Locale.US))) {
return new BluetoothBeurerSanitas(context, BluetoothBeurerSanitas.DeviceType.BEURER_BF710); return new BluetoothBeurerSanitas(context, BluetoothBeurerSanitas.DeviceType.BEURER_BF710);
} }
if (name.startsWith("BEURER BF600".toLowerCase(Locale.US)) /*if (name.startsWith("BEURER BF600".toLowerCase(Locale.US))
|| name.startsWith("BEURER BF850".toLowerCase(Locale.US)) || name.startsWith("BEURER BF850".toLowerCase(Locale.US))
|| name.startsWith("BF600".toLowerCase(Locale.US)) || name.startsWith("BF600".toLowerCase(Locale.US))
|| name.startsWith("BF850".toLowerCase(Locale.US)) || name.startsWith("BF850".toLowerCase(Locale.US))
|| name.startsWith("BF-600".toLowerCase(Locale.US)) || name.startsWith("BF-600".toLowerCase(Locale.US))
|| name.startsWith("BF-850".toLowerCase(Locale.US))) { || name.startsWith("BF-850".toLowerCase(Locale.US))) {
return new BluetoothStandardWeightProfile(context); return new BluetoothStandardWeightProfile(context);
} }*/
if (name.equals("openScale".toLowerCase(Locale.US))) { if (name.equals("openScale".toLowerCase(Locale.US))) {
return new BluetoothCustomOpenScale(context); return new BluetoothCustomOpenScale(context);
} }

1
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementViewSettings.java
View File

@@ -66,6 +66,7 @@ public class MeasurementViewSettings {
case Caliper2MeasurementView.KEY: case Caliper2MeasurementView.KEY:
case Caliper3MeasurementView.KEY: case Caliper3MeasurementView.KEY:
case CaloriesMeasurementView.KEY: case CaloriesMeasurementView.KEY:
case UserMeasurementView.KEY:
defaultValue = false; defaultValue = false;
break; break;
default: default: