From 9707b4310bb450a78fe08b4c716f3d4feb26b172 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Fri, 7 Sep 2018 21:22:19 +0300 Subject: [PATCH] Make number of uploads visible if contribution list is visible and number of uploads is uploaded. Progress bar is visible if contribution list is visible and number of uploads are uploading. Both invisible if Media Details Fragment is visible --- .../contributions/ContributionsFragment.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 ef90c87a2..7b5f0aaee 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 @@ -47,6 +47,7 @@ import fr.free.nrw.commons.notification.Notification; import fr.free.nrw.commons.notification.NotificationController; import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.upload.UploadService; +import fr.free.nrw.commons.utils.ContributionListViewUtils; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; @@ -163,6 +164,8 @@ 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); } /** @@ -184,6 +187,10 @@ public class ContributionsFragment transaction.addToBackStack(MEDIA_DETAIL_PAGER_FRAGMENT_TAG); transaction.commit(); getChildFragmentManager().executePendingTransactions(); + + // Make number of uploads invisible when Media Details Activity is visible + ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true); + } /** @@ -368,11 +375,11 @@ public class ContributionsFragment private void setUploadCount() { if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) { // Means Media Details Fragment is active - // TODO: Neslihan ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true); + ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true); } else { // Means Contribution List Fragment is visible to user - // TODO: Neslihan ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, false); + ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, false); } compositeDisposable.add(mediaWikiApi .getUploadCount(((ContributionsActivity)getActivity()).sessionManager.getCurrentAccount().name) @@ -395,11 +402,11 @@ public class ContributionsFragment uploadCount, uploadCount)); if (getChildFragmentManager().findFragmentByTag(MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) { // Means Media Details Fragment is active - // TODO: Neslihan ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true); + ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,false, true); } else { // Means Contribution List Fragment is visible to user - // TODO: Neslihan ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false); + ContributionListViewUtils.setIndicatorVisibility(numberOfUploads, numberOfUploadsProgressBar,true, false); } }