From de95a3e353d6d0575cb23b114d3205bf377d0b67 Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Wed, 8 Jul 2020 17:28:47 +0300
Subject: [PATCH] Updated icon for motorcycle, added new icons for enduro
 motorcycle and motor scooter

---
 .../drawable/ic_action_enduro_motorcycle.xml  | 10 +++++++++
 .../res/drawable/ic_action_motor_scooter.xml  | 21 +++++++++++++++++++
 .../drawable/ic_action_motorcycle_dark.xml    |  4 ++--
 OsmAnd/res/values/strings.xml                 |  2 ++
 .../osmand/plus/profiles/ProfileIcons.java    |  2 ++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 OsmAnd/res/drawable/ic_action_enduro_motorcycle.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_motor_scooter.xml

diff --git a/OsmAnd/res/drawable/ic_action_enduro_motorcycle.xml b/OsmAnd/res/drawable/ic_action_enduro_motorcycle.xml
new file mode 100644
index 0000000000..ce8f40ad06
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_enduro_motorcycle.xml
@@ -0,0 +1,10 @@
+<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="M16.9285,4.6286C16.7318,4.137 16.1861,3.8839 15.6838,4.0513L12.6838,5.0513L13.3162,6.9487L15.4217,6.2468L16.2071,8.2102L13.8377,9H9.5811C8.6414,9 7.7078,8.8485 6.8162,8.5513C5.7208,8.1861 4.5736,8 3.4189,8H3C2.4477,8 2,8.4477 2,9C2,9.5523 2.4477,10 3,10H3.4189C4.3586,10 5.2922,10.1515 6.1838,10.4487C6.3323,10.4982 6.4818,10.5444 6.6321,10.5873C7.5714,11.0587 8.2953,11.8858 8.6325,12.8974L8.7408,13.2223C8.7467,13.24 8.7531,13.2576 8.7599,13.2748L7.3486,13.4865C7.2195,13.4558 7.1027,13.3741 7.0311,13.25C6.8982,13.0199 6.9691,12.728 7.1877,12.5833C6.967,12.2926 6.7074,12.033 6.4167,11.8123C6.272,12.031 5.9801,12.1018 5.75,11.969C5.5196,11.836 5.4351,11.5473 5.5527,11.3125C5.2218,11.173 4.8682,11.0768 4.4991,11.0308C4.4831,11.2926 4.2658,11.5 4,11.5C3.7342,11.5 3.5169,11.2926 3.5009,11.0308C3.1318,11.0768 2.7782,11.173 2.4473,11.3125C2.5649,11.5473 2.4804,11.8359 2.25,11.9689C2.0199,12.1018 1.728,12.0309 1.5833,11.8123C1.2926,12.033 1.0331,12.2926 0.8123,12.5833C1.0309,12.728 1.1018,13.0198 0.9689,13.2499C0.8359,13.4803 0.5473,13.5647 0.3125,13.4473C0.173,13.7782 0.0768,14.1317 0.0308,14.5009C0.2926,14.5169 0.5,14.7342 0.5,15C0.5,15.2658 0.2926,15.4831 0.0308,15.4991C0.0768,15.8682 0.173,16.2218 0.3125,16.5527C0.5473,16.4352 0.8359,16.5196 0.9689,16.75C1.1018,16.9801 1.0309,17.272 0.8123,17.4167C1.033,17.7074 1.2926,17.967 1.5833,18.1877C1.7281,17.9691 2.0199,17.8983 2.25,18.0311C2.4803,18.1641 2.5648,18.4527 2.4474,18.6875C2.7782,18.827 3.1318,18.9232 3.5009,18.9692C3.5169,18.7074 3.7342,18.5 4,18.5C4.2658,18.5 4.4831,18.7074 4.4991,18.9692C4.8682,18.9232 5.2218,18.827 5.5526,18.6875C5.4351,18.4527 5.5196,18.1641 5.75,18.0311C5.9801,17.8982 6.2719,17.9691 6.4167,18.1877C6.7074,17.967 6.967,17.7073 7.1877,17.4166C6.9691,17.2719 6.8982,16.98 7.0311,16.7499C7.1641,16.5195 7.4527,16.435 7.6875,16.5526C7.827,16.2217 7.9232,15.8682 7.9692,15.4991C7.8986,15.4948 7.832,15.4759 7.7724,15.4453L13.4317,14.5964C14.1262,14.4922 14.7623,14.1476 15.2289,13.6227L17.3966,11.184L17.6962,11.9331C17.6531,11.9002 17.6147,11.8597 17.5833,11.8122C17.2926,12.033 17.0331,12.2925 16.8123,12.5832C17.0309,12.7279 17.1018,13.0197 16.9689,13.2498C16.8359,13.4802 16.5473,13.5647 16.3125,13.4472C16.173,13.7781 16.0768,14.1317 16.0308,14.5009C16.2926,14.5168 16.5,14.7341 16.5,14.9999C16.5,15.2657 16.2926,15.4831 16.0308,15.499C16.0768,15.8682 16.173,16.2217 16.3125,16.5526C16.5473,16.4351 16.8359,16.5196 16.9689,16.7499C17.1018,16.9801 17.0309,17.2719 16.8123,17.4166C17.033,17.7073 17.2926,17.9669 17.5833,18.1876C17.7281,17.9691 18.0199,17.8982 18.25,18.0311C18.4803,18.1641 18.5648,18.4527 18.4474,18.6874C18.7782,18.8269 19.1318,18.9232 19.5009,18.9691C19.5169,18.7073 19.7342,18.4999 20,18.4999C20.2658,18.4999 20.4831,18.7073 20.4991,18.9691C20.8682,18.9232 21.2218,18.8269 21.5527,18.6874C21.4351,18.4526 21.5196,18.164 21.75,18.031C21.9801,17.8982 22.2719,17.969 22.4167,18.1876C22.7074,17.9669 22.967,17.7073 23.1877,17.4165C22.9691,17.2718 22.8982,16.98 23.0311,16.7498C23.1641,16.5195 23.4527,16.435 23.6875,16.5525C23.827,16.2217 23.9232,15.8681 23.9692,15.499C23.7074,15.4831 23.5,15.2657 23.5,14.9999C23.5,14.7341 23.7074,14.5168 23.9692,14.5009C23.9232,14.1317 23.827,13.7781 23.6875,13.4473C23.4527,13.5648 23.1641,13.4803 23.0311,13.2499C22.8982,13.0198 22.9691,12.728 23.1877,12.5833C22.967,12.2926 22.7074,12.033 22.4167,11.8122C22.272,12.0309 21.9801,12.1018 21.75,11.9689C21.5196,11.8359 21.4351,11.5472 21.5527,11.3125C21.2218,11.173 20.8682,11.0767 20.4991,11.0308C20.4831,11.2925 20.2658,11.4999 20,11.4999C19.8325,11.4999 19.6842,11.4176 19.5935,11.2911L19.5048,11.0693C19.503,11.0566 19.5017,11.0438 19.5009,11.0308C19.4973,11.0312 19.4936,11.0317 19.4899,11.0322L16.9285,4.6286ZM18.4282,13.7631L19.0715,15.3714C19.2766,15.8841 19.8586,16.1336 20.3714,15.9284C20.8842,15.7233 21.1336,15.1414 20.9285,14.6286L20.2851,13.0201C21.2546,13.1585 22,13.9921 22,14.9999C22,16.1045 21.1046,16.9999 20,16.9999C18.8954,16.9999 18,16.1045 18,14.9999C18,14.533 18.16,14.1034 18.4282,13.7631ZM5.5646,13.7541C5.1982,13.2945 4.6335,13 4,13C2.8954,13 2,13.8954 2,15C2,16.1046 2.8954,17 4,17C4.8462,17 5.5697,16.4744 5.8618,15.7319L4.1483,15.9889C3.6022,16.0708 3.093,15.6945 3.0111,15.1483C2.9291,14.6021 3.3055,14.093 3.8517,14.011L5.5646,13.7541Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_motor_scooter.xml b/OsmAnd/res/drawable/ic_action_motor_scooter.xml
new file mode 100644
index 0000000000..a8a0cf4551
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_motor_scooter.xml
@@ -0,0 +1,21 @@
+<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="M5,17C5.5523,17 6,16.5523 6,16C6,15.4477 5.5523,15 5,15C4.4477,15 4,15.4477 4,16C4,16.5523 4.4477,17 5,17ZM5,19C6.6568,19 8,17.6569 8,16C8,14.3431 6.6568,13 5,13C3.3431,13 2,14.3431 2,16C2,17.6569 3.3431,19 5,19Z"
+      android:strokeAlpha="0.9"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.9"/>
+  <path
+      android:pathData="M19,17C19.5523,17 20,16.5523 20,16C20,15.4477 19.5523,15 19,15C18.4477,15 18,15.4477 18,16C18,16.5523 18.4477,17 19,17ZM19,19C20.6569,19 22,17.6569 22,16C22,14.3431 20.6569,13 19,13C17.3431,13 16,14.3431 16,16C16,17.6569 17.3431,19 19,19Z"
+      android:strokeAlpha="0.9"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.9"/>
+  <path
+      android:pathData="M13,7H15.1654L16,11.5902V14H10V11C10.5523,11 11,10.5523 11,10C11,9.4477 10.5523,9 10,9H6C5.4477,9 5,9.4477 5,10C5,10.5523 5.4477,11 6,11H5C3.3431,11 2,12.3431 2,14V16H22V15C22,12.7909 20.2091,11 18,11C17.9751,11 17.9504,11.0005 17.9257,11.0014L17.5417,8.889C17.679,8.9599 17.8348,9 18,9H19V7H18C17.7057,7 17.4411,7.1271 17.2581,7.3295L17.1332,6.6422C16.9603,5.6912 16.132,5 15.1654,5H13V7Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_motorcycle_dark.xml b/OsmAnd/res/drawable/ic_action_motorcycle_dark.xml
index 2bf23aff89..a89713cff8 100644
--- a/OsmAnd/res/drawable/ic_action_motorcycle_dark.xml
+++ b/OsmAnd/res/drawable/ic_action_motorcycle_dark.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M13.5858,7H12V5H14.4142L18.415,9.0008C18.4433,9.0003 18.4716,9 18.5,9C20.9853,9 23,11.0147 23,13.5C23,15.9853 20.9853,18 18.5,18C16.244,18 14.3758,16.3399 14.0502,14.1746L13.5,15H8.7439C8.1262,16.7478 6.4593,18 4.5,18C2.0147,18 0,15.9853 0,13.5C0,11.0147 2.0147,9 4.5,9C4.6749,9 4.8474,9.01 5.0171,9.0294L5,9H6V8H9V9H15.5858L13.5858,7ZM7,13.5C7,14.8807 5.8807,16 4.5,16C3.1193,16 2,14.8807 2,13.5C2,12.1193 3.1193,11 4.5,11C5.8807,11 7,12.1193 7,13.5ZM21,13.5C21,14.8807 19.8807,16 18.5,16C17.1193,16 16,14.8807 16,13.5C16,12.1193 17.1193,11 18.5,11C19.8807,11 21,12.1193 21,13.5Z"
-      android:fillColor="#727272"
+      android:pathData="M13,7H15.3501L15.8603,8.148L13.6379,10H11V9C11,8.4477 10.5523,8 10,8H5C4.4477,8 4,8.4477 4,9H3C2.4477,9 2,9.4477 2,10C2,10.5523 2.4477,11 3,11H3.7639L3.7762,11.0062C1.6712,11.1222 0,12.8659 0,15C0,17.2091 1.7909,19 4,19C5.8638,19 7.4299,17.7252 7.874,16H11.9296C12.9327,16 13.8694,15.4987 14.4258,14.6641L17.0242,10.7666L17.5132,11.8668C16.5912,12.5996 16,13.7308 16,15C16,17.2091 17.7909,19 20,19C22.2091,19 24,17.2091 24,15C24,12.7909 22.2091,11 20,11C19.7754,11 19.5551,11.0185 19.3406,11.0541L18.8535,9.9581C19.5113,9.7992 20,9.2067 20,8.5C20,7.6716 19.3284,7 18.5,7C18.1864,7 17.8953,7.0962 17.6546,7.2607L17.1777,6.1877C16.8567,5.4655 16.1405,5 15.3501,5H13V7ZM18.3827,13.8232L19.0862,15.4061C19.3105,15.9108 19.9015,16.1381 20.4061,15.9138C20.9108,15.6895 21.1381,15.0985 20.9138,14.5939L20.2103,13.0109C21.216,13.116 22,13.9664 22,15C22,16.1046 21.1046,17 20,17C18.8954,17 18,16.1046 18,15C18,14.5601 18.142,14.1534 18.3827,13.8232ZM5.7324,14H4C3.4477,14 3,14.4477 3,15C3,15.5523 3.4477,16 4,16H5.7324C5.3866,16.5978 4.7403,17 4,17C2.8954,17 2,16.1046 2,15C2,13.8954 2.8954,13 4,13C4.7403,13 5.3866,13.4022 5.7324,14ZM7.874,14H9V12H6.6458C7.2362,12.5211 7.6716,13.2138 7.874,14Z"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 64f9e464bd..35de06c09b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,8 @@
 	Thx - Hardy
 
 -->
+    <string name="app_mode_motor_scooter">Motor scooter</string>
+    <string name="app_mode_enduro_motorcycle">Enduro motorcycle</string>
     <string name="plugin_wikipedia_description">Get information about points of interest from Wikipedia. It is your pocket offline guide - just enable Wikipedia plugin and enjoy articles about objects around you.</string>
     <string name="search_download_wikipedia_maps">Download Wikipedia maps</string>
     <string name="quick_action_remove_next_destination_descr">The current destination point on the route will be deleted. If it will be the Destination, navigation will stop.</string>
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
index 9bc0bb2441..b7beb6d124 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileIcons.java
@@ -17,6 +17,8 @@ public enum ProfileIcons {
 	BUS(R.drawable.ic_action_bus_dark, R.string.app_mode_bus, "ic_action_bus_dark"),
 	SUBWAY(R.drawable.ic_action_subway, R.string.app_mode_subway, "ic_action_subway"),
 	MOTORCYCLE(R.drawable.ic_action_motorcycle_dark, R.string.app_mode_motorcycle, "ic_action_motorcycle_dark"),
+	ENDURO_MOTORCYCLE(R.drawable.ic_action_enduro_motorcycle, R.string.app_mode_enduro_motorcycle, "ic_action_enduro_motorcycle"),
+	MOTOR_SCOOTER(R.drawable.ic_action_motor_scooter, R.string.app_mode_motor_scooter, "ic_action_motor_scooter"),
 	BICYCLE(R.drawable.ic_action_bicycle_dark, R.string.app_mode_bicycle, "ic_action_bicycle_dark"),
 	HORSE(R.drawable.ic_action_horse, R.string.app_mode_horse, "ic_action_horse"),
 	PEDESTRIAN(R.drawable.ic_action_pedestrian_dark, R.string.app_mode_pedestrian, "ic_action_pedestrian_dark"),