From f0df98485e01393648556dc0a623fd63532d1271 Mon Sep 17 00:00:00 2001 From: OliE Date: Sat, 3 Feb 2018 15:42:47 +0100 Subject: [PATCH] remember export path for each user. --- .../com/health/openscale/gui/fragments/TableFragment.java | 6 ++++-- .../health/openscale/gui/views/FloatMeasurementView.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index e8e69cd2..fa451450 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -50,6 +50,7 @@ import android.widget.Toast; import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleMeasurement; +import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.gui.activities.DataEntryActivity; import com.health.openscale.gui.views.BMIMeasurementView; import com.health.openscale.gui.views.BMRMeasurementView; @@ -342,7 +343,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { filenameDialog.setTitle(getResources().getString(R.string.info_set_filename) + " " + Environment.getExternalStorageDirectory().getPath()); - String exportFilename = prefs.getString("exportFilename", "openScale_data_" + OpenScale.getInstance(getContext()).getSelectedScaleUser().getUserName() + ".csv"); + final ScaleUser selectedScaleUser = OpenScale.getInstance(getContext()).getSelectedScaleUser(); + String exportFilename = prefs.getString("exportFilename" + selectedScaleUser.getId(), "openScale_data_" + selectedScaleUser.getUserName() + ".csv"); final EditText txtFilename = new EditText(tableView.getContext()); txtFilename.setText(exportFilename); @@ -355,7 +357,7 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { if (OpenScale.getInstance(getContext()).exportData(fullPath)) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext()); - prefs.edit().putString("exportFilename", txtFilename.getText().toString()).commit(); + prefs.edit().putString("exportFilename" + selectedScaleUser.getId(), txtFilename.getText().toString()).commit(); Toast.makeText(getContext(), getResources().getString(R.string.info_data_exported) + " " + fullPath, Toast.LENGTH_SHORT).show(); } } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java index 2c14cccb..b0ec0bfa 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java @@ -49,10 +49,10 @@ public abstract class FloatMeasurementView extends MeasurementView { private static float NO_VALUE = -1.0f; private static float AUTO_VALUE = -2.0f; - Date dateTime; - float value = NO_VALUE; - float previousValue = NO_VALUE; - EvaluationResult evaluationResult; + private Date dateTime; + private float value = NO_VALUE; + private float previousValue = NO_VALUE; + private EvaluationResult evaluationResult; private String nameText;