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

Set edit mode before loading values

Browse Source 
Add mode needs to be set before the value is loaded, otherwise "auto"
will not be properly shown.
This commit is contained in:
Erik Johansson
2018-02-18 20:58:51 +01:00
parent 29b0960b9e
commit 53738b713b
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,10 @@ public class DataEntryActivity extends AppCompatActivity {
private Context context; private Context context;
private boolean isAddActivity() {
return !getIntent().hasExtra(EXTRA_ID);
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
String app_theme = PreferenceManager.getDefaultSharedPreferences(this).getString("app_theme", "Light"); String app_theme = PreferenceManager.getDefaultSharedPreferences(this).getString("app_theme", "Light");
@@ -117,12 +121,19 @@ public class DataEntryActivity extends AppCompatActivity {
} }
}); });
final MeasurementView.MeasurementViewMode mode = isAddActivity()
? MeasurementView.MeasurementViewMode.ADD
: MeasurementView.MeasurementViewMode.VIEW;
for (MeasurementView measurement : dataEntryMeasurements) {
measurement.setEditMode(mode);
}
updateOnView(); updateOnView();
onMeasurementViewUpdateListener updateListener = new onMeasurementViewUpdateListener(); onMeasurementViewUpdateListener updateListener = new onMeasurementViewUpdateListener();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
final boolean expand = getIntent().hasExtra(EXTRA_ID) final boolean expand = isAddActivity()
? prefs.getBoolean(PREF_EXPAND, true) : false; ? false : prefs.getBoolean(PREF_EXPAND, true);
for (MeasurementView measurement : dataEntryMeasurements) { for (MeasurementView measurement : dataEntryMeasurements) {
tableLayoutDataEntry.addView(measurement); tableLayoutDataEntry.addView(measurement);
@@ -183,11 +194,11 @@ public class DataEntryActivity extends AppCompatActivity {
deleteButton = menu.findItem(R.id.deleteButton); deleteButton = menu.findItem(R.id.deleteButton);
// Hide/show icons as appropriate for the view mode // Hide/show icons as appropriate for the view mode
if (getIntent().hasExtra(EXTRA_ID)) { if (isAddActivity()) {
setViewMode(MeasurementView.MeasurementViewMode.VIEW); setViewMode(MeasurementView.MeasurementViewMode.ADD);
} }
else { else {
setViewMode(MeasurementView.MeasurementViewMode.ADD); setViewMode(MeasurementView.MeasurementViewMode.VIEW);
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);