From 8cf57d17c6acc8514f9e6e6256a2d9db3dd6d122 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Sat, 8 Sep 2018 11:10:44 +0200 Subject: [PATCH] Display a notice when the user does not belong to any group. --- .../fragments/groups/UserGroupsFragment.java | 26 ++++++++++++++----- .../main/res/layout/fragment_user_groups.xml | 13 ++++++++++ app/src/main/res/values-fr/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/groups/UserGroupsFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/groups/UserGroupsFragment.java index 350e171..d1f0f25 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/groups/UserGroupsFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/groups/UserGroupsFragment.java @@ -12,6 +12,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; +import android.widget.TextView; import android.widget.Toast; import org.communiquons.android.comunic.client.R; @@ -34,6 +35,7 @@ public class UserGroupsFragment extends AbstractGroupFragment { */ private ProgressBar mProgressBar; private RecyclerView mGroupsView; + private TextView mNoGroupNotice; /** * User groups @@ -58,8 +60,10 @@ public class UserGroupsFragment extends AbstractGroupFragment { //Get views mGroupsView = view.findViewById(R.id.groups_list); mProgressBar = view.findViewById(R.id.progressBar); + mNoGroupNotice = view.findViewById(R.id.noGroupNotice); - setProgressBarVisiblity(true); + setProgressBarVisibility(true); + setNoGroupNoticeVisibility(false); } @Override @@ -77,7 +81,7 @@ public class UserGroupsFragment extends AbstractGroupFragment { */ private void getGroupsList(){ - setProgressBarVisiblity(true); + setProgressBarVisibility(true); getTasksManager().unsetSpecificTasks(GetUserGroupsTask.class); GetUserGroupsTask getUserGroupsTask = new GetUserGroupsTask(getActivity()); @@ -98,7 +102,7 @@ public class UserGroupsFragment extends AbstractGroupFragment { */ private void getGroupsListCallback(@Nullable ArrayMap list){ - setProgressBarVisiblity(false); + setProgressBarVisibility(false); if(list == null){ Toast.makeText(getActivity(), R.string.err_get_user_groups, Toast.LENGTH_SHORT).show(); @@ -114,7 +118,7 @@ public class UserGroupsFragment extends AbstractGroupFragment { */ private void displayGroupsList(){ - setProgressBarVisiblity(false); + setProgressBarVisibility(false); mGroupsAdapter = new GroupsListAdapter(getActivity()); mGroupsAdapter.setList(new ArrayList<>(mGroupsList.values())); @@ -124,14 +128,24 @@ public class UserGroupsFragment extends AbstractGroupFragment { mGroupsView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); + setNoGroupNoticeVisibility(mGroupsList.size() == 0); } /** * Update (set) progressbar visibility * - * @param visible Visibility level of the progress bar + * @param visible Visibility of the progress bar */ - private void setProgressBarVisiblity(boolean visible){ + private void setProgressBarVisibility(boolean visible){ mProgressBar.setVisibility(visible ? View.VISIBLE : View.GONE); } + + /** + * Update no group notice visibility + * + * @param visible The visibility of the notice + */ + private void setNoGroupNoticeVisibility(boolean visible){ + mNoGroupNotice.setVisibility(visible ? View.VISIBLE : View.GONE); + } } diff --git a/app/src/main/res/layout/fragment_user_groups.xml b/app/src/main/res/layout/fragment_user_groups.xml index 6b875cd..ea81bcf 100644 --- a/app/src/main/res/layout/fragment_user_groups.xml +++ b/app/src/main/res/layout/fragment_user_groups.xml @@ -30,4 +30,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c4dfdba..24e52e8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -297,4 +297,7 @@ Répondre Une erreur a survenue lors de l\'annulation de votre réponse au sondage ! Une erreur a survenue lors de l\'envoi de votre réponse au sondage ! + Mes groupes + Une erreur a survenu lors de la récupération de vos groupes ! + Vous n\'avez aucun groupe pour le moment. \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7494200..b1c0525 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -298,4 +298,5 @@ Could not send response to the server! My groups Could not get the groups of the user! + You do not have any group yet.