From 6335db433e2b08244f0e63c216a26e8b659a0e59 Mon Sep 17 00:00:00 2001 From: kotlin Date: Mon, 10 Aug 2020 17:33:13 +0300 Subject: [PATCH 1/6] Update map_context_menu_fragment.xml --- OsmAnd/res/layout/map_context_menu_fragment.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 631a901de4..6128ba2754 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -467,6 +467,8 @@ android:text="@string/get_directions" android:textAllCaps="true" android:textSize="@dimen/default_desc_text_size" + android:maxLines="1" + android:autoSizeTextType="uniform" osmand:typeface="@string/font_roboto_medium" tools:textColor="?attr/contextMenuButtonColor" /> From 84ddaa0a483043f3decbb3d8f04762994d061da7 Mon Sep 17 00:00:00 2001 From: kotlin Date: Tue, 11 Aug 2020 00:09:17 +0300 Subject: [PATCH 2/6] Fix #9610 --- OsmAnd/res/layout/map_context_menu_fragment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 6128ba2754..fc9af7de29 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -457,7 +457,7 @@ android:id="@+id/context_menu_directions_button" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" + android:layout_weight="2" android:background="?attr/selectableItemBackground" android:gravity="end|center_vertical" android:paddingLeft="@dimen/context_menu_padding_margin_default" From 64216d19f02cbc23666cd322f2f7b27ef19f73b7 Mon Sep 17 00:00:00 2001 From: kotlin Date: Tue, 11 Aug 2020 00:10:24 +0300 Subject: [PATCH 3/6] Fix #9610 --- OsmAnd/res/layout/map_context_menu_fragment.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index fc9af7de29..d7200d47fb 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -467,8 +467,6 @@ android:text="@string/get_directions" android:textAllCaps="true" android:textSize="@dimen/default_desc_text_size" - android:maxLines="1" - android:autoSizeTextType="uniform" osmand:typeface="@string/font_roboto_medium" tools:textColor="?attr/contextMenuButtonColor" /> From 03bee1df46c998b73a32c6384b62f231fd928db8 Mon Sep 17 00:00:00 2001 From: kotlin Date: Wed, 12 Aug 2020 19:15:32 +0300 Subject: [PATCH 4/6] Fix #9582 --- .../net/osmand/plus/parkingpoint/ParkingPositionPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 15cf579e62..8583190f30 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -268,10 +268,11 @@ public class ParkingPositionPlugin extends OsmandPlugin { void showContextMenuIfNeeded(final MapActivity mapActivity, boolean animated) { MapContextMenu menu = mapActivity.getContextMenu(); + FavouritePoint pnt = app.getFavorites().getSpecialPoint(SpecialPointType.PARKING); if (menu.isVisible()) { menu.hide(animated); menu.show(new LatLon(parkingPosition.getLatitude(), parkingPosition.getLongitude()), - getObjectName(parkingPosition), parkingPosition); + getObjectName(parkingPosition), pnt); } } From babe4bc6c61116021a41747ae1eca473cbc358a2 Mon Sep 17 00:00:00 2001 From: sergdevosm Date: Thu, 13 Aug 2020 12:04:58 +0300 Subject: [PATCH 5/6] Fix #6003 --- OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 189a039a54..7883e2c5f0 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -150,7 +150,7 @@ public class MapillaryPlugin extends OsmandPlugin { @Override public boolean onRowItemClick(ArrayAdapter adapter, View view, int itemId, int position) { - if (itemId == R.string.mapillary) { + if (itemId == R.string.street_level_imagery) { mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAPILLARY, AndroidUtils.getCenterViewCoordinates(view)); return false; } @@ -160,7 +160,7 @@ public class MapillaryPlugin extends OsmandPlugin { @Override public boolean onContextMenuClick(final ArrayAdapter adapter, int itemId, final int pos, boolean isChecked, int[] viewCoordinates) { final OsmandSettings settings = mapActivity.getMyApplication().getSettings(); - if (itemId == R.string.mapillary) { + if (itemId == R.string.street_level_imagery) { OsmandMapTileView mapView = mapActivity.getMapView(); MapActivityLayers mapLayers = mapActivity.getMapLayers(); settings.SHOW_MAPILLARY.set(!settings.SHOW_MAPILLARY.get()); From e7c5332b009cdc302db180a7472803ee0a8110d1 Mon Sep 17 00:00:00 2001 From: sergdevosm Date: Fri, 14 Aug 2020 15:50:30 +0300 Subject: [PATCH 6/6] Update map_context_menu_fragment.xml --- OsmAnd/res/layout/map_context_menu_fragment.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index d7200d47fb..837a03a781 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -455,9 +455,8 @@