From 0d14e5dc579cbd4e4150c5b95dc0f8f312e1cc4d Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Thu, 6 Feb 2020 15:47:50 +0200
Subject: [PATCH] Fix Configure POI Search categories

---
 .../bottom_sheet_item_description_long.xml    |  1 +
 OsmAnd/res/layout/order_poi_list_item.xml     | 20 +++++++++----------
 OsmAnd/res/values/strings.xml                 |  2 +-
 .../src/net/osmand/plus/poi/PoiUIFilter.java  |  2 +-
 .../plus/poi/RearrangePoiFiltersFragment.java |  4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/layout/bottom_sheet_item_description_long.xml b/OsmAnd/res/layout/bottom_sheet_item_description_long.xml
index d841ca0430..caa5a6ae92 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_description_long.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_description_long.xml
@@ -12,4 +12,5 @@
     android:textColor="?android:textColorSecondary"
     android:textSize="@dimen/default_desc_text_size"
 	android:linksClickable="true"
+	android:lineSpacingMultiplier="1.25"
     tools:text="Some long description"/>
diff --git a/OsmAnd/res/layout/order_poi_list_item.xml b/OsmAnd/res/layout/order_poi_list_item.xml
index f1d493e094..fc68ff274d 100644
--- a/OsmAnd/res/layout/order_poi_list_item.xml
+++ b/OsmAnd/res/layout/order_poi_list_item.xml
@@ -11,20 +11,18 @@
 	<LinearLayout
 		android:id="@+id/selectable_list_item"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="@dimen/content_padding_half"
-		android:paddingBottom="@dimen/content_padding_half"
+		android:layout_height="match_parent"
 		android:orientation="horizontal"
 		tools:background="?android:attr/selectableItemBackground">
 
-		<ImageButton
+		<ImageView
 			android:id="@+id/action_icon"
-			style="@style/Widget.AppCompat.ActionButton"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:minHeight="@dimen/bottom_sheet_list_item_height"
 			tools:src="@drawable/ic_action_remove"
 			tools:tint="@color/icon_color_default_light" />
 
@@ -47,6 +45,8 @@
 			android:ellipsize="marquee"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
+			android:paddingTop="@dimen/content_padding_half"
+			android:paddingBottom="@dimen/content_padding_half"
 			android:singleLine="true"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="@dimen/default_list_text_size"
@@ -56,7 +56,7 @@
 		<ImageView
 			android:id="@+id/move_icon"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="match_parent"
 			android:layout_gravity="center"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 61d4f7efb7..0001ed50a1 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="rearrange_categories">Rearrange categories</string>
     <string name="create_custom_categories_list_promo">You can add custom categories hide categories that you don’t find necessary and change the sort order of the list. The list can be imported and exported with profiles.</string>
     <string name="add_new_custom_category_button_promo">You can add a new custom category by selecting one or a few needed categories.</string>
-    <string name="reset_to_default_category_button_promo">Reset to default will delete or custom categories and reset sort order to the default state after installation.</string>
+    <string name="reset_to_default_category_button_promo">Reset to default will reset sort order to the default state after installation.</string>
     <string name="shared_string_available">Available</string>
     <string name="add_custom_category">Add custom category</string>
     <string name="rendering_attr_streetLightingNight_name">Show only at night</string>
diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index 5b7ad8dc85..facbc5a6ed 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -800,7 +800,7 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 			String anotherFilterByName = another.filterByName == null ? "" : another.filterByName;
 			return thisFilterByName.compareToIgnoreCase(anotherFilterByName);
 		} else {
-			return this.name.compareTo(another.name);
+			return this.name.compareToIgnoreCase(another.name);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
index 01500d3007..5bb86da388 100644
--- a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
@@ -212,7 +212,7 @@ public class RearrangePoiFiltersFragment extends DialogFragment {
 						String filterByName2 = o2.filterByName == null ? "" : o2.filterByName;
 						return filterByName1.compareToIgnoreCase(filterByName2);
 					} else {
-						return o1.name.compareTo(o2.name);
+						return o1.name.compareToIgnoreCase(o2.name);
 					}
 				}
 			});
@@ -641,7 +641,7 @@ public class RearrangePoiFiltersFragment extends DialogFragment {
 			private TextView title;
 			private TextView description;
 			private ImageView icon;
-			private ImageButton actionIcon;
+			private ImageView actionIcon;
 			private ImageView moveIcon;
 			private View itemsContainer;