mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-09 08:00:39 +02:00
Code Issues Releases Wiki Activity

Pass measurement list as a parameter

Browse Source 
instead of keeping it as a class variable.
This commit is contained in:
Erik Johansson
2018-01-26 21:30:05 +01:00
parent 084656c88c
commit ccbeed5448
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
View File

@@ -92,7 +92,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
static private String CAL_YEARS_KEY = "calYears";
static private String CAL_LAST_SELECTED_KEY = "calLastSelected";
private List<ScaleMeasurement> scaleMeasurementList;
private List<ScaleMeasurement> pointIndexScaleMeasurementList;
public GraphFragment() {
@@ -106,7 +105,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
openScale = OpenScale.getInstance(getContext());
if (savedInstanceState == null) {
scaleMeasurementList = openScale.getScaleMeasurementList();
List<ScaleMeasurement> scaleMeasurementList = openScale.getScaleMeasurementList();
if (!scaleMeasurementList.isEmpty()) {
calYears.setTime(scaleMeasurementList.get(0).getDateTime());
calLastSelected.setTime(scaleMeasurementList.get(0).getDateTime());
@@ -244,7 +243,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
return false;
}
private void generateLineData(int field)
private void generateLineData(int field, List<ScaleMeasurement> scaleMeasurementList)
{
SimpleDateFormat day_date = new SimpleDateFormat("D", Locale.getDefault());
@@ -511,7 +510,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
int firstYear = selectedYear;
int lastYear = selectedYear;
scaleMeasurementList = openScale.getScaleMeasurementList();
List<ScaleMeasurement> scaleMeasurementList = openScale.getScaleMeasurementList();
if (!scaleMeasurementList.isEmpty()) {
Calendar cal = Calendar.getInstance();
@@ -540,7 +539,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
generateColumnData();
scaleMeasurementList = openScale.getScaleDataOfMonth(selectedYear, calLastSelected.get(Calendar.MONTH));
generateLineData(Calendar.DAY_OF_MONTH);
generateLineData(Calendar.DAY_OF_MONTH, scaleMeasurementList);
// show only yearly diagram and hide monthly diagram
} else {
chartTop.setVisibility(View.GONE);
@@ -548,7 +547,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
scaleMeasurementList = openScale.getScaleDataOfYear(selectedYear);
generateLineData(Calendar.DAY_OF_YEAR);
generateLineData(Calendar.DAY_OF_YEAR, scaleMeasurementList);
}
}
@@ -561,8 +560,9 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
calLastSelected = cal;
scaleMeasurementList = openScale.getScaleDataOfMonth(calYears.get(Calendar.YEAR), calLastSelected.get(Calendar.MONTH));
generateLineData(Calendar.DAY_OF_MONTH);
List<ScaleMeasurement> scaleMeasurementList =
openScale.getScaleDataOfMonth(calYears.get(Calendar.YEAR), calLastSelected.get(Calendar.MONTH));
generateLineData(Calendar.DAY_OF_MONTH, scaleMeasurementList);
}
@Override