From 360ce7f172b2dbf9568f7ce2cc1b2d247c9b32db Mon Sep 17 00:00:00 2001 From: OliE Date: Wed, 24 Jan 2018 19:12:04 +0100 Subject: [PATCH] show navigation buttons only if you need them. --- .../com/health/openscale/gui/fragments/GraphFragment.java | 8 ++++++++ .../com/health/openscale/gui/fragments/TableFragment.java | 6 ++++++ android_app/app/src/main/res/layout/fragment_table.xml | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java index 31f61217..3fec7da4 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java @@ -506,6 +506,14 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { btnLeftYear.setEnabled(selectedYear > firstYear); btnRightYear.setEnabled(selectedYear < lastYear); + if (selectedYear == firstYear && selectedYear == lastYear) { + btnLeftYear.setVisibility(View.GONE); + btnRightYear.setVisibility(View.GONE); + } else { + btnLeftYear.setVisibility(View.VISIBLE); + btnRightYear.setVisibility(View.VISIBLE); + } + // show monthly diagram if (prefs.getBoolean(String.valueOf(enableMonth.getId()), true)) { chartTop.setVisibility(View.VISIBLE); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index 0d702312..c95d586c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -182,6 +182,12 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { moveSubpageRight.setEnabled(selectedSubpageNr + 1 < subpageCount); subpageView.addView(moveSubpageRight); + if (subpageCount <= 1) { + subpageView.setVisibility(View.GONE); + } else { + subpageView.setVisibility(View.VISIBLE); + } + tableHeaderView.removeAllViews(); for (MeasurementView measurement : measurementsList) { diff --git a/android_app/app/src/main/res/layout/fragment_table.xml b/android_app/app/src/main/res/layout/fragment_table.xml index 7d3a523e..18fc4c6f 100644 --- a/android_app/app/src/main/res/layout/fragment_table.xml +++ b/android_app/app/src/main/res/layout/fragment_table.xml @@ -18,8 +18,9 @@ android:id="@+id/tableHeaderView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - + android:orientation="horizontal" + android:paddingBottom="5dp" + android:paddingTop="5dp">