From 6441cf22bbc825fc439c1018badc2dc51789aa66 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Sun, 6 Mar 2016 13:37:56 +0300 Subject: [PATCH] Rename Remove destination to Finish navigation --- OsmAnd/res/layout-land/dest_reached_menu_fragment.xml | 4 ++-- OsmAnd/res/layout/dest_reached_menu_fragment.xml | 4 ++-- OsmAnd/res/values/strings.xml | 1 + .../mapcontextmenu/other/DestinationReachedMenuFragment.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml index ba57e6b9fa..a3325dff07 100644 --- a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml +++ b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml @@ -120,12 +120,12 @@ android:layout_marginBottom="8dp" android:paddingLeft="8dp" android:paddingRight="8dp" - android:drawableLeft="@drawable/ic_action_delete_dark" + android:drawableLeft="@drawable/ic_action_done" android:drawablePadding="12dp" android:gravity="left|center_vertical" android:textColor="?android:textColorPrimary" style="@style/Widget.AppCompat.Button.Borderless" - android:text="@string/delete_target_point"/> + android:text="@string/finish_navigation"/> diff --git a/OsmAnd/res/layout/dest_reached_menu_fragment.xml b/OsmAnd/res/layout/dest_reached_menu_fragment.xml index 9a305a08f5..fcda6930e8 100644 --- a/OsmAnd/res/layout/dest_reached_menu_fragment.xml +++ b/OsmAnd/res/layout/dest_reached_menu_fragment.xml @@ -120,12 +120,12 @@ android:layout_marginBottom="8dp" android:paddingLeft="8dp" android:paddingRight="8dp" - android:drawableLeft="@drawable/ic_action_delete_dark" + android:drawableLeft="@drawable/ic_action_done" android:drawablePadding="12dp" android:gravity="left|center_vertical" android:textColor="?android:textColorPrimary" style="@style/Widget.AppCompat.Button.Borderless" - android:text="@string/delete_target_point"/> + android:text="@string/finish_navigation"/> diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index e979d46d93..ec61c29e83 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,7 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Finish navigation Avoid road Currently selected Data storage folder is readonly. The storage folder was temporarily switched to Internal memory. Please choose valid storage directory. Shared memory diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java index 763c0b6c57..9b0f071173 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/DestinationReachedMenuFragment.java @@ -59,7 +59,7 @@ public class DestinationReachedMenuFragment extends Fragment { Button removeDestButton = (Button) view.findViewById(R.id.removeDestButton); removeDestButton.setCompoundDrawablesWithIntrinsicBounds( - iconsCache.getContentIcon(R.drawable.ic_action_delete_dark), null, null, null); + iconsCache.getContentIcon(R.drawable.ic_action_done), null, null, null); removeDestButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {