Always show upload icon (#6022)

* 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

* set pending_upload_icon android visible level: visible and tool visible level: gone

* fix issue 5847, The upload icon is now set to always be visible, while the original code has been commented out and retained with a note for potential re-use in the future.

* refactor

Signed-off-by: parneet-guraya <[email protected]>

---------

Signed-off-by: parneet-guraya <[email protected]>
Co-authored-by: bxy379987 <[email protected]>
Co-authored-by: Nicolas Raoul <[email protected]>

Author: 3 people

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -46,7 +46,8 @@ public class ContributionController {
     private boolean isInAppCameraUpload;
     public LocationPermissionCallback locationPermissionCallback;
     private LocationPermissionsHelper locationPermissionsHelper;
-    LiveData<PagedList<Contribution>> failedAndPendingContributionList;
+    // Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+    // LiveData<PagedList<Contribution>> failedAndPendingContributionList;
     LiveData<PagedList<Contribution>> pendingContributionList;
     LiveData<PagedList<Contribution>> failedContributionList;
 
@@ -383,21 +384,22 @@ void getFailedContributions() {
     }
 
     /**
+     * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
      * Fetches the contributions with the state "IN_PROGRESS", "QUEUED", "PAUSED" and "FAILED" and
      * then it populates the `failedAndPendingContributionList`.
      **/
-    void getFailedAndPendingContributions() {
-        final PagedList.Config pagedListConfig =
-            (new PagedList.Config.Builder())
-                .setPrefetchDistance(50)
-                .setPageSize(10).build();
-        Factory<Integer, Contribution> factory;
-        factory = repository.fetchContributionsWithStates(
-            Arrays.asList(Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
-                Contribution.STATE_PAUSED, Contribution.STATE_FAILED));
-
-        LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
-            pagedListConfig);
-        failedAndPendingContributionList = livePagedListBuilder.build();
-    }
+//    void getFailedAndPendingContributions() {
+//        final PagedList.Config pagedListConfig =
+//            (new PagedList.Config.Builder())
+//                .setPrefetchDistance(50)
+//                .setPageSize(10).build();
+//        Factory<Integer, Contribution> factory;
+//        factory = repository.fetchContributionsWithStates(
+//            Arrays.asList(Contribution.STATE_IN_PROGRESS, Contribution.STATE_QUEUED,
+//                Contribution.STATE_PAUSED, Contribution.STATE_FAILED));
+//
+//        LivePagedListBuilder livePagedListBuilder = new LivePagedListBuilder(factory,
+//            pagedListConfig);
+//        failedAndPendingContributionList = livePagedListBuilder.build();
+//    }
 }

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

@@ -303,16 +303,17 @@ public void setNotificationCount() {
     }
 
     /**
+     * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
      * 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.
@@ -531,7 +532,8 @@ public void onResume() {
             if (!isUserProfile) {
                 setNotificationCount();
                 fetchCampaigns();
-                setUploadIconVisibility();
+                // Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
+                // setUploadIconVisibility();
                 setUploadIconCount();
             }
         }
@@ -757,19 +759,18 @@ public void updateErrorIcon(int errorCount) {
     }
 
     /**
-     * Updates the visibility of the pending uploads ImageView based on the given count.
-     *
+     * Temporarily disabled, see issue [https://github.com/commons-app/apps-android-commons/issues/5847]
      * @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

app/src/main/res/layout/pending_uploads_icon.xml

@@ -14,10 +14,10 @@
       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"
+      android:visibility="visible"
       app:srcCompat="?attr/upload_icon_drawable" />
 
     <TextView