diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuBuilder.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuBuilder.java index 1b213df41e..b241fbb808 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteMenuBuilder.java @@ -42,7 +42,7 @@ public class AudioVideoNoteMenuBuilder extends MenuBuilder { DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(view.getContext()); DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext()); Date date = new Date(recording.getFile().lastModified()); - buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date), + buildRow(view, R.drawable.ic_action_data, null, dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, null, false, 0, false, null, false); buildPlainMenuItems(view); diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java index 9d9347469c..ff4f0ab3ec 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java @@ -101,6 +101,7 @@ public class MenuBuilder { public class PlainMenuItem { private int iconId; + private String buttonText; private String text; private boolean needLinks; private boolean url; @@ -108,10 +109,11 @@ public class MenuBuilder { private CollapsableView collapsableView; private OnClickListener onClickListener; - public PlainMenuItem(int iconId, String text, boolean needLinks, boolean url, + public PlainMenuItem(int iconId, String buttonText, String text, boolean needLinks, boolean url, boolean collapsable, CollapsableView collapsableView, OnClickListener onClickListener) { this.iconId = iconId; + this.buttonText = buttonText; this.text = text; this.needLinks = needLinks; this.url = url; @@ -124,6 +126,10 @@ public class MenuBuilder { return iconId; } + public String getButtonText() { + return buttonText; + } + public String getText() { return text; } @@ -291,7 +297,7 @@ public class MenuBuilder { buildTitleRow(view); } if (showTransportRoutes()) { - buildRow(view, 0, app.getString(R.string.transport_Routes), 0, true, getCollapsableTransportStopRoutesView(view.getContext(), false), + buildRow(view, 0, null, app.getString(R.string.transport_Routes), 0, true, getCollapsableTransportStopRoutesView(view.getContext(), false), false, 0, false, null, true); } buildNearestWikiRow(view); @@ -326,7 +332,7 @@ public class MenuBuilder { protected void buildPlainMenuItems(View view) { for (PlainMenuItem item : plainMenuItems) { - buildRow(view, item.getIconId(), item.getText(), 0, item.collapsable, item.collapsableView, + buildRow(view, item.getIconId(), item.getButtonText(), item.getText(), 0, item.collapsable, item.collapsableView, item.isNeedLinks(), 0, item.isUrl(), item.getOnClickListener(), false); } } @@ -351,14 +357,14 @@ public class MenuBuilder { if (mapContextMenu != null) { String title = mapContextMenu.getTitleStr(); if (title.length() > TITLE_LIMIT) { - buildRow(view, R.drawable.ic_action_note_dark, title, 0, false, null, false, 0, false, null, false); + buildRow(view, R.drawable.ic_action_note_dark, null, title, 0, false, null, false, 0, false, null, false); } } } protected void buildNearestWikiRow(View view) { if (processNearstWiki() && nearestWiki.size() > 0) { - buildRow(view, R.drawable.ic_action_wikipedia, app.getString(R.string.wiki_around) + " (" + nearestWiki.size()+")", 0, + buildRow(view, R.drawable.ic_action_wikipedia, null, app.getString(R.string.wiki_around) + " (" + nearestWiki.size()+")", 0, true, getCollapsableWikiView(view.getContext(), true), false, 0, false, null, false); } @@ -382,7 +388,7 @@ public class MenuBuilder { } } }); - buildRow(view, R.drawable.ic_action_photo_dark, app.getString(R.string.online_photos), 0, true, + buildRow(view, R.drawable.ic_action_photo_dark, null, app.getString(R.string.online_photos), 0, true, collapsableView, false, 1, false, null, false); if (needUpdateOnly && onlinePhotoCards != null) { @@ -439,14 +445,14 @@ public class MenuBuilder { firstRow = false; } - public View buildRow(View view, int iconId, String text, int textColor, + public View buildRow(View view, int iconId, String buttonText, String text, int textColor, boolean collapsable, final CollapsableView collapsableView, boolean needLinks, int textLinesLimit, boolean isUrl, OnClickListener onClickListener, boolean matchWidthDivider) { - return buildRow(view, iconId == 0 ? null : getRowIcon(iconId), text, textColor, null, collapsable, collapsableView, + return buildRow(view, iconId == 0 ? null : getRowIcon(iconId), buttonText, text, textColor, null, collapsable, collapsableView, needLinks, textLinesLimit, isUrl, onClickListener, matchWidthDivider); } - public View buildRow(final View view, Drawable icon, final String text, int textColor, String secondaryText, + public View buildRow(final View view, Drawable icon, final String buttonText, final String text, int textColor, String secondaryText, boolean collapsable, final CollapsableView collapsableView, boolean needLinks, int textLinesLimit, boolean isUrl, OnClickListener onClickListener, boolean matchWidthDivider) { @@ -540,6 +546,20 @@ public class MenuBuilder { llText.addView(textViewSecondary); } + //Button + if (!TextUtils.isEmpty(buttonText)) { + TextViewEx buttonTextView = new TextViewEx(view.getContext()); + LinearLayout.LayoutParams buttonTextViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + buttonTextViewParams.gravity = Gravity.CENTER_VERTICAL; + buttonTextViewParams.setMargins(dpToPx(8), 0, dpToPx(8), 0); + buttonTextView.setLayoutParams(buttonTextViewParams); + buttonTextView.setTypeface(FontCache.getRobotoMedium(view.getContext())); + buttonTextView.setAllCaps(true); + buttonTextView.setTextColor(ContextCompat.getColor(view.getContext(), !light ? R.color.ctx_menu_controller_button_text_color_dark_n : R.color.ctx_menu_controller_button_text_color_light_n)); + buttonTextView.setText(buttonText); + ll.addView(buttonTextView); + } + final ImageView iconViewCollapse = new ImageView(view.getContext()); if (collapsable && collapsableView != null) { // Icon @@ -673,13 +693,17 @@ public class MenuBuilder { } public void addPlainMenuItem(int iconId, String text, boolean needLinks, boolean isUrl, OnClickListener onClickListener) { - plainMenuItems.add(new PlainMenuItem(iconId, text, needLinks, isUrl, false, null, onClickListener)); + plainMenuItems.add(new PlainMenuItem(iconId, text, null, needLinks, isUrl, false, null, onClickListener)); + } + + public void addPlainMenuItem(int iconId, String buttonText, String text, boolean needLinks, boolean isUrl, OnClickListener onClickListener) { + plainMenuItems.add(new PlainMenuItem(iconId, buttonText, text, needLinks, isUrl, false, null, onClickListener)); } public void addPlainMenuItem(int iconId, String text, boolean needLinks, boolean isUrl, boolean collapsable, CollapsableView collapsableView, OnClickListener onClickListener) { - plainMenuItems.add(new PlainMenuItem(iconId, text, needLinks, isUrl, collapsable, collapsableView, onClickListener)); + plainMenuItems.add(new PlainMenuItem(iconId, text, null, needLinks, isUrl, collapsable, collapsableView, onClickListener)); } public void clearPlainMenuItems() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java index a124d885d8..c1a6d78328 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java @@ -226,8 +226,8 @@ public abstract class MenuController extends BaseMenuController { return true; } - public void addPlainMenuItem(int iconId, String text, boolean needLinks, boolean isUrl, OnClickListener onClickListener) { - builder.addPlainMenuItem(iconId, text, needLinks, isUrl, onClickListener); + public void addPlainMenuItem(int iconId, String buttonText, String text, boolean needLinks, boolean isUrl, OnClickListener onClickListener) { + builder.addPlainMenuItem(iconId, buttonText, text, needLinks, isUrl, onClickListener); } public void clearPlainMenuItems() { @@ -240,7 +240,7 @@ public abstract class MenuController extends BaseMenuController { protected void addMyLocationToPlainItems(LatLon latLon) { OsmandSettings st = ((OsmandApplication) getMapActivity().getApplicationContext()).getSettings(); - addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(), + addPlainMenuItem(R.drawable.ic_action_get_my_location, null, PointDescription.getLocationName(getMapActivity(), latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", " "), false, false, null); //if (st.COORDINATES_FORMAT.get() != PointDescription.OLC_FORMAT) // addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationOlcName( diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java index 9f460f33a9..5d7610e692 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java @@ -518,10 +518,10 @@ public class AmenityMenuBuilder extends MenuBuilder { } else { link = "https://www.openstreetmap.org/way/"; } - buildRow(view, R.drawable.ic_action_info_dark, link + (amenity.getId() >> 1), + buildRow(view, R.drawable.ic_action_info_dark, null, link + (amenity.getId() >> 1), 0, false, null, true, 0, true, null, false); } - buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app, + buildRow(view, R.drawable.ic_action_get_my_location, null, PointDescription.getLocationName(app, amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude(), true) .replaceAll("\n", " "), 0, false, null, false, 0, false, null, false); //if (st.COORDINATES_FORMAT.get() != PointDescription.OLC_FORMAT) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java index 05097d55f2..55056d5279 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java @@ -78,7 +78,7 @@ public class FavouritePointMenuBuilder extends MenuBuilder { int disabledColor = light ? R.color.secondary_text_light : R.color.secondary_text_dark; color = favoriteGroup.visible ? (color | 0xff000000) : view.getResources().getColor(disabledColor); String name = view.getContext().getString(R.string.context_menu_points_of_group); - buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_action_folder, color), name, 0, null, + buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_action_folder, color), null, name, 0, null, true, getCollapsableFavouritesView(view.getContext(), true, favoriteGroup, fav), false, 0, false, null, false); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java index 10d61daf3e..2058c4ca03 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java @@ -34,7 +34,7 @@ public class GpxItemMenuBuilder extends MenuBuilder { String description = GpxUiHelper.getDescription(app, item.analysis, false); String[] lines = description.split("\n"); for (String line : lines) { - buildRow(view, R.drawable.ic_action_info_dark, line, 0, false, null, false, 0, false, null, false); + buildRow(view, R.drawable.ic_action_info_dark, null, line, 0, false, null, false, 0, false, null, false); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java index 9553e96d39..ddb18b6278 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java @@ -44,23 +44,23 @@ public class WptPtMenuBuilder extends MenuBuilder { DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext()); Date date = new Date(wpt.time); buildRow(view, R.drawable.ic_action_data, - dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, null, false, 0, false, null, false); + null, dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, null, false, 0, false, null, false); } if (wpt.speed > 0) { buildRow(view, R.drawable.ic_action_speed, - OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, null, false, 0, false, null, false); + null, OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, null, false, 0, false, null, false); } if (!Double.isNaN(wpt.ele)) { buildRow(view, R.drawable.ic_action_altitude, - OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, null, false, 0, false, null, false); + null, OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, null, false, 0, false, null, false); } if (!Double.isNaN(wpt.hdop)) { buildRow(view, R.drawable.ic_action_gps_info, - Algorithms.capitalizeFirstLetterAndLowercase(app.getString(R.string.plugin_distance_point_hdop)) + ": " + (int)wpt.hdop, 0, + null, Algorithms.capitalizeFirstLetterAndLowercase(app.getString(R.string.plugin_distance_point_hdop)) + ": " + (int)wpt.hdop, 0, false, null, false, 0, false, null, false); } if (!Algorithms.isEmpty(wpt.desc)) { - final View row = buildRow(view, R.drawable.ic_action_note_dark, wpt.desc, 0, false, null, true, 10, false, null, false); + final View row = buildRow(view, R.drawable.ic_action_note_dark, null, wpt.desc, 0, false, null, true, 10, false, null, false); row.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -70,7 +70,7 @@ public class WptPtMenuBuilder extends MenuBuilder { }); } if (!Algorithms.isEmpty(wpt.comment)) { - final View rowc = buildRow(view, R.drawable.ic_action_note_dark, wpt.comment, 0, + final View rowc = buildRow(view, R.drawable.ic_action_note_dark, null, wpt.comment, 0, false, null, true, 10, false, null, false); rowc.setOnClickListener(new View.OnClickListener() { @Override @@ -96,7 +96,7 @@ public class WptPtMenuBuilder extends MenuBuilder { File file = new File(gpx.path); String gpxName = file.getName().replace(".gpx", "").replace("/", " ").replace("_", " "); int color = getPointColor(wpt, getFileColor(selectedGpxFile)); - buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_type_waypoints_group, color), title, 0, gpxName, + buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_type_waypoints_group, color), null, title, 0, gpxName, true, getCollapsableWaypointsView(view.getContext(), true, gpx, wpt), false, 0, false, null, false); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java index e0a6ae278d..0e1ddda8fa 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java @@ -139,7 +139,7 @@ public class FavouritePointMenuController extends MenuController { @Override public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { if (!Algorithms.isEmpty(fav.getDescription())) { - addPlainMenuItem(R.drawable.ic_action_note_dark, fav.getDescription(), true, false, null); + addPlainMenuItem(R.drawable.ic_action_note_dark, null, fav.getDescription(), true, false, null); } Object originObject = getBuilder().getOriginObject(); if (originObject != null) { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java index 6028f14f38..a0735a80b2 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java @@ -271,16 +271,16 @@ public class MapDataMenuController extends MenuController { @Override public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { if (indexItem != null) { - addPlainMenuItem(R.drawable.ic_action_info_dark, indexItem.getType().getString(getMapActivity()), false, false, null); + addPlainMenuItem(R.drawable.ic_action_info_dark, null, indexItem.getType().getString(getMapActivity()), false, false, null); StringBuilder sizeStr = new StringBuilder(); sizeStr.append(indexItem.getSizeDescription(getMapActivity())); if (backuped) { sizeStr.append(" — ").append(LocalIndexType.DEACTIVATED.getHumanString(getMapActivity())); } - addPlainMenuItem(R.drawable.ic_action_info_dark, sizeStr.toString(), false, false, null); + addPlainMenuItem(R.drawable.ic_action_info_dark, null, sizeStr.toString(), false, false, null); } else if (localIndexInfo != null) { if (getDownloadActivityType() != null) { - addPlainMenuItem(R.drawable.ic_action_info_dark, getDownloadActivityType().getString(getMapActivity()), false, false, null); + addPlainMenuItem(R.drawable.ic_action_info_dark, null, getDownloadActivityType().getString(getMapActivity()), false, false, null); } StringBuilder sizeStr = new StringBuilder(); if (localIndexInfo.getSize() >= 0) { @@ -297,7 +297,7 @@ public class MapDataMenuController extends MenuController { sizeStr.append(LocalIndexType.DEACTIVATED.getHumanString(getMapActivity())); } } - addPlainMenuItem(R.drawable.ic_action_info_dark, sizeStr.toString(), false, false, null); + addPlainMenuItem(R.drawable.ic_action_info_dark, null, sizeStr.toString(), false, false, null); } if (!Algorithms.isEmpty(mapObject.getWorldRegion().getParams().getWikiLink())) { String[] items = mapObject.getWorldRegion().getParams().getWikiLink().split(":"); @@ -307,7 +307,7 @@ public class MapDataMenuController extends MenuController { } else { url = "https://wikipedia.org/wiki/" + items[0].replace(' ', '_'); } - addPlainMenuItem(R.drawable.ic_world_globe_dark, url, false, true, null); + addPlainMenuItem(R.drawable.ic_world_globe_dark, null, url, false, true, null); } if (!Algorithms.isEmpty(mapObject.getWorldRegion().getParams().getPopulation())) { String population = mapObject.getWorldRegion().getParams().getPopulation(); @@ -321,14 +321,14 @@ public class MapDataMenuController extends MenuController { b.insert(0, population.charAt(i)); k++; } - addPlainMenuItem(R.drawable.ic_action_info_dark, getMapActivity().getResources().getString(R.string.poi_population) + addPlainMenuItem(R.drawable.ic_action_info_dark, null, getMapActivity().getResources().getString(R.string.poi_population) + ": " + b, false, false, null); } if (indexItem != null) { DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(getMapActivity()); - addPlainMenuItem(R.drawable.ic_action_data, indexItem.getRemoteDate(dateFormat), false, false, null); + addPlainMenuItem(R.drawable.ic_action_data, null, indexItem.getRemoteDate(dateFormat), false, false, null); } else if (localIndexInfo != null) { - addPlainMenuItem(R.drawable.ic_action_data, localIndexInfo.getDescription(), false, false, null); + addPlainMenuItem(R.drawable.ic_action_data, null, localIndexInfo.getDescription(), false, false, null); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java index d9b1ea205b..1e0961b2b0 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java @@ -95,7 +95,7 @@ public class RenderedObjectMenuController extends MenuController { if (entry.getKey().equalsIgnoreCase("maxheight")) { AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(entry.getKey()); if (pt != null) { - addPlainMenuItem(R.drawable.ic_action_note_dark, pt.getTranslation() + ": " + entry.getValue(), false, false, null); + addPlainMenuItem(R.drawable.ic_action_note_dark, null, pt.getTranslation() + ": " + entry.getValue(), false, false, null); } } } @@ -110,7 +110,7 @@ public class RenderedObjectMenuController extends MenuController { } else { link = "https://www.openstreetmap.org/way/"; } - addPlainMenuItem(R.drawable.ic_action_info_dark, link + (renderedObject.getId() >> 7), true, true, null); + addPlainMenuItem(R.drawable.ic_action_info_dark, null, link + (renderedObject.getId() >> 7), true, true, null); } addMyLocationToPlainItems(latLon); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportRouteController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportRouteController.java index b107f77e7a..0809d7a147 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportRouteController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportRouteController.java @@ -240,7 +240,8 @@ public class TransportRouteController extends MenuController { if (!transportRoute.showWholeRoute) { startPosition = (currentStop == -1 ? 0 : currentStop); if (currentStop > 0) { - addPlainMenuItem(defaultIcon, getMapActivity().getString(R.string.route_stops_before, currentStop), + addPlainMenuItem(defaultIcon, getMapActivity().getString(R.string.shared_string_show), + getMapActivity().getString(R.string.route_stops_before, currentStop), false, false, new OnClickListener() { @Override @@ -258,7 +259,7 @@ public class TransportRouteController extends MenuController { name = getStopType(); } addPlainMenuItem(currentStop == i ? R.drawable.ic_action_marker_dark : defaultIcon, - name, false, false, new OnClickListener() { + null, name, false, false, new OnClickListener() { @Override public void onClick(View arg0) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java index 742ba1c410..d4e53c0e68 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java @@ -30,8 +30,8 @@ public class EditPOIMenuBuilder extends MenuBuilder { if (osmPoint instanceof OsmNotesPoint) { OsmNotesPoint notes = (OsmNotesPoint) osmPoint; - buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false, null, false, 0, false, null, false); - buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false, null, false, 0, false, null, false); + buildRow(view, R.drawable.ic_action_note_dark, null, notes.getText(), 0, false, null, false, 0, false, null, false); + buildRow(view, R.drawable.ic_group, null, notes.getAuthor(), 0, false, null, false, 0, false, null, false); } else if (osmPoint instanceof OpenstreetmapPoint) { OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint; @@ -56,7 +56,7 @@ public class EditPOIMenuBuilder extends MenuBuilder { if (resId == 0) { resId = R.drawable.ic_action_folder_stroke; } - buildRow(view, resId, poiTranslation, 0, false, null, false, 0, false, null, false); + buildRow(view, resId, null, poiTranslation, 0, false, null, false, 0, false, null, false); break; } } @@ -67,11 +67,11 @@ public class EditPOIMenuBuilder extends MenuBuilder { continue; } String text = e.getKey() + "=" + e.getValue(); - buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, null, false, 0, false, null, false); + buildRow(view, R.drawable.ic_action_info_dark, null, text, 0, false, null, false, 0, false, null, false); } } - buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app, + buildRow(view, R.drawable.ic_action_get_my_location, null, PointDescription.getLocationName(app, osmPoint.getLatitude(), osmPoint.getLongitude(), true) .replaceAll("\n", " "), 0, false, null, false, 0, false, null, false); } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java index 8827ebd024..02df976545 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java @@ -95,7 +95,7 @@ public class OsmBugMenuController extends MenuController { public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) { super.addPlainMenuItems(typeStr, pointDescription, latLon); for (String description : bug.getCommentDescriptionList()) { - addPlainMenuItem(R.drawable.ic_action_note_dark, description, true, false, null); + addPlainMenuItem(R.drawable.ic_action_note_dark, null, description, true, false, null); } }