Fixes commons-app#3720: None of the filters work on Nearby list (commons-app#3723)

Author: VitalyVPinchuk

app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java

@@ -0,0 +1,57 @@
+package fr.free.nrw.commons.nearby;
+
+
+import androidx.fragment.app.Fragment;
+
+import com.pedrogomez.renderers.ListAdapteeCollection;
+import com.pedrogomez.renderers.RVRendererAdapter;
+import com.pedrogomez.renderers.RendererBuilder;
+
+import java.util.Collections;
+import java.util.List;
+
+import fr.free.nrw.commons.contributions.ContributionController;
+
+public class NearbyAdapterFactory {
+
+    private Fragment fragment;
+    private ContributionController controller;
+
+    public NearbyAdapterFactory(Fragment fragment, ContributionController controller) {
+        this.fragment = fragment;
+        this.controller = controller;
+    }
+
+    public RVRendererAdapter<Place> create(List<Place> placeList) {
+        return create(placeList, null);
+    }
+
+    public RVRendererAdapter<Place> create(
+            List<Place> placeList,
+            PlaceRenderer.OnBookmarkClick onBookmarkClick
+    ) {
+        RendererBuilder<Place> builder = new RendererBuilder<Place>()
+                .bind(Place.class, new PlaceRenderer(fragment, controller, onBookmarkClick));
+        ListAdapteeCollection<Place> collection = new ListAdapteeCollection<>(
+                placeList != null ? placeList : Collections.emptyList());
+        return new RVRendererAdapter<>(builder, collection);
+    }
+
+    public void updateAdapterData(List<Place> newPlaceList, RVRendererAdapter<Place> rendererAdapter) {
+        rendererAdapter.notifyDataSetChanged();
+        rendererAdapter.diffUpdate(newPlaceList);
+    }
+
+    public void clear(RVRendererAdapter<Place> rendererAdapter){
+        rendererAdapter.clear();
+    }
+
+    public void add(Place place, RVRendererAdapter<Place> rendererAdapter){
+        rendererAdapter.add(place);
+    }
+
+    public void update(RVRendererAdapter<Place> rendererAdapter){
+        rendererAdapter.notifyDataSetChanged();
+    }
+
+}

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -628,6 +628,18 @@ public void updateListFragment(List<Place> placeList) {
         adapterFactory.updateAdapterData(placeList, (RVRendererAdapter<Place>) rvNearbyList.getAdapter());
     }
 
+    public void clearNearbyList() {
+        adapterFactory.clear((RVRendererAdapter<Place>) rvNearbyList.getAdapter());
+    }
+
+    public void updateNearbyList() {
+        adapterFactory.update((RVRendererAdapter<Place>) rvNearbyList.getAdapter());
+    }
+
+    public void addPlaceToNearbyList(Place place) {
+        adapterFactory.add(place, (RVRendererAdapter<Place>) rvNearbyList.getAdapter());
+    }
+
     @Override
     public fr.free.nrw.commons.location.LatLng getLastLocation() {
         return lastKnownLocation;
@@ -1082,7 +1094,8 @@ public void updateMapMarkers(List<NearbyBaseMarker> nearbyBaseMarkers, Marker se
 
     @Override
     public void filterOutAllMarkers() {
-        hideAllMArkers();
+        hideAllMarkers();
+        updateNearbyList();
     }
 
     /**
@@ -1093,6 +1106,7 @@ public void displayAllMarkers() {
         for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
             updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
         }
+        updateNearbyList();
     }
 
     /**
@@ -1104,65 +1118,46 @@ public void displayAllMarkers() {
      * @param filterForAllNoneType true if we filter places with all none button
      */
     @Override
-    public void filterMarkersByLabels(List<Label> selectedLabels, boolean displayExists,
-                                      boolean displayNeedsPhoto,
-                                      boolean filterForPlaceState,
-                                      boolean filterForAllNoneType) {
-        if (selectedLabels.size() == 0 && filterForPlaceState) { // If nothing is selected, display all
-            // remove the previous markers before updating them
-            hideAllMArkers();
-            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
-                if (displayExists && displayNeedsPhoto) {
-                    // Exists and needs photo
-                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (displayExists && !displayNeedsPhoto) {
-                    // Exists and all included needs and doesn't needs photo
-                    if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (!displayExists && displayNeedsPhoto) {
-                    // All and only needs photo
-                    if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                        updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                    }
-                } else if (!displayExists && !displayNeedsPhoto) {
-                    // all
-                    updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                }
+    public void filterMarkersByLabels(List<Label> selectedLabels,
+        boolean displayExists,
+        boolean displayNeedsPhoto,
+        boolean filterForPlaceState,
+        boolean filterForAllNoneType) {
 
+        // Remove the previous markers before updating them
+        hideAllMarkers();
+
+        for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
+            Place place = markerPlaceGroup.getPlace();
+
+            // When label filter is engaged
+            // then compare it against place's label
+            if (selectedLabels != null && (selectedLabels.size() != 0 || !filterForPlaceState)
+                && !selectedLabels.contains(place.getLabel())) {
+                continue;
             }
-        } else {
-            // First remove all the markers
-            hideAllMArkers();
-            for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
-                for (Label label : selectedLabels) {
-                    if (markerPlaceGroup.getPlace().getLabel().toString().equals(label.toString())) {
-
-                        if (displayExists && displayNeedsPhoto) {
-                            // Exists and needs photo
-                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty() && markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (displayExists && !displayNeedsPhoto) {
-                            // Exists and all included needs and doesn't needs photo
-                            if (markerPlaceGroup.getPlace().destroyed.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (!displayExists && displayNeedsPhoto) {
-                            // All and only needs photo
-                            if (markerPlaceGroup.getPlace().pic.trim().isEmpty()) {
-                                updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                            }
-                        } else if (!displayExists && !displayNeedsPhoto) {
-                            // all
-                            updateMarker(markerPlaceGroup.getIsBookmarked(), markerPlaceGroup.getPlace(), NearbyController.currentLocation);
-                        }
-                    }
+
+            if (displayExists && displayNeedsPhoto) {
+                // Exists and needs photo
+                if (place.destroyed.trim().isEmpty() && place.pic.trim().isEmpty()) {
+                    updateMarker(markerPlaceGroup.getIsBookmarked(), place, NearbyController.currentLocation);
+                }
+            } else if (displayExists && !displayNeedsPhoto) {
+                // Exists and all included needs and doesn't needs photo
+                if (place.destroyed.trim().isEmpty()) {
+                    updateMarker(markerPlaceGroup.getIsBookmarked(), place, NearbyController.currentLocation);
                 }
+            } else if (!displayExists && displayNeedsPhoto) {
+                // All and only needs photo
+                if (place.pic.trim().isEmpty()) {
+                    updateMarker(markerPlaceGroup.getIsBookmarked(), place, NearbyController.currentLocation);
+                }
+            } else if (!displayExists && !displayNeedsPhoto) {
+                // all
+                updateMarker(markerPlaceGroup.getIsBookmarked(), place, NearbyController.currentLocation);
             }
         }
+        updateNearbyList();
     }
 
     @Override
@@ -1177,6 +1172,8 @@ public fr.free.nrw.commons.location.LatLng getCameraTarget() {
      * @param curLatLng current location
      */
     public void updateMarker(boolean isBookmarked, Place place, @Nullable fr.free.nrw.commons.location.LatLng curLatLng) {
+        addPlaceToNearbyList(place);
+
         VectorDrawableCompat vectorDrawable;
         if (isBookmarked) {
             vectorDrawable = VectorDrawableCompat.create(
@@ -1223,7 +1220,7 @@ public void updateMarker(boolean isBookmarked, Place place, @Nullable fr.free.nr
      * but it is transparent more than grey(as the name of the icon might suggest)
      * since grey icon may lead the users to believe that it is disabled or prohibited contribution
      */
-    private void hideAllMArkers() {
+    private void hideAllMarkers() {
         VectorDrawableCompat vectorDrawable;
         vectorDrawable = VectorDrawableCompat.create(
                 getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme());
@@ -1234,6 +1231,7 @@ private void hideAllMArkers() {
             }
         }
         addCurrentLocationMarker(NearbyController.currentLocation);
+        clearNearbyList();
     }
 
     private void addNearbyMarkersToMapBoxMap(List<NearbyBaseMarker> nearbyBaseMarkers, Marker selectedMarker) {