1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 00:33:09 +02:00

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.
This commit is contained in:
Erik Johansson
2018-01-26 21:41:17 +01:00
parent ccbeed5448
commit 74d063a7cd

View File

@@ -188,6 +188,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public void onClick(View view) { public void onClick(View view) {
calYears.roll(Calendar.YEAR, false); calYears.roll(Calendar.YEAR, false);
txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR)));
List<ScaleMeasurement> scaleMeasurementList =
OpenScale.getInstance(getContext()).getScaleDataOfYear(calYears.get(Calendar.YEAR));
if (!scaleMeasurementList.isEmpty()) {
calLastSelected.setTime(scaleMeasurementList.get(0).getDateTime());
}
updateOnView(null); updateOnView(null);
} }
}); });
@@ -197,6 +203,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
public void onClick(View view) { public void onClick(View view) {
calYears.roll(Calendar.YEAR, true); calYears.roll(Calendar.YEAR, true);
txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR))); txtYear.setText(Integer.toString(calYears.get(Calendar.YEAR)));
List<ScaleMeasurement> scaleMeasurementList =
OpenScale.getInstance(getContext()).getScaleDataOfYear(calYears.get(Calendar.YEAR));
if (!scaleMeasurementList.isEmpty()) {
calLastSelected.setTime(scaleMeasurementList.get(scaleMeasurementList.size() - 1).getDateTime());
}
updateOnView(null); updateOnView(null);
} }
}); });