mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Resolves #5445 highlighting nearest place on clicking home nearby banner (#5453)

Browse source 
* Highlighted nearest place when user clicks on home nearby banner

* Fixed incorrect behaviour of home nearby banner on being clicked

* Fixing failure of unit test cases

* spacing

* indentation

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Shashwat Kedia 2024-01-19 10:46:36 +05:30 • committed by GitHub
parent b7323d0913
commit cbf022d2f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 89 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -463,6 +463,13 @@ public class ContributionsFragment
if (mediaDetailPagerFragment == null && !isUserProfile) {
if (store.getBoolean("displayNearbyCardView", true)) {
checkPermissionsAndShowNearbyCardView();
// Calling nearby card to keep showing it even when user clicks on it and comes back
try {
updateClosestNearbyCardViewInfo();
} catch (Exception e) {
Timber.e(e);
}
if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
nearbyNotificationCardView.setVisibility(View.VISIBLE);
}

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

@ -279,6 +279,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private GeoPoint lastMapFocus;
private NearbyParentFragmentInstanceReadyCallback nearbyParentFragmentInstanceReadyCallback;
private boolean isAdvancedQueryFragmentVisible = false;
private Place nearestPlace;
private ActivityResultLauncher<String[]> inAppCameraLocationPermissionLauncher = registerForActivityResult(
new ActivityResultContracts.RequestMultiplePermissions(),
new ActivityResultCallback<Map<String, Boolean>>() {
@ -990,7 +991,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
/**
* Centers the map in nearby fragment to a given place
* Centers the map in nearby fragment to a given place and updates nearestPlace
*
* @param place is new center of the map
*/
@ -1000,6 +1001,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
final double cameraShift;
if (null != place) {
lastPlaceToCenter = place;
nearestPlace = place;
}
if (null != lastPlaceToCenter) {
@ -1626,7 +1628,34 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
addMarkerToMap(place, isBookmarked);
}
/**
* Highlights nearest place when user clicks on home nearby banner
*
* @param nearestPlace nearest place, which has to be highlighted
*/
private void highlightNearestPlace(Place nearestPlace) {
passInfoToSheet(nearestPlace);
hideBottomSheet();
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
}
/**
* Returns drawable of marker icon for given place
*
* @param place where marker is to be added
* @param isBookmarked true if place is bookmarked
* @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 (place.isMonument()) {
return R.drawable.ic_custom_map_marker_monuments;
} else if (!place.pic.trim().isEmpty()) {