From 74d063a7cde2a66c91cec7c4f8b8d552ad41176d Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Fri, 26 Jan 2018 21:41:17 +0100 Subject: [PATCH] Select closest month when switching year in graph view When switching from e.g. January 2018 to 2017, make December be selected (if it had any measurements) instead of January 2017. --- .../openscale/gui/fragments/GraphFragment.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java index 79eed929..66772059 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java @@ -188,6 +188,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { public void onClick(View view) { calYears.roll(Calendar.YEAR, false); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); + + List scaleMeasurementList = + OpenScale.getInstance(getContext()).getScaleDataOfYear(calYears.get(Calendar.YEAR)); + if (!scaleMeasurementList.isEmpty()) { + calLastSelected.setTime(scaleMeasurementList.get(0).getDateTime()); + } updateOnView(null); } }); @@ -197,6 +203,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { public void onClick(View view) { calYears.roll(Calendar.YEAR, true); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); + + List scaleMeasurementList = + OpenScale.getInstance(getContext()).getScaleDataOfYear(calYears.get(Calendar.YEAR)); + if (!scaleMeasurementList.isEmpty()) { + calLastSelected.setTime(scaleMeasurementList.get(scaleMeasurementList.size() - 1).getDateTime()); + } updateOnView(null); } });