diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e25b314..ea556b0b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,6 @@ - diff --git a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java index 42d50c88..4156a5ab 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/CollaboratorsFragment.java @@ -11,6 +11,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.GridView; +import android.widget.ProgressBar; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.adapters.CollaboratorsAdapter; @@ -26,6 +27,7 @@ import java.util.List; public class CollaboratorsFragment extends Fragment { + private ProgressBar mProgressBar; private CollaboratorsAdapter adapter; private GridView mGridView; private TextView noDataCollaborators; @@ -69,6 +71,8 @@ public class CollaboratorsFragment extends Fragment { final String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); noDataCollaborators = v.findViewById(R.id.noDataCollaborators); + mProgressBar = v.findViewById(R.id.progress_bar); + mGridView = v.findViewById(R.id.gridView); fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName); @@ -109,6 +113,7 @@ public class CollaboratorsFragment extends Fragment { mGridView.setAdapter(adapter); noDataCollaborators.setVisibility(View.VISIBLE); } + mProgressBar.setVisibility(View.GONE); } }); diff --git a/app/src/main/res/layout/fragment_branches.xml b/app/src/main/res/layout/fragment_branches.xml index 6b529726..11717de8 100644 --- a/app/src/main/res/layout/fragment_branches.xml +++ b/app/src/main/res/layout/fragment_branches.xml @@ -20,7 +20,7 @@ android:scrollbars="vertical" /> - - + + \ No newline at end of file