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

Don't reset measurement when toggling expand/edit mode

Browse Source
This commit is contained in:
Erik Johansson
2018-01-21 21:15:45 +01:00
parent 78753d8aee
commit bcd6d4ed24
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,11 +149,10 @@ public class DataEntryActivity extends Activity {
if (scaleMeasurement == null || scaleMeasurement.getId() != id) { if (scaleMeasurement == null || scaleMeasurement.getId() != id) {
isDirty = false; isDirty = false;
scaleMeasurement = null;
previousMeasurement = null;
} }
scaleMeasurement = null;
previousMeasurement = null;
OpenScale openScale = OpenScale.getInstance(context); OpenScale openScale = OpenScale.getInstance(context);
boolean doExpand = false; boolean doExpand = false;
@@ -175,9 +174,11 @@ public class DataEntryActivity extends Activity {
} }
// Show selected scale data // Show selected scale data
ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id); if (scaleMeasurement == null) {
previousMeasurement = tupleScaleData[0]; ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id);
scaleMeasurement = tupleScaleData[1].clone(); previousMeasurement = tupleScaleData[0];
scaleMeasurement = tupleScaleData[1].clone();
}
} else { } else {
setViewMode(MeasurementView.MeasurementViewMode.ADD); setViewMode(MeasurementView.MeasurementViewMode.ADD);