Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make order of navigation actions consistent: Directions / Set-as-dest-or-WP / Show-on-map

Browse source
This commit is contained in:
sonora 2013-07-03 01:55:44 +02:00
parent ba14df9110
commit b09392ca7a
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -1253,24 +1253,6 @@ public class MapActivityActions implements DialogProvider {
public static void createDirectionsActions(final QuickAction qa , final LatLon location, final Object obj, final String name,
final int z, final Activity activity, final boolean saveHistory, final OnClickListener onShow, boolean favorite) {
ActionItem showOnMap = new ActionItem();
final OsmandApplication app = ((OsmandApplication) activity.getApplication());
final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
showOnMap.setIcon(activity.getResources().getDrawable(R.drawable.ic_action_marker_light));
showOnMap.setTitle(activity.getString(R.string.show_poi_on_map));
showOnMap.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (onShow != null) {
onShow.onClick(v);
}
app.getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), z, saveHistory ? name : null, name,
obj); //$NON-NLS-1$
MapActivity.launchMapActivityMoveToTop(activity);
qa.dismiss();
}
});
qa.addActionItem(showOnMap);
ActionItem setAsDestination = new ActionItem();
setAsDestination.setIcon(activity.getResources().getDrawable(R.drawable.ic_action_gdirections_light));
setAsDestination.setTitle(activity.getString(R.string.get_directions));
@ -1308,6 +1290,26 @@ public class MapActivityActions implements DialogProvider {
}
});
qa.addActionItem(intermediate);
ActionItem showOnMap = new ActionItem();
final OsmandApplication app = ((OsmandApplication) activity.getApplication());
final TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
showOnMap.setIcon(activity.getResources().getDrawable(R.drawable.ic_action_marker_light));
showOnMap.setTitle(activity.getString(R.string.show_poi_on_map));
showOnMap.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (onShow != null) {
onShow.onClick(v);
}
app.getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), z, saveHistory ? name : null, name,
obj); //$NON-NLS-1$
MapActivity.launchMapActivityMoveToTop(activity);
qa.dismiss();
}
});
qa.addActionItem(showOnMap);
if (favorite) {
ActionItem addToFavorite = new ActionItem();
addToFavorite.setIcon(activity.getResources().getDrawable(R.drawable.ic_action_fav_light));