mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-02 15:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor getIconFor method and remove call to highlightNearestPlace()

Browse source 
It ensures single responsibility on getIconFor method
This commit is contained in:
Rohit Verma 2024-11-17 18:40:58 +05:30
parent 248c7b0ceb
commit e15d17aa27
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -966,6 +966,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
lastPlaceToCenter.location.getLatitude() - cameraShift, lastPlaceToCenter.location.getLatitude() - cameraShift,
lastPlaceToCenter.getLocation().getLongitude(), 0)); lastPlaceToCenter.getLocation().getLongitude(), 0));
} }
highlightNearestPlace(place);
} }
@ -2002,7 +2003,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
* *
* @param nearestPlace nearest place, which has to be highlighted * @param nearestPlace nearest place, which has to be highlighted
*/ */
private void highlightNearestPlace(Place nearestPlace) { private void highlightNearestPlace(final Place nearestPlace) {
passInfoToSheet(nearestPlace); passInfoToSheet(nearestPlace);
hideBottomSheet(); hideBottomSheet();
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
@ -2016,32 +2017,37 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
* @return returns the drawable of marker according to the place information * @return returns the drawable of marker according to the place information
*/ */
private @DrawableRes int getIconFor(Place place, Boolean isBookmarked) { private @DrawableRes int getIconFor(Place place, Boolean isBookmarked) {
if (nearestPlace != null) { if (nearestPlace != null && place.name.equals(nearestPlace.name)) {
if (place.name.equals(nearestPlace.name)) { // Highlight nearest place only when user clicks on the home nearby banner
// Highlight nearest place only when user clicks on the home nearby banner // highlightNearestPlace(place);
highlightNearestPlace(place); return (isBookmarked ?
return (isBookmarked ? R.drawable.ic_custom_map_marker_purple_bookmarked :
R.drawable.ic_custom_map_marker_purple_bookmarked : R.drawable.ic_custom_map_marker_purple
R.drawable.ic_custom_map_marker_purple); );
}
} }
if (place.isMonument()) { if (place.isMonument()) {
return R.drawable.ic_custom_map_marker_monuments; return R.drawable.ic_custom_map_marker_monuments;
} else if (!place.pic.trim().isEmpty()) { }
if (!place.pic.trim().isEmpty()) {
return (isBookmarked ? return (isBookmarked ?
R.drawable.ic_custom_map_marker_green_bookmarked : R.drawable.ic_custom_map_marker_green_bookmarked :
R.drawable.ic_custom_map_marker_green); 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 );
}
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); return (R.drawable.ic_clear_black_24dp);
}else if (place.name == "") { }
if (place.name.isEmpty()) {
return (isBookmarked ? return (isBookmarked ?
R.drawable.ic_custom_map_marker_grey_bookmarked : R.drawable.ic_custom_map_marker_grey_bookmarked :
R.drawable.ic_custom_map_marker_grey); 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);
} }
return (isBookmarked ?
R.drawable.ic_custom_map_marker_red_bookmarked :
R.drawable.ic_custom_map_marker_red
);
} }
/** /**