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

only add measurement view to statistic page if it visible

This commit is contained in:
OliE
2018-01-13 10:20:33 +01:00
parent dbeafa6306
commit 4a6fc1b230

View File

@@ -108,13 +108,15 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
for (MeasurementView measurement : viewMeasurementsListWeek) { for (MeasurementView measurement : viewMeasurementsListWeek) {
measurement.setEditMode(STATISTIC); measurement.setEditMode(STATISTIC);
measurement.updatePreferences(prefs); measurement.updatePreferences(prefs);
if ((i % 2) == 0) {
tableWeekAveragesLayoutColumnA.addView(measurement); if (measurement.isVisible()) {
if ((i % 2) == 0) {
tableWeekAveragesLayoutColumnA.addView(measurement);
} else {
tableWeekAveragesLayoutColumnB.addView(measurement);
}
i++;
} }
else {
tableWeekAveragesLayoutColumnB.addView(measurement);
}
i++;
} }
viewMeasurementsListMonth = new ArrayList<>(); viewMeasurementsListMonth = new ArrayList<>();
@@ -134,13 +136,14 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
measurement.setEditMode(STATISTIC); measurement.setEditMode(STATISTIC);
measurement.updatePreferences(prefs); measurement.updatePreferences(prefs);
if ((i % 2) == 0) { if (measurement.isVisible()) {
tableMonthAveragesLayoutColumnA.addView(measurement); if ((i % 2) == 0) {
tableMonthAveragesLayoutColumnA.addView(measurement);
} else {
tableMonthAveragesLayoutColumnB.addView(measurement);
}
i++;
} }
else {
tableMonthAveragesLayoutColumnB.addView(measurement);
}
i++;
} }
OpenScale.getInstance(getContext()).registerFragment(this); OpenScale.getInstance(getContext()).registerFragment(this);