diff --git a/android_app/app/src/main/java/com/health/openscale/gui/overview/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/overview/OverviewFragment.java index d241d779..a6eeb07a 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/overview/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/overview/OverviewFragment.java @@ -104,13 +104,8 @@ public class OverviewFragment extends Fragment { chartView.setProgressBar(overviewView.findViewById(R.id.progressBar)); chartView.setIsInGraphKey(false); chartView.getLegend().setEnabled(false); - chartView.getAxisRight().setDrawLabels(false); - chartView.getAxisRight().setDrawGridLines(false); - chartView.getAxisRight().setDrawAxisLine(false); - chartView.getAxisLeft().setDrawGridLines(false); - chartView.getAxisLeft().setDrawLabels(false); - chartView.getAxisLeft().setDrawAxisLine(false); - chartView.getXAxis().setDrawGridLines(false); + + setYAxisVisibility(prefs.getBoolean("enableYAxis", false)); chartActionBarView = overviewView.findViewById(R.id.chartActionBar); chartActionBarView.setIsInGraphKey(false); @@ -149,6 +144,13 @@ public class OverviewFragment extends Fragment { chartActionBarView.setVisibility(View.VISIBLE); } return true; + case R.id.enableYAxis: + boolean checked = item.isChecked(); + item.setChecked(!checked); + prefs.edit().putBoolean("enableYAxis", !checked).apply(); + setYAxisVisibility(!checked); + updateChartView(); + return true; case R.id.menu_range_day: prefs.edit().putInt("selectRangeMode", ChartMeasurementView.ViewMode.DAY_OF_ALL.ordinal()).commit(); break; @@ -196,6 +198,9 @@ public class OverviewFragment extends Fragment { chartActionBarView.setVisibility(View.GONE); } + MenuItem enableYAxis = rangePopupMenu.getMenu().findItem(R.id.enableYAxis); + enableYAxis.setChecked(prefs.getBoolean("enableYAxis", false)); + recyclerView = overviewView.findViewById(R.id.recyclerView); LinearLayoutManager layoutManager = new LinearLayoutManager(getContext()); layoutManager.setInitialPrefetchItemCount(5); @@ -235,6 +240,18 @@ public class OverviewFragment extends Fragment { return overviewView; } + protected void setYAxisVisibility(boolean visible) { + chartView.getAxisRight().setDrawLabels(visible); + chartView.getAxisRight().setDrawGridLines(visible); + chartView.getAxisRight().setDrawAxisLine(visible); + + chartView.getAxisLeft().setDrawGridLines(visible); + chartView.getAxisLeft().setDrawLabels(visible); + chartView.getAxisLeft().setDrawAxisLine(visible); + + chartView.getXAxis().setDrawGridLines(visible); + } + public void updateOnView(List scaleMeasurementList) { this.scaleMeasurementList = scaleMeasurementList; diff --git a/android_app/app/src/main/res/menu/overview_menu.xml b/android_app/app/src/main/res/menu/overview_menu.xml index 0adf7f55..30a38514 100644 --- a/android_app/app/src/main/res/menu/overview_menu.xml +++ b/android_app/app/src/main/res/menu/overview_menu.xml @@ -7,6 +7,11 @@ android:title="@string/label_measurement_bar" android:checkable="true" android:checked="false"/> + diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index f0a1045a..ffcbf998 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -287,4 +287,5 @@ Back Done Create new user on scale. - \ No newline at end of file + Y-axis +