From 8e4833ec78e2ef0084e5553992ed8d4dedaa8791 Mon Sep 17 00:00:00 2001 From: bxy379987 Date: Sun, 27 Oct 2024 11:05:21 +1100 Subject: [PATCH] fix issue5847 as owner required: make the icon always visible and just adjust the count accordingly,comment the setVisibility method and make pending_upload_icon always visible --- .../contributions/ContributionsFragment.java | 34 +++++++++---------- .../main/res/layout/pending_uploads_icon.xml | 5 +-- 2 files changed, 20 insertions(+), 19 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 a840aa8e1..52ee4f2c1 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 @@ -310,13 +310,13 @@ public class ContributionsFragment * Sets the visibility of the upload icon based on the number of failed and pending * contributions. */ - public void setUploadIconVisibility() { - contributionController.getFailedAndPendingContributions(); - contributionController.failedAndPendingContributionList.observe(getViewLifecycleOwner(), - list -> { - updateUploadIcon(list.size()); - }); - } +// public void setUploadIconVisibility() { +// contributionController.getFailedAndPendingContributions(); +// contributionController.failedAndPendingContributionList.observe(getViewLifecycleOwner(), +// list -> { +// updateUploadIcon(list.size()); +// }); +// } /** * Sets the count for the upload icon based on the number of pending and failed contributions. @@ -535,7 +535,7 @@ public class ContributionsFragment if (!isUserProfile) { setNotificationCount(); fetchCampaigns(); - setUploadIconVisibility(); +// setUploadIconVisibility(); setUploadIconCount(); } } @@ -765,15 +765,15 @@ public class ContributionsFragment * * @param count The number of pending uploads. */ - public void updateUploadIcon(int count) { - if (pendingUploadsImageView != null) { - if (count != 0) { - pendingUploadsImageView.setVisibility(View.VISIBLE); - } else { - pendingUploadsImageView.setVisibility(View.GONE); - } - } - } +// public void updateUploadIcon(int count) { +// if (pendingUploadsImageView != null) { +// if (count != 0) { +// pendingUploadsImageView.setVisibility(View.VISIBLE); +// } else { +// pendingUploadsImageView.setVisibility(View.GONE); +// } +// } +// } /** * Replace whatever is in the current contributionsFragmentContainer view with diff --git a/app/src/main/res/layout/pending_uploads_icon.xml b/app/src/main/res/layout/pending_uploads_icon.xml index 717bbd3bf..28b6bea82 100644 --- a/app/src/main/res/layout/pending_uploads_icon.xml +++ b/app/src/main/res/layout/pending_uploads_icon.xml @@ -14,11 +14,12 @@ android:id="@+id/pending_uploads_image_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" android:layout_marginEnd="@dimen/activity_margin_horizontal" android:layout_marginRight="@dimen/activity_margin_horizontal" android:gravity="center" - app:srcCompat="?attr/upload_icon_drawable" /> + android:visibility="visible" + app:srcCompat="?attr/upload_icon_drawable" + tools:visibility="visible" />