From 9aaa29eef47ea791237f13ac50aaf5b8c16aac1f Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sun, 26 Nov 2017 18:26:08 +0100 Subject: [PATCH] Hide user selector when there is only one user --- .../gui/fragments/OverviewFragment.java | 17 +++++++++++------ .../main/res/layout-large/fragment_overview.xml | 1 + .../src/main/res/layout/fragment_overview.xml | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java index a1058e1f..6b4dc187 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java @@ -74,6 +74,7 @@ import lecho.lib.hellocharts.view.PieChartView; public class OverviewFragment extends Fragment implements FragmentUpdateListener { private View overviewView; + private View userLineSeparator; private TextView txtTitleUser; private TextView txtTitleLastMeasurement; @@ -109,6 +110,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { overviewView = inflater.inflate(R.layout.fragment_overview, container, false); + userLineSeparator = overviewView.findViewById(R.id.userLineSeparator); context = overviewView.getContext(); @@ -207,7 +209,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener private void updateUserSelection() { - currentScaleUser = OpenScale.getInstance(getContext()).getSelectedScaleUser(); + currentScaleUser = OpenScale.getInstance(getContext()).getSelectedScaleUser(); userSelectedData = null; @@ -215,19 +217,22 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener ArrayList scaleUserList = OpenScale.getInstance(getContext()).getScaleUserList(); int posUser = 0; - int pos = 0; - for (ScaleUser scaleUser :scaleUserList) { + for (ScaleUser scaleUser : scaleUserList) { spinUserAdapter.add(scaleUser.user_name); if (scaleUser.id == currentScaleUser.id) { - posUser = pos; + posUser = spinUserAdapter.getCount() - 1; } - - pos++; } spinUser.setSelection(posUser, true); + + // Hide user selector when there is only one user + int visibility = spinUserAdapter.getCount() < 2 ? View.GONE : View.VISIBLE; + txtTitleUser.setVisibility(visibility); + spinUser.setVisibility(visibility); + userLineSeparator.setVisibility(visibility); } diff --git a/android_app/app/src/main/res/layout-large/fragment_overview.xml b/android_app/app/src/main/res/layout-large/fragment_overview.xml index 781186ac..501ff4dd 100644 --- a/android_app/app/src/main/res/layout-large/fragment_overview.xml +++ b/android_app/app/src/main/res/layout-large/fragment_overview.xml @@ -46,6 +46,7 @@