Fix modification on bottom sheet's data when coming from Nearby Banne…

…r and clicked on other pins (#5937) * refactor getIconFor method and remove call to highlightNearestPlace() It ensures single responsibility on getIconFor method * refactor and fix icon issue when coming from nearby banner --------- Co-authored-by: Nicolas Raoul <[email protected]>
commons-app · Nov 28, 2024 · 794dbb8 · 794dbb8
1 parent 0c969c3
commit 794dbb8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -965,6 +965,7 @@ public void centerMapToPlace(@Nullable final Place place) {
                 lastPlaceToCenter.location.getLatitude() - cameraShift,
                 lastPlaceToCenter.getLocation().getLongitude(), 0));
         }
+        highlightNearestPlace(place);
     }
 
 
@@ -2001,7 +2002,8 @@ public void updateMarker(final boolean isBookmarked, final Place place,
      *
      * @param nearestPlace nearest place, which has to be highlighted
      */
-    private void highlightNearestPlace(Place nearestPlace) {
+    private void highlightNearestPlace(final Place nearestPlace) {
+        binding.bottomSheetDetails.icon.setVisibility(View.VISIBLE);
         passInfoToSheet(nearestPlace);
         hideBottomSheet();
         bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
@@ -2015,32 +2017,37 @@ private void highlightNearestPlace(Place nearestPlace) {
      * @return returns the drawable of marker according to the place information
      */
     private @DrawableRes int getIconFor(Place place, Boolean isBookmarked) {
-        if (nearestPlace != null) {
-            if (place.name.equals(nearestPlace.name)) {
-                // Highlight nearest place only when user clicks on the home nearby banner
-                highlightNearestPlace(place);
-                return (isBookmarked ?
-                    R.drawable.ic_custom_map_marker_purple_bookmarked :
-                    R.drawable.ic_custom_map_marker_purple);
-            }
+        if (nearestPlace != null && place.name.equals(nearestPlace.name)) {
+            // Highlight nearest place only when user clicks on the home nearby banner
+//            highlightNearestPlace(place);
+            return (isBookmarked ?
+                R.drawable.ic_custom_map_marker_purple_bookmarked :
+                R.drawable.ic_custom_map_marker_purple
+            );
         }
+
         if (place.isMonument()) {
             return R.drawable.ic_custom_map_marker_monuments;
-        } else if (!place.pic.trim().isEmpty()) {
+        }
+        if (!place.pic.trim().isEmpty()) {
             return (isBookmarked ?
                 R.drawable.ic_custom_map_marker_green_bookmarked :
-                R.drawable.ic_custom_map_marker_green);
-        } else if (!place.exists) { // Means that the topic of the Wikidata item does not exist in the real world anymore, for instance it is a past event, or a place that was destroyed
+                R.drawable.ic_custom_map_marker_green
+            );
+        }
+        if (!place.exists) { // Means that the topic of the Wikidata item does not exist in the real world anymore, for instance it is a past event, or a place that was destroyed
             return (R.drawable.ic_clear_black_24dp);
-        }else if (place.name == "") {
+        }
+        if (place.name.isEmpty()) {
             return (isBookmarked ?
                 R.drawable.ic_custom_map_marker_grey_bookmarked :
-                R.drawable.ic_custom_map_marker_grey);
-        } else {
-            return (isBookmarked ?
-                R.drawable.ic_custom_map_marker_red_bookmarked :
-                R.drawable.ic_custom_map_marker_red);
+                R.drawable.ic_custom_map_marker_grey
+            );
         }
+        return (isBookmarked ?
+            R.drawable.ic_custom_map_marker_red_bookmarked :
+            R.drawable.ic_custom_map_marker_red
+        );
     }
 
     /**

diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml
@@ -32,7 +32,7 @@
           android:layout_width="@dimen/dimen_40"
           android:layout_height="@dimen/dimen_40"
           android:layout_marginLeft="@dimen/standard_gap"
-          android:visibility="gone"></ImageView>
+          android:visibility="gone" />
 
         <LinearLayout
           android:id="@+id/wikiDataLl"