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

Remove icon from parameters

Browse source
This commit is contained in:
PavelRatushny 2017-11-22 18:33:13 +02:00
parent 204b6f8310
commit ec80872974
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -436,7 +436,7 @@ public abstract class MenuController extends BaseMenuController {
return true; return true;
} }
protected Drawable getShowOnTopBarIcon() { public Drawable getShowOnTopBarIcon() {
if (showOnTopBarIcon == null) { if (showOnTopBarIcon == null) {
IconsCache ic = getMapActivity().getMyApplication().getIconsCache(); IconsCache ic = getMapActivity().getMyApplication().getIconsCache();
Drawable background = ic.getIcon(R.drawable.ic_action_device_top, Drawable background = ic.getIcon(R.drawable.ic_action_device_top,

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java
View file

@ -33,7 +33,7 @@ public class FavouritePointMenuController extends MenuController {
final MapMarker mapMarker = markersHelper.getMapMarker(fav); final MapMarker mapMarker = markersHelper.getMapMarker(fav);
if (mapMarker != null) { if (mapMarker != null) {
MapMarkerMenuController.createMarkerButtons(this, mapActivity, mapMarker, getShowOnTopBarIcon()); MapMarkerMenuController.createMarkerButtons(this, mapActivity, mapMarker);
} }
} }

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
View file

@ -22,7 +22,7 @@ public class MapMarkerMenuController extends MenuController {
super(new MenuBuilder(mapActivity), pointDescription, mapActivity); super(new MenuBuilder(mapActivity), pointDescription, mapActivity);
this.mapMarker = mapMarker; this.mapMarker = mapMarker;
builder.setShowNearestWiki(true); builder.setShowNearestWiki(true);
createMarkerButtons(this, mapActivity, mapMarker, getShowOnTopBarIcon()); createMarkerButtons(this, mapActivity, mapMarker);
} }
@Override @Override
@ -76,7 +76,7 @@ public class MapMarkerMenuController extends MenuController {
return R.string.rename_marker; return R.string.rename_marker;
} }
public static void createMarkerButtons(MenuController menuController, final MapActivity mapActivity, final MapMarker mapMarker, Drawable leftIcon) { public static void createMarkerButtons(MenuController menuController, final MapActivity mapActivity, final MapMarker mapMarker) {
final MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper(); final MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper();
TitleButtonController leftTitleButtonController = menuController.new TitleButtonController() { TitleButtonController leftTitleButtonController = menuController.new TitleButtonController() {
@ -99,7 +99,7 @@ public class MapMarkerMenuController extends MenuController {
} }
}; };
leftSubtitleButtonController.caption = mapActivity.getString(R.string.show_on_top_bar); leftSubtitleButtonController.caption = mapActivity.getString(R.string.show_on_top_bar);
leftSubtitleButtonController.leftIcon = leftIcon; leftSubtitleButtonController.leftIcon = menuController.getShowOnTopBarIcon();
menuController.setLeftSubtitleButtonController(leftSubtitleButtonController); menuController.setLeftSubtitleButtonController(leftSubtitleButtonController);
} }
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java
View file

@ -28,7 +28,7 @@ public class WptPtMenuController extends MenuController {
final MapMarker mapMarker = markersHelper.getMapMarker(wpt); final MapMarker mapMarker = markersHelper.getMapMarker(wpt);
if (mapMarker != null) { if (mapMarker != null) {
MapMarkerMenuController.createMarkerButtons(this, mapActivity, mapMarker, getShowOnTopBarIcon()); MapMarkerMenuController.createMarkerButtons(this, mapActivity, mapMarker);
} }
} }