From bf8dd4180b2445ee9190fc72a1a291cafb60f286 Mon Sep 17 00:00:00 2001
From: "Igor B. Poretsky" <poretsky@mlbox.ru>
Date: Tue, 1 Mar 2016 20:31:54 +0300
Subject: [PATCH] Implemented category choice dialog when adding favourites in
 accessibility mode.

---
 OsmAnd/res/layout/favorite_edit_dialog.xml    |  1 +
 OsmAnd/res/values-ru/strings.xml              |  1 +
 OsmAnd/res/values/strings.xml                 |  1 +
 .../osmand/plus/dialogs/FavoriteDialogs.java  | 24 ++++++++++++++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/favorite_edit_dialog.xml b/OsmAnd/res/layout/favorite_edit_dialog.xml
index 0399ebb38a..a8ce7b3c5a 100644
--- a/OsmAnd/res/layout/favorite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favorite_edit_dialog.xml
@@ -26,6 +26,7 @@
 			android:selectAllOnFocus="true"/>
 
 		<TextView
+  			android:id="@+id/TextButton"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/dialog_elements_vertical_margin"
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 400d63d1d7..ec9cf5cae0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1998,4 +1998,5 @@
     <string name="access_hint_enter_name">Введите имя</string>
     <string name="access_hint_enter_category">Введите категорию</string>
     <string name="access_hint_enter_description">Введите описание</string>
+    <string name="access_category_choice">Выберите категорию</string>
 </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index db96f17269..4f289d00ef 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -10,6 +10,7 @@
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
 
+    <string name="access_category_choice">Choose category</string>
     <string name="access_hint_enter_name">Enter name</string>
     <string name="access_hint_enter_category">Enter category</string>
     <string name="access_hint_enter_description">Enter description</string>
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index b44d10ab34..61a0eddc3d 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -16,6 +16,7 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import net.osmand.AndroidUtils;
@@ -105,12 +106,33 @@ public class FavoriteDialogs {
 		final EditText description = (EditText) v.findViewById(R.id.description);
 		final AutoCompleteTextView cat =  (AutoCompleteTextView) v.findViewById(R.id.Category);
 		List<FavoriteGroup> gs = helper.getFavoriteGroups();
-		String[] list = new String[gs.size()];
+		final String[] list = new String[gs.size()];
 		for (int i = 0; i < list.length; i++) {
 			list[i] = gs.get(i).name;
 		}
 		cat.setAdapter(new ArrayAdapter<String>(activity, R.layout.list_textview, list));
 		
+		if (((OsmandApplication)activity.getApplication()).accessibilityEnabled()) {
+			final TextView textButton = (TextView)v.findViewById(R.id.TextButton);
+			textButton.setClickable(true);
+			textButton.setFocusable(true);
+			textButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					AlertDialog.Builder b = new AlertDialog.Builder(activity);
+					b.setTitle(R.string.access_category_choice);
+					b.setItems(list, new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							cat.setText(list[which]);
+						}
+					});
+					b.setNegativeButton(R.string.shared_string_cancel, null);
+					b.show();
+				}
+			});
+		}
+
 		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.setNeutralButton(R.string.update_existing, new DialogInterface.OnClickListener(){