mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 08:43:15 +02:00
Code Issues Releases Wiki Activity

Store empty values for measurements that aren't enabled

Browse Source
This commit is contained in:
Erik Johansson
2018-03-23 19:47:29 +01:00
parent ebe2d6dfa0
commit 78a266bb82
6 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,6 +302,15 @@ public class DataEntryActivity extends AppCompatActivity {
}
isDirty = true;
// Measurements that aren't visible should not store any value. Since we use values from
// the previous measurement there might be values for entries not shown. The loop below
// clears these values.
for (MeasurementView measurement : dataEntryMeasurements) {
if (!measurement.isVisible()) {
measurement.clearIn(scaleMeasurement);
}
}
}
for (MeasurementView measurement : dataEntryMeasurements) {

5
android_app/app/src/main/java/com/health/openscale/gui/views/CommentMeasurementView.java
View File

@@ -62,6 +62,11 @@ public class CommentMeasurementView extends MeasurementView {
measurement.setComment(comment);
}
@Override
public void clearIn(ScaleMeasurement measurement) {
measurement.setComment("");
}
@Override
public void restoreState(Bundle state) {
setValue(state.getString(getKey()), true);

5
android_app/app/src/main/java/com/health/openscale/gui/views/DateMeasurementView.java
View File

@@ -77,6 +77,11 @@ public class DateMeasurementView extends MeasurementView {
measurement.setDateTime(target.getTime());
}
@Override
public void clearIn(ScaleMeasurement measurement) {
// Ignore
}
@Override
public void restoreState(Bundle state) {
setValue(new Date(state.getLong(getKey())), true);

5
android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
View File

@@ -322,6 +322,11 @@ public abstract class FloatMeasurementView extends MeasurementView {
}
}
@Override
public void clearIn(ScaleMeasurement measurement) {
setMeasurementValue(0.0f, measurement);
}
@Override
public void restoreState(Bundle state) {
setValue(state.getFloat(getKey()), previousValue, true);

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

@@ -259,6 +259,7 @@ public abstract class MeasurementView extends TableLayout {
public abstract void loadFrom(ScaleMeasurement measurement, ScaleMeasurement previousMeasurement);
public abstract void saveTo(ScaleMeasurement measurement);
public abstract void clearIn(ScaleMeasurement measurement);
public abstract void restoreState(Bundle state);
public abstract void saveState(Bundle state);

5
android_app/app/src/main/java/com/health/openscale/gui/views/TimeMeasurementView.java
View File

@@ -80,6 +80,11 @@ public class TimeMeasurementView extends MeasurementView {
measurement.setDateTime(target.getTime());
}
@Override
public void clearIn(ScaleMeasurement measurement) {
// Ignore
}
@Override
public void restoreState(Bundle state) {
setValue(new Date(state.getLong(getKey())), true);