diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml index 47b7bb7868..39d511e1ce 100644 --- a/OsmAnd/res/layout/point_editor_fragment.xml +++ b/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"/> diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index ea092ee10c..f7052f17b5 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2003,4 +2003,5 @@ Oprettede OSM IP Oprettede OSM fejlregistrering Signaturforklaring + Overfør diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 7aaecfb2f8..49fd4981ff 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1,4 +1,5 @@ - + + 選擇道路的色彩調配： 道路的色彩調配 顯示目的地方向 @@ -1849,7 +1850,7 @@ 下頁 GPX 檔案加上地點注解 地點 - + 便利設施 連絡資訊 記述 @@ -1949,9 +1950,9 @@ 地圖檢視 地圖查詢中 規劃一次旅程 - + OsmAnd 滑雪地圖 - + 安裝和疑難排除 技術文章 版本 @@ -1959,5 +1960,6 @@ 聯絡我們 建立 OSM 的興趣點 建立 OSM 的錯誤 -地圖圖例 + 地圖圖例 + 上傳 \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java index 59d5447596..58324a28b6 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java +++ b/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; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/EditPOIMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/EditPOIMenuBuilder.java index c85ff3f9b8..e06e6eb6da 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/EditPOIMenuBuilder.java +++ b/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; diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ParkingPositionMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ParkingPositionMenuController.java index c974bda33c..d901221df1 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ParkingPositionMenuController.java +++ b/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 diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java index 908a7c6bf6..ddc0b534d5 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TargetPointMenuController.java +++ b/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 diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 7db5e4925e..0cddf2ae78 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/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) { - parkingLayer.refresh(); - } - clearParkingPosition(); + cancelParking(); 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) { }