mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-06 17:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

StationContextMenu: remove support for specific external maps apps

Browse source 
Just support the `geo:` URI scheme, it seems to work good enough.
This commit is contained in:
Andreas Schildbach 2022-06-15 20:03:43 +02:00
parent 286c375b3a
commit 1cecd76d6d
4 changed files with 12 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

20
oeffi/res/menu/station_map_context.xml
View file

@ -3,24 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/station_map_context_google_maps"
android:id="@+id/station_map_context_maps"
android:orderInCategory="1"
android:title="@string/map_dialog_google_maps" />
<item
android:id="@+id/station_map_context_amazon_maps"
android:orderInCategory="1"
android:title="@string/map_dialog_amazon_maps" />
<item
android:id="@+id/station_map_context_openstreetmap"
android:orderInCategory="1"
android:title="@string/map_dialog_openstreetmap" />
<item
android:id="@+id/station_map_context_google_street_view"
android:orderInCategory="1"
android:title="@string/map_dialog_google_street_view" />
<item
android:id="@+id/station_map_context_google_navigation"
android:orderInCategory="1"
android:title="@string/map_dialog_google_navigation" />
android:title="@string/map_dialog_maps" />
</menu>

6
oeffi/res/values-de/select_map.xml
View file

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="map_dialog_google_maps">Google Maps</string>
<string name="map_dialog_amazon_maps">Amazon Maps</string>
<string name="map_dialog_openstreetmap">OpenStreetMap</string>
<string name="map_dialog_google_street_view">Street View</string>
<string name="map_dialog_google_navigation">Navigation für Fußgänger</string>
<string name="map_dialog_maps">externe Karte</string>
</resources>

6
oeffi/res/values/select_map.xml
View file

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="map_dialog_google_maps">Google Maps</string>
<string name="map_dialog_amazon_maps">Amazon Maps</string>
<string name="map_dialog_openstreetmap">OpenStreetMap</string>
<string name="map_dialog_google_street_view">Street View</string>
<string name="map_dialog_google_navigation">Walking Directions</string>
<string name="map_dialog_maps">External map</string>
</resources>

57
oeffi/src/de/schildbach/oeffi/stations/StationContextMenu.java
View file

@ -22,7 +22,6 @@ import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.view.LayoutInflater;
@ -121,54 +120,23 @@ public class StationContextMenu extends PopupMenu {
public static void prepareMapMenu(final Context context, final Menu menu, final NetworkId network,
final Location location) {
new MenuInflater(context).inflate(R.menu.station_map_context, menu);
final MenuItem googleMapsItem = menu.findItem(R.id.station_map_context_google_maps);
final MenuItem amazonMapsItem = menu.findItem(R.id.station_map_context_amazon_maps);
final MenuItem openStreetMapItem = menu.findItem(R.id.station_map_context_openstreetmap);
final MenuItem googleStreetViewItem = menu.findItem(R.id.station_map_context_google_street_view);
final MenuItem googleNavigationItem = menu.findItem(R.id.station_map_context_google_navigation);
final MenuItem mapsItem = menu.findItem(R.id.station_map_context_maps);
if (location.hasCoord()) {
final double lat = location.getLatAsDouble();
final double lon = location.getLonAsDouble();
final String name = location.name;
final Intent googleMapsIntent = new Intent(Intent.ACTION_VIEW,
final Intent mapsIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "geo:%.6f,%.6f?q=%.6f,%.6f%s", lat, lon, lat, lon,
name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : "")));
googleMapsIntent.setComponent(
new ComponentName("com.google.android.apps.maps", "com.google.android.maps.MapsActivity"));
prepareMapMenuItem(context, googleMapsItem, googleMapsIntent);
final Intent amazonMapsIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "geo:%.6f,%.6f?q=%.6f,%.6f%s", lat, lon, lat, lon,
name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : "")));
amazonMapsIntent.setComponent(new ComponentName("com.amazon.geo.client.maps",
"com.amazon.geo.client.renderer.MapsAppActivityDuke"));
prepareMapMenuItem(context, amazonMapsItem, amazonMapsIntent);
final Intent openStreetMapIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "osmand.geo:%.6f,%.6f?q=%.6f,%.6f%s", lat, lon, lat, lon,
name != null ? '(' + URLEncoder.encode(name.replaceAll("[()]", "")) + ')' : "")));
prepareMapMenuItem(context, openStreetMapItem, openStreetMapIntent);
final Intent googleStreetViewIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "google.streetview:cbll=%.6f,%.6f", lat, lon)));
googleStreetViewIntent
.setComponent(new ComponentName("com.google.android.street", "com.google.android.street.Street"));
prepareMapMenuItem(context, googleStreetViewItem, googleStreetViewIntent);
final Intent googleNavigationIntent = new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Locale.ENGLISH, "google.navigation:ll=%.6f,%.6f&title=%s&mode=w", lat, lon,
name != null ? URLEncoder.encode(name) : "")));
googleNavigationIntent.setComponent(new ComponentName("com.google.android.apps.maps",
"com.google.android.maps.driveabout.app.NavigationActivity"));
prepareMapMenuItem(context, googleNavigationItem, googleNavigationIntent);
mapsItem.setOnMenuItemClickListener(item -> {
context.startActivity(mapsIntent);
return true;
});
mapsItem.setVisible(true);
} else {
googleMapsItem.setVisible(false);
amazonMapsItem.setVisible(false);
openStreetMapItem.setVisible(false);
googleStreetViewItem.setVisible(false);
googleNavigationItem.setVisible(false);
mapsItem.setVisible(false);
}
final ContentResolver contentResolver = context.getContentResolver();
@ -192,13 +160,4 @@ public class StationContextMenu extends PopupMenu {
stationsCursor.close();
}
}
private static void prepareMapMenuItem(final Context context, final MenuItem item, final Intent intent) {
final PackageManager pm = context.getPackageManager();
item.setVisible(pm.resolveActivity(intent, 0) != null);
item.setOnMenuItemClickListener(item1 -> {
context.startActivity(intent);
return true;
});
}
}