diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index ea9f00c5..8f0b723b 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -74,6 +74,7 @@ import cat.ereza.customactivityoncrash.config.CaocConfig; public class MainActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener{ + private SharedPreferences prefs; private static boolean firstAppStart = true; private static boolean valueOfCountModified = false; private static int bluetoothStatusIcon = R.drawable.ic_bluetooth_disabled; @@ -91,7 +92,7 @@ public class MainActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + prefs = PreferenceManager.getDefaultSharedPreferences(this); String app_theme = prefs.getString("app_theme", "Light"); @@ -492,11 +493,13 @@ public class MainActivity extends AppCompatActivity OpenScale openScale = OpenScale.getInstance(getApplicationContext()); - List scaleMeasurementList = openScale.getScaleMeasurementList(); + if (prefs.getBoolean("mergeWithLastMeasurement", true)) { + List scaleMeasurementList = openScale.getScaleMeasurementList(); - if (!scaleMeasurementList.isEmpty()) { - ScaleMeasurement lastMeasurement = scaleMeasurementList.get(0); - scaleBtData.merge(lastMeasurement); + if (!scaleMeasurementList.isEmpty()) { + ScaleMeasurement lastMeasurement = scaleMeasurementList.get(0); + scaleBtData.merge(lastMeasurement); + } } openScale.addScaleData(scaleBtData); diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 318c6fe8..c48e2b54 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -180,5 +180,6 @@ Halten Sie die Taste gedrückt, um die Reihenfolge zu ändern Default Reihenfolge wiederherstellen openScale CSV Datenexport (%s) + Zusammenführen mit der letzten Messung diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 45be5baf..d45e0d5f 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -119,6 +119,7 @@ Bluetooth Search for scale on startup + Merge with last measurement Searching for Bluetooth scales Finished searching for Bluetooth scales Device Type @@ -211,4 +212,5 @@ Press and hold to reorder Set default order + diff --git a/android_app/app/src/main/res/xml/bluetooth_preferences.xml b/android_app/app/src/main/res/xml/bluetooth_preferences.xml index c3ca9691..62ec906f 100644 --- a/android_app/app/src/main/res/xml/bluetooth_preferences.xml +++ b/android_app/app/src/main/res/xml/bluetooth_preferences.xml @@ -6,6 +6,7 @@ android:persistent="false"> +