diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index a71ee262d..c61d2e879 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -83,6 +83,11 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
setTabAndViewPagerSynchronisation();
}
+ /**
+ * Adds number of uploads next to tab text "Contributions" then it will look like
+ * "Contributions (NUMBER)"
+ * @param uploadCount
+ */
public void setNumOfUploads(int uploadCount) {
tabLayout.getTabAt(0).setText(getResources().getString(R.string.contributions_fragment) +" "+ getResources()
.getQuantityString(R.plurals.contributions_subtitle,
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
index 88f7b48e3..702604c9f 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -81,8 +81,6 @@ public class ContributionsFragment
private boolean isUploadServiceConnected;
private CompositeDisposable compositeDisposable = new CompositeDisposable();
CountDownLatch waitForContributionsListFragment = new CountDownLatch(1);
- public TextView numberOfUploads;
- public ProgressBar numberOfUploadsProgressBar;
private ContributionsListFragment contributionsListFragment;
private MediaDetailPagerFragment mediaDetailPagerFragment;
@@ -112,11 +110,6 @@ public class ContributionsFragment
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_contributions, container, false);
- numberOfUploads = view.findViewById(R.id.numOfUploads);
-
- numberOfUploadsProgressBar = view.findViewById(R.id.progressBar);
- numberOfUploadsProgressBar.setVisibility(View.VISIBLE);
- numberOfUploadsProgressBar.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(getActivity(), R.color.white), PorterDuff.Mode.SRC_IN );
if (savedInstanceState != null) {
mediaDetailPagerFragment = (MediaDetailPagerFragment)getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG);
@@ -164,8 +157,6 @@ public class ContributionsFragment
transaction.addToBackStack(CONTRIBUTION_LIST_FRAGMENT_TAG);
transaction.commit();
getChildFragmentManager().executePendingTransactions();
- // Both should be visible and number of uploads are ready
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false);
}
/**
@@ -188,9 +179,6 @@ public class ContributionsFragment
transaction.commit();
getChildFragmentManager().executePendingTransactions();
- // Make number of uploads invisible when Media Details Activity is visible
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
-
}
/**
@@ -373,14 +361,7 @@ public class ContributionsFragment
@SuppressWarnings("ConstantConditions")
private void setUploadCount() {
- if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) {
- // Means Media Details Fragment is active
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
- } else {
- // Means Contribution List Fragment is visible to user
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, false);
- }
compositeDisposable.add(mediaWikiApi
.getUploadCount(((ContributionsActivity)getActivity()).sessionManager.getCurrentAccount().name)
.subscribeOn(Schedulers.io())
@@ -392,23 +373,12 @@ public class ContributionsFragment
private void displayUploadCount(Integer uploadCount) {
if (getActivity().isFinishing()
- || numberOfUploads == null
|| getResources() == null) {
return;
}
((ContributionsActivity)getActivity()).setNumOfUploads(uploadCount);
- numberOfUploads.setText(getResources()
- .getQuantityString(R.plurals.contributions_subtitle,
- uploadCount, uploadCount));
- if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) {
- // Means Media Details Fragment is active
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true);
- } else {
- // Means Contribution List Fragment is visible to user
- ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false);
- }
}
public void betaSetUploadCount(int betaUploadCount) {
diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml
index 9cf4dc7b6..056f71c96 100644
--- a/app/src/main/res/layout/fragment_contributions.xml
+++ b/app/src/main/res/layout/fragment_contributions.xml
@@ -28,32 +28,6 @@
-->
-
-
-
-
-
-
-
-
-