From 4259e4e3511d60496651fa9f9f9af2c85128f03f Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Tue, 9 Jan 2018 20:35:21 +0100 Subject: [PATCH] Use initial weight as default weight for first measurement --- .../health/openscale/core/datatypes/ScaleMeasurement.java | 1 - .../openscale/gui/activities/DataEntryActivity.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java index 059c5f90..11322b57 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java +++ b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java @@ -141,7 +141,6 @@ public class ScaleMeasurement { public void setWeight(float weight) { this.weight = weight; - } public void setConvertedWeight(float weight, int scale_unit) { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index 4d139496..24c85075 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -180,6 +180,7 @@ public class DataEntryActivity extends Activity { } ScaleMeasurement scaleMeasurement; + OpenScale openScale = OpenScale.getInstance(context); if (id > 0) { // keep edit mode state if we are moving to left or right @@ -198,8 +199,6 @@ public class DataEntryActivity extends Activity { expandButton.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#D3D3D3"))); } - OpenScale openScale = OpenScale.getInstance(context); - ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id); ScaleMeasurement prevScaleMeasurement = tupleScaleData[0]; scaleMeasurement = tupleScaleData[1]; @@ -217,13 +216,14 @@ public class DataEntryActivity extends Activity { } else { setViewMode(MeasurementView.MeasurementViewMode.ADD); - if (OpenScale.getInstance(getApplicationContext()).getScaleMeasurementList().isEmpty()) { + if (openScale.getScaleMeasurementList().isEmpty()) { // Show default values scaleMeasurement = new ScaleMeasurement(); + scaleMeasurement.setWeight(openScale.getSelectedScaleUser().getInitialWeight()); } else { // Show the last scale data as default - scaleMeasurement = OpenScale.getInstance(getApplicationContext()).getScaleMeasurementList().get(0); + scaleMeasurement = openScale.getScaleMeasurementList().get(0); scaleMeasurement.setDateTime(new Date()); scaleMeasurement.setComment(""); }