Merge

OsmAnd/res/layout/point_editor_fragment.xml

@@ -29,6 +29,9 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="right"
+            android:drawableLeft="@drawable/ic_action_done"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:background="@android:color/transparent"
             android:text="@string/shared_string_save"/>
 

OsmAnd/res/values-da/strings.xml

@@ -2003,4 +2003,5 @@
     <string name="osm_edit_created_poi">Oprettede OSM IP</string>
     <string name="osm_edit_created_bug">Oprettede OSM fejlregistrering</string>
     <string name="map_legend">Signaturforklaring</string>
+    <string name="shared_string_upload">Overfør</string>
 </resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
     <string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
     <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@@ -1849,7 +1850,7 @@
     <string name="next_proceed">下頁</string>
     <string name="av_locations_descr">GPX 檔案加上地點注解</string>
     <string name="av_locations">地點</string>
-    
+
     <string name="tag_poi_amenity">便利設施</string>
     <string name="contact_info">連絡資訊</string>
     <string name="description">記述</string>
@@ -1949,9 +1950,9 @@
     <string name="map_viewing_item">地圖檢視</string>
     <string name="search_on_the_map_item">地圖查詢中</string>
     <string name="planning_trip_item">規劃一次旅程</string>
-    
+
     <string name="osmand_ski_maps_item">OsmAnd 滑雪地圖</string>
-    
+
     <string name="instalation_troubleshooting_item">安裝和疑難排除</string>
     <string name="techical_articles_item">技術文章</string>
     <string name="versions_item">版本</string>
@@ -1959,5 +1960,6 @@
     <string name="contact_us">聯絡我們</string>
     <string name="osm_edit_created_poi">建立 OSM 的興趣點</string>
     <string name="osm_edit_created_bug">建立 OSM 的錯誤</string>
-<string name="map_legend">地圖圖例</string>
+    <string name="map_legend">地圖圖例</string>
+    <string name="shared_string_upload">上傳</string>
 </resources>

OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java

@@ -20,12 +20,12 @@ import net.osmand.plus.mapcontextmenu.controllers.AudioVideoNoteMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.EditPOIMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.FavouritePointMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController;
+import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.OsMoMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.ParkingPositionMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.PointDescriptionMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.TargetPointMenuController;
-import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
 import net.osmand.plus.mapcontextmenu.controllers.WptPtMenuController;
 import net.osmand.plus.mapcontextmenu.other.ShareMenu;
 import net.osmand.plus.osmedit.OsmPoint;

OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/EditPOIMenuBuilder.java

@@ -4,19 +4,15 @@ import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.osmedit.OpenstreetmapPoint;
-import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.osmedit.OsmNotesPoint;
 import net.osmand.plus.osmedit.OsmPoint;
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ParkingPositionMenuController.java

@@ -39,7 +39,8 @@ public class ParkingPositionMenuController extends MenuController {
 				}
 			}
 		};
-		leftTitleButtonController.caption = getMapActivity().getString(R.string.osmand_parking_delete);
+		leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
+		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java

@@ -30,7 +30,8 @@ public class TargetPointMenuController extends MenuController {
 				getMapActivity().getContextMenu().close();
 			}
 		};
-		leftTitleButtonController.caption = getMapActivity().getString(R.string.delete_target_point);
+		leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
+		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java

@@ -298,10 +298,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				showDeleteEventWarning(activity);
-				if (parkingLayer != null) {
+				cancelParking();
-					parkingLayer.refresh();
-				}
-				clearParkingPosition();
 				if (activity instanceof MapActivity) {
 					((MapActivity) activity).getContextMenu().close();
 				}
@@ -323,7 +320,12 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		Builder setTime = new AlertDialog.Builder(mapActivity);
 		setTime.setView(setTimeParking);
 		setTime.setTitle(mapActivity.getString(R.string.osmand_parking_time_limit_title));
-		setTime.setNegativeButton(R.string.shared_string_cancel, null);
+		setTime.setNegativeButton(R.string.shared_string_cancel, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				cancelParking();
+			}
+		});
 		final TextView  textView = (TextView) setTimeParking.findViewById(R.id.parkTime);
 		final TimePicker timePicker = (TimePicker) setTimeParking.findViewById(R.id.parking_time_picker);
 
@@ -433,7 +435,14 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 			parkingLayer.refresh();
 		}
 	}
-	
+
+	private void cancelParking() {
+		if (parkingLayer != null) {
+			parkingLayer.refresh();
+		}
+		clearParkingPosition();
+	}
+
 	@Override
 	public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) {
     }