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

maps intent: preserve zoom and show red pin

Browse source
This commit is contained in:
savsch 2025-01-27 14:15:47 +05:30
parent 77bad3380c
commit 9f18df3904
5 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -148,13 +148,27 @@ public class Utils {
}
/**
* Util function to handle geo coordinates
* It no longer depends on google maps and any app capable of handling the map intent can handle it
* @param context
* @param latLng
* Util function to handle geo coordinates. It no longer depends on google maps and any app
* capable of handling the map intent can handle it
*
* @param context The context for launching intent
* @param latLng The latitude and longitude of the location
*/
public static void handleGeoCoordinates(Context context, LatLng latLng) {
Intent mapIntent = new Intent(Intent.ACTION_VIEW, latLng.getGmmIntentUri());
public static void handleGeoCoordinates(final Context context, final LatLng latLng) {
handleGeoCoordinates(context, latLng, 16);
}
/**
* Util function to handle geo coordinates with specified zoom level. It no longer depends on
* google maps and any app capable of handling the map intent can handle it
*
* @param context The context for launching intent
* @param latLng The latitude and longitude of the location
* @param zoomLevel The zoom level
*/
public static void handleGeoCoordinates(final Context context, final LatLng latLng,
final double zoomLevel) {
final Intent mapIntent = new Intent(Intent.ACTION_VIEW, latLng.getGmmIntentUri(zoomLevel));
if (mapIntent.resolveActivity(context.getPackageManager()) != null) {
context.startActivity(mapIntent);
} else {

5
app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
View file

@ -545,8 +545,9 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
* @param place Place of clicked nearby marker
*/
private void passInfoToSheet(final Place place) {
binding.bottomSheetDetailsBinding.directionsButton.setOnClickListener(view -> Utils.handleGeoCoordinates(getActivity(),
place.getLocation()));
binding.bottomSheetDetailsBinding.directionsButton.setOnClickListener(
view -> Utils.handleGeoCoordinates(getActivity(),
place.getLocation(), binding.mapView.getZoomLevelDouble()));
binding.bottomSheetDetailsBinding.commonsButton.setVisibility(place.hasCommonsLink() ? View.VISIBLE : View.GONE);
binding.bottomSheetDetailsBinding.commonsButton.setOnClickListener(

9
app/src/main/java/fr/free/nrw/commons/location/LatLng.kt
View file

@ -123,10 +123,13 @@ data class LatLng(
/**
* Gets a URI for a Google Maps intent at the location.
*
* @paraam zoom The zoom level
* @return URI for the intent
*/
fun getGmmIntentUri(): Uri {
return Uri.parse("geo:$latitude,$longitude?z=16")
}
fun getGmmIntentUri(zoom: Double): Uri = Uri.parse(
"geo:$latitude,$longitude?q=$latitude,$longitude&z=${zoom}"
)
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeDouble(latitude)

6
app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
View file

@ -430,7 +430,11 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
else -> null
}
position?.let { Utils.handleGeoCoordinates(this, it) }
position?.let {
mapView?.zoomLevelDouble?.let { zoomLevel ->
Utils.handleGeoCoordinates(this, it, zoomLevel)
} ?: Utils.handleGeoCoordinates(this, it)
}
}
/**

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

@ -2309,7 +2309,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
updateBookmarkButtonImage(selectedPlace);
break;
case R.drawable.ic_directions_black_24dp:
Utils.handleGeoCoordinates(this.getContext(), selectedPlace.getLocation());
Utils.handleGeoCoordinates(this.getContext(), selectedPlace.getLocation(),
binding.map.getZoomLevelDouble());
break;
case R.drawable.ic_wikidata_logo_24dp:
Utils.handleWebUrl(this.getContext(), selectedPlace.siteLinks.getWikidataLink());