mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-07-31 22:10:32 +02:00
Code Issues Releases Wiki Activity

update goal line when switching an user, see issue #500

Browse Source
This commit is contained in:
oliexdev
2019-10-12 11:50:31 +02:00
parent ee9e47efdf
commit c22532e44b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java
View File

@@ -72,7 +72,6 @@ public class ChartMeasurementView extends LineChart {
private OpenScale openScale; private OpenScale openScale;
private SharedPreferences prefs; private SharedPreferences prefs;
private ScaleUser user;
private List<ScaleMeasurement> scaleMeasurementList; private List<ScaleMeasurement> scaleMeasurementList;
private List<MeasurementView> measurementViews; private List<MeasurementView> measurementViews;
private ScaleMeasurement firstMeasurement; private ScaleMeasurement firstMeasurement;
@@ -174,7 +173,6 @@ public class ChartMeasurementView extends LineChart {
private void initChart() { private void initChart() {
prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
openScale = OpenScale.getInstance(); openScale = OpenScale.getInstance();
user = openScale.getSelectedScaleUser();
scaleMeasurementList = new ArrayList<>(); scaleMeasurementList = new ArrayList<>();
measurementViews = MeasurementView.getMeasurementList(getContext(), MeasurementView.DateTimeOrder.NONE); measurementViews = MeasurementView.getMeasurementList(getContext(), MeasurementView.DateTimeOrder.NONE);
firstMeasurement = new ScaleMeasurement(); firstMeasurement = new ScaleMeasurement();
@@ -692,6 +690,7 @@ public class ChartMeasurementView extends LineChart {
if (prefs.getBoolean("goalLine", true)) { if (prefs.getBoolean("goalLine", true)) {
List<Entry> valuesGoalLine = new Stack<>(); List<Entry> valuesGoalLine = new Stack<>();
ScaleUser user = OpenScale.getInstance().getSelectedScaleUser();
float goalWeight = Converters.fromKilogram(user.getGoalWeight(), user.getScaleUnit()); float goalWeight = Converters.fromKilogram(user.getGoalWeight(), user.getScaleUnit());
valuesGoalLine.add(new Entry(minXValue, goalWeight)); valuesGoalLine.add(new Entry(minXValue, goalWeight));