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

Improved Map Marker Visibility Based on App Theme (#5744)

Browse source 
* Update map markers

* Modify code to use different map marker for themes

* Update map markers for bookmarked

* Add 2 tests

---------

Co-authored-by: Giannis Karyotakis <110292528+karyotakisg@users.noreply.github.com>
This commit is contained in:
Evangelos Talos 2024-06-09 15:07:02 -04:00 • committed by GitHub
parent bde09072fb
commit 22dd69cabb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 225 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapController.java
View file

@ -143,7 +143,7 @@ public class ExploreMapController extends MapController {
VectorDrawableCompat vectorDrawable = null;
try {
vectorDrawable = VectorDrawableCompat.create(
context.getResources(), R.drawable.ic_custom_map_marker, context.getTheme());
context.getResources(), R.drawable.ic_custom_map_marker_dark, context.getTheme());
} catch (Resources.NotFoundException e) {
// ignore when running tests.

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

@ -68,7 +68,6 @@ import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LocationPermissionsHelper;
import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.location.LocationUpdateListener;
import fr.free.nrw.commons.nearby.CheckBoxTriStates;
@ -1731,9 +1730,10 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
*
* @param place where marker is to be added
* @param isBookmarked true if place is bookmarked
* @param isDarkTheme true if app uses dark theme
* @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 , Boolean isDarkTheme) {
if (nearestPlace != null) {
if (place.name.equals(nearestPlace.name)) {
// Highlight nearest place only when user clicks on the home nearby banner
@ -1746,17 +1746,31 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
if (place.isMonument()) {
return R.drawable.ic_custom_map_marker_monuments;
} else if (!place.pic.trim().isEmpty()) {
return (isBookmarked ?
R.drawable.ic_custom_map_marker_green_bookmarked :
R.drawable.ic_custom_map_marker_green);
if (isDarkTheme) { //different icon for light and dark theme
return (isBookmarked ?
R.drawable.ic_custom_map_marker_green_bookmarked_dark :
R.drawable.ic_custom_map_marker_green_dark);
}
else{
return (isBookmarked ?
R.drawable.ic_custom_map_marker_green_bookmarked_dark :
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
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_blue_bookmarked :
R.drawable.ic_custom_map_marker);
if (isDarkTheme) { //different icon for light and dark theme
return (isBookmarked ?
R.drawable.ic_custom_map_marker_blue_bookmarked_dark :
R.drawable.ic_custom_map_marker_dark);
}
else{
return (isBookmarked ?
R.drawable.ic_custom_map_marker_blue_bookmarked_dark :
R.drawable.ic_custom_map_marker);
}
}
}
@ -1768,7 +1782,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
*/
private void addMarkerToMap(Place place, Boolean isBookMarked) {
ArrayList<OverlayItem> items = new ArrayList<>();
Drawable icon = ContextCompat.getDrawable(getContext(), getIconFor(place, isBookMarked));
Drawable icon = ContextCompat.getDrawable(getContext(), getIconFor(place, isBookMarked, isDarkTheme));
GeoPoint point = new GeoPoint(place.location.getLatitude(), place.location.getLongitude());
OverlayItem item = new OverlayItem(place.name,
containsParentheses(place.getLongDescription()) ? getTextBetweenParentheses(
@ -1811,7 +1825,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
ArrayList<OverlayItem> items = new ArrayList<>();
for (int i = 0; i < nearbyBaseMarkers.size(); i++) {
Drawable icon = ContextCompat.getDrawable(getContext(),
getIconFor(nearbyBaseMarkers.get(i).getPlace(), false));
getIconFor(nearbyBaseMarkers.get(i).getPlace(), false, isDarkTheme));
GeoPoint point = new GeoPoint(
nearbyBaseMarkers.get(i).getPlace().location.getLatitude(),
nearbyBaseMarkers.get(i).getPlace().location.getLongitude());