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 62018925..090a1513 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 @@ -274,14 +274,18 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { filenameDialog.setTitle(getResources().getString(R.string.info_set_filename) + " /sdcard ..."); + String exportFilename = prefs.getString("exportFilename", "/openScale_data_" + OpenScale.getInstance(getContext()).getSelectedScaleUser().getUserName() + ".csv"); + final EditText txtFilename = new EditText(tableView.getContext()); - txtFilename.setText("/openScale_data_" + OpenScale.getInstance(getContext()).getSelectedScaleUser().getUserName() + ".csv"); + txtFilename.setText(exportFilename); filenameDialog.setView(txtFilename); filenameDialog.setPositiveButton(getResources().getString(R.string.label_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { OpenScale.getInstance(getContext()).importData(Environment.getExternalStorageDirectory().getPath() + txtFilename.getText().toString()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext()); + prefs.edit().putString("exportFilename", txtFilename.getText().toString()).commit(); updateOnView(OpenScale.getInstance(getContext()).getScaleMeasurementList()); } }); @@ -305,14 +309,18 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { filenameDialog.setTitle(getResources().getString(R.string.info_set_filename) + " /sdcard ..."); + String exportFilename = prefs.getString("exportFilename", "/openScale_data_" + OpenScale.getInstance(getContext()).getSelectedScaleUser().getUserName() + ".csv"); + final EditText txtFilename = new EditText(tableView.getContext()); - txtFilename.setText("/openScale_data_" + OpenScale.getInstance(getContext()).getSelectedScaleUser().getUserName() + ".csv"); + txtFilename.setText(exportFilename); filenameDialog.setView(txtFilename); filenameDialog.setPositiveButton(getResources().getString(R.string.label_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { OpenScale.getInstance(getContext()).exportData(Environment.getExternalStorageDirectory().getPath() + txtFilename.getText().toString()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext()); + prefs.edit().putString("exportFilename", txtFilename.getText().toString()).commit(); } }); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/LinearGaugeView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/LinearGaugeView.java index 6b353fe8..18b563a7 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/LinearGaugeView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/LinearGaugeView.java @@ -81,15 +81,15 @@ public class LinearGaugeView extends View { textPaint = new Paint(Paint.ANTI_ALIAS_FLAG); textPaint.setColor(Color.GRAY); - textPaint.setTextSize(20); + textPaint.setTextSize(30); indicatorPaint = new Paint(Paint.ANTI_ALIAS_FLAG); indicatorPaint.setColor(Color.BLACK); - indicatorPaint.setTextSize(20); + indicatorPaint.setTextSize(30); infoTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); infoTextPaint.setColor(Color.GRAY); - infoTextPaint.setTextSize(30); + infoTextPaint.setTextSize(40); infoTextPaint.setTextAlign(Paint.Align.CENTER); } @@ -211,7 +211,7 @@ public class LinearGaugeView extends View { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int desiredWidth = 100; - int desiredHeight = 100; + int desiredHeight = 120; int widthMode = MeasureSpec.getMode(widthMeasureSpec); int widthSize = MeasureSpec.getSize(widthMeasureSpec);