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

Avoid database access just to get next measurement's id

Browse Source
This commit is contained in:
Erik Johansson
2018-01-22 20:15:49 +01:00
parent 1a5e94bb63
commit 5fc0e0f84e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,7 @@ public class DataEntryActivity extends Activity {
private ScaleMeasurement scaleMeasurement; private ScaleMeasurement scaleMeasurement;
private ScaleMeasurement previousMeasurement; private ScaleMeasurement previousMeasurement;
private ScaleMeasurement nextMeasurement;
private boolean isDirty; private boolean isDirty;
private Context context; private Context context;
@@ -151,6 +152,7 @@ public class DataEntryActivity extends Activity {
isDirty = false; isDirty = false;
scaleMeasurement = null; scaleMeasurement = null;
previousMeasurement = null; previousMeasurement = null;
nextMeasurement = null;
} }
OpenScale openScale = OpenScale.getInstance(context); OpenScale openScale = OpenScale.getInstance(context);
@@ -178,9 +180,10 @@ public class DataEntryActivity extends Activity {
ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id); ScaleMeasurement[] tupleScaleData = openScale.getTupleScaleData(id);
previousMeasurement = tupleScaleData[0]; previousMeasurement = tupleScaleData[0];
scaleMeasurement = tupleScaleData[1].clone(); scaleMeasurement = tupleScaleData[1].clone();
nextMeasurement = tupleScaleData[2];
btnLeft.setEnabled(tupleScaleData[0] != null); btnLeft.setEnabled(previousMeasurement != null);
btnRight.setEnabled(tupleScaleData[2] != null); btnRight.setEnabled(nextMeasurement != null);
} }
} else { } else {
setViewMode(MeasurementView.MeasurementViewMode.ADD); setViewMode(MeasurementView.MeasurementViewMode.ADD);
@@ -271,13 +274,9 @@ public class DataEntryActivity extends Activity {
} }
private boolean moveRight() { private boolean moveRight() {
ScaleMeasurement[] tupleScaleData = OpenScale.getInstance(getApplicationContext()) if (nextMeasurement != null) {
.getTupleScaleData(scaleMeasurement.getId());
ScaleMeasurement nextScaleMeasurement = tupleScaleData[2];
if (nextScaleMeasurement != null) {
saveScaleData(); saveScaleData();
getIntent().putExtra("id", nextScaleMeasurement.getId()); getIntent().putExtra("id", nextMeasurement.getId());
updateOnView(); updateOnView();
return true; return true;
} }
@@ -387,11 +386,12 @@ public class DataEntryActivity extends Activity {
void deleteMeasurement() { void deleteMeasurement() {
int delId = scaleMeasurement.getId(); int delId = scaleMeasurement.getId();
boolean hasNext = moveLeft();
OpenScale.getInstance(getApplicationContext()).deleteScaleData(delId); OpenScale.getInstance(getApplicationContext()).deleteScaleData(delId);
Toast.makeText(context, getResources().getString(R.string.info_data_deleted), Toast.LENGTH_SHORT).show(); Toast.makeText(context, getResources().getString(R.string.info_data_deleted), Toast.LENGTH_SHORT).show();
isDirty = false;
final boolean hasNext = moveLeft() || moveRight();
if (!hasNext) { if (!hasNext) {
finish(); finish();
} }