From 2063c9442a5a1f7d330e539b9356a27168cbd81f Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Fri, 15 May 2020 17:08:09 +0300
Subject: [PATCH] Replace icon for City and Village

---
 OsmAnd/res/drawable/ic_action_village.xml     | 34 +++++++++++++++++++
 .../search/listitems/QuickSearchListItem.java |  4 +--
 .../sample1/search/QuickSearchListItem.java   |  4 +--
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 OsmAnd/res/drawable/ic_action_village.xml

diff --git a/OsmAnd/res/drawable/ic_action_village.xml b/OsmAnd/res/drawable/ic_action_village.xml
new file mode 100644
index 0000000000..dd841a5ba6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_village.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,10H11V12H15V10Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M19,18H17V22H19V18Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M15,2L9,6H8V8H9V12H11V8H13V10H15V22H17V18H19V22H21V8H22V6H21L15,2ZM15,4C14.4477,4 14,4.4477 14,5C14,5.5523 14.4477,6 15,6C15.5523,6 16,5.5523 16,5C16,4.4477 15.5523,4 15,4ZM19,14H17V16H19V14ZM17,8H19V10H17V8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13,22V16H9V22H13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M1,14L9,8L13,11V10H15V12.5L17,14V16H15V22L13,22V16H9L9,18.5L9,22L3,22V16H1V14ZM7,16H5V20H7V16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10,18.5H9V20H10V18.5Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
index 9965f6a880..52ceef46e2 100644
--- a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
+++ b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
@@ -313,9 +313,9 @@ public class QuickSearchListItem {
 		int iconId = -1;
 		switch (searchResult.objectType) {
 			case CITY:
-				return getIcon(app, R.drawable.ic_action_building_number);
+				return getIcon(app, R.drawable.ic_action_building2);
 			case VILLAGE:
-				return getIcon(app, R.drawable.ic_action_home_dark);
+				return getIcon(app, R.drawable.ic_action_village);
 			case POSTCODE:
 			case STREET:
 				return getIcon(app, R.drawable.ic_action_street_name);
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListItem.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListItem.java
index 5de85a803d..0cc06035e1 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListItem.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListItem.java
@@ -253,9 +253,9 @@ public class QuickSearchListItem {
 		int iconId;
 		switch (searchResult.objectType) {
 			case CITY:
-				return app.getIconsCache().getIcon("ic_action_building_number", R.color.osmand_orange);
+				return app.getIconsCache().getIcon("ic_action_building2", R.color.osmand_orange);
 			case VILLAGE:
-				return app.getIconsCache().getIcon("ic_action_home_dark", R.color.osmand_orange);
+				return app.getIconsCache().getIcon("ic_action_village", R.color.osmand_orange);
 			case POSTCODE:
 			case STREET:
 				return app.getIconsCache().getIcon("ic_action_street_name", R.color.osmand_orange);