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

don't rely on menu id use instead enum value, fixed issue #446

Browse Source
This commit is contained in:
oliexdev
2019-03-27 17:12:59 +01:00
parent 81afa7c735
commit 3088633dc5
1 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -140,13 +140,22 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
getActivity().recreate(); // TODO HACK to refresh graph; graph.invalidate and notfiydatachange is not enough!? getActivity().recreate(); // TODO HACK to refresh graph; graph.invalidate and notfiydatachange is not enough!?
return true; return true;
case R.id.menu_range_day:
prefs.edit().putInt("selectRangeMode", ChartMeasurementView.ViewMode.DAY_OF_ALL.ordinal()).commit();
break;
case R.id.menu_range_week:
prefs.edit().putInt("selectRangeMode", ChartMeasurementView.ViewMode.WEEK_OF_ALL.ordinal()).commit();
break;
case R.id.menu_range_month:
prefs.edit().putInt("selectRangeMode", ChartMeasurementView.ViewMode.MONTH_OF_ALL.ordinal()).commit();
break;
case R.id.menu_range_year:
prefs.edit().putInt("selectRangeMode", ChartMeasurementView.ViewMode.YEAR_OF_ALL.ordinal()).commit();
} }
item.setChecked(true); item.setChecked(true);
prefs.edit().putInt("selectRange", item.getItemId()).commit();
if (prefs.getBoolean("enableRollingChart", true)) { if (prefs.getBoolean("enableRollingChart", true)) {
getActivity().recreate(); // TODO HACK to refresh graph; if rolling chart is enabled then graph.invalidate and notfiydatachange is not enough!? getActivity().recreate(); // TODO HACK to refresh graph; if rolling chart is enabled then graph.invalidate and notfiydatachange is not enough!?
} else { } else {
@@ -157,7 +166,23 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
} }
}); });
rangePopupMenu.getMenuInflater().inflate(R.menu.overview_menu, rangePopupMenu.getMenu()); rangePopupMenu.getMenuInflater().inflate(R.menu.overview_menu, rangePopupMenu.getMenu());
rangePopupMenu.getMenu().findItem(prefs.getInt("selectRange", R.id.menu_range_day)).setChecked(true); ChartMeasurementView.ViewMode selectedRangePos = ChartMeasurementView.ViewMode.values()[prefs.getInt("selectRangeMode", ChartMeasurementView.ViewMode.DAY_OF_ALL.ordinal())];
switch (selectedRangePos) {
case DAY_OF_ALL:
rangePopupMenu.getMenu().findItem(R.id.menu_range_day).setChecked(true);
break;
case WEEK_OF_ALL:
rangePopupMenu.getMenu().findItem(R.id.menu_range_week).setChecked(true);
break;
case MONTH_OF_ALL:
rangePopupMenu.getMenu().findItem(R.id.menu_range_month).setChecked(true);
break;
case YEAR_OF_ALL:
rangePopupMenu.getMenu().findItem(R.id.menu_range_year).setChecked(true);
break;
}
rangePopupMenu.getMenu().findItem(R.id.enableRollingChart).setChecked(prefs.getBoolean("enableRollingChart", true)); rangePopupMenu.getMenu().findItem(R.id.enableRollingChart).setChecked(prefs.getBoolean("enableRollingChart", true));
MenuItem enableMeasurementBar = rangePopupMenu.getMenu().findItem(R.id.enableChartActionBar); MenuItem enableMeasurementBar = rangePopupMenu.getMenu().findItem(R.id.enableChartActionBar);
@@ -255,20 +280,8 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
private void updateChartView() { private void updateChartView() {
boolean enableRollingChart = prefs.getBoolean("enableRollingChart", true); boolean enableRollingChart = prefs.getBoolean("enableRollingChart", true);
switch (prefs.getInt("selectRange", R.id.menu_range_day)) { ChartMeasurementView.ViewMode selectedRangeMode = ChartMeasurementView.ViewMode.values()[prefs.getInt("selectRangeMode", ChartMeasurementView.ViewMode.DAY_OF_ALL.ordinal())];
case R.id.menu_range_day: chartView.setViewRange(selectedRangeMode, enableRollingChart);
chartView.setViewRange(ChartMeasurementView.ViewMode.DAY_OF_ALL, enableRollingChart);
break;
case R.id.menu_range_week:
chartView.setViewRange(ChartMeasurementView.ViewMode.WEEK_OF_ALL, enableRollingChart);
break;
case R.id.menu_range_month:
chartView.setViewRange(ChartMeasurementView.ViewMode.MONTH_OF_ALL, enableRollingChart);
break;
case R.id.menu_range_year:
chartView.setViewRange(ChartMeasurementView.ViewMode.YEAR_OF_ALL, enableRollingChart);
break;
}
} }
private void updateMesurementViews(ScaleMeasurement selectedMeasurement) { private void updateMesurementViews(ScaleMeasurement selectedMeasurement) {