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

Use initial weight as default weight for first measurement

Browse Source
This commit is contained in:
Erik Johansson
2018-01-09 20:35:21 +01:00
parent a4e910c00c
commit 4259e4e351
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
View File

@@ -141,7 +141,6 @@ public class ScaleMeasurement {
public void setWeight(float weight) {
this.weight = weight;
}
public void setConvertedWeight(float weight, int scale_unit) {

8
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

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