From a90fd6d2c3b2162b69b3f909257dbf34d06a3993 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 13 May 2020 09:28:56 +0300
Subject: [PATCH 1/4] Fix vector drawable migration.

---
 OsmAnd/res/drawable/extension_stub.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/drawable/extension_stub.xml b/OsmAnd/res/drawable/extension_stub.xml
index 00571fbcd3..5237c87e83 100644
--- a/OsmAnd/res/drawable/extension_stub.xml
+++ b/OsmAnd/res/drawable/extension_stub.xml
@@ -8,7 +8,8 @@
 			<solid android:color="#ff8f00"/>
 		</shape>
 	</item>
-	<item>
-		<bitmap android:src="@drawable/ic_extension_dark" android:gravity="center" />
+	<item
+		android:drawable="@drawable/ic_extension_dark"
+		android:gravity="center">
 	</item>
 </layer-list>

From cd175d290e894a1b26f8f37f011ba9f1454aff11 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 13 May 2020 12:26:06 +0300
Subject: [PATCH 2/4] Fix #8582 GPX files dialog, check layout

---
 OsmAnd/res/layout/gpx_track_item.xml | 29 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index 0842eb7dc9..e34ec9d321 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:background="?attr/selectableItemBackground"
@@ -44,10 +45,10 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_action_polygom_dark"
+            app:srcCompat="@drawable/ic_action_polygom_dark"
             android:layout_marginRight="@dimen/list_content_padding"
             android:visibility="visible"
-	        android:layout_marginEnd="@dimen/list_content_padding" />
+            android:layout_marginEnd="@dimen/list_content_padding" />
 
 
         <LinearLayout
@@ -84,17 +85,18 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    android:src="@drawable/ic_action_distance_16" />
+                    app:srcCompat="@drawable/ic_action_distance_16" />
 
                 <TextView
                     android:id="@+id/distance"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
                     android:includeFontPadding="false"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_sub_text_size"
-	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
                 <ImageView
                     android:id="@+id/points_icon"
@@ -102,7 +104,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    android:src="@drawable/ic_action_waypoint_16" />
+                    app:srcCompat="@drawable/ic_action_waypoint_16" />
 
                 <TextView
                     android:id="@+id/points_count"
@@ -110,9 +112,10 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
                     android:includeFontPadding="false"
+                    android:maxLines="1"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_sub_text_size"
-	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
                 <ImageView
                     android:id="@+id/time_icon"
@@ -120,17 +123,18 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    android:src="@drawable/ic_action_time_16" />
+                    app:srcCompat="@drawable/ic_action_time_16" />
 
                 <TextView
                     android:id="@+id/time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
                     android:textColor="?android:textColorSecondary"
                     android:includeFontPadding="false"
                     android:textSize="@dimen/default_sub_text_size"
-	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
+                    android:layout_marginEnd="@dimen/gpx_small_text_margin" />
 
             </LinearLayout>
 
@@ -146,6 +150,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="?android:textColorSecondary"
+                    android:maxLines="1"
                     android:textSize="@dimen/default_sub_text_size"/>
 
             </LinearLayout>
@@ -167,7 +172,7 @@
             android:layout_marginLeft="@dimen/favorites_icon_right_margin"
             android:layout_marginStart="@dimen/favorites_icon_right_margin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_gsave_dark"
+            app:srcCompat="@drawable/ic_action_gsave_dark"
             android:visibility="gone" />
 
         <ImageButton
@@ -175,7 +180,7 @@
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_rec_stop"
+            app:srcCompat="@drawable/ic_action_rec_stop"
             android:visibility="gone"/>
 
         <ImageButton
@@ -185,7 +190,7 @@
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
             android:focusable="false"
-            android:src="@drawable/ic_overflow_menu_white"
+            app:srcCompat="@drawable/ic_overflow_menu_white"
             android:visibility="gone"/>
 
         <LinearLayout

From e9000cee8382b4ca9bec976fd10ccea16207558e Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 13 May 2020 12:47:29 +0300
Subject: [PATCH 3/4] Fix formatting

---
 OsmAnd/res/layout/gpx_track_item.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index e34ec9d321..0f0f1bde06 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -2,17 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attr/selectableItemBackground"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:orientation="vertical">
 
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?attr/dashboard_divider"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/container"
@@ -68,7 +68,7 @@
                 android:layout_gravity="start"
                 android:textColor="?android:textColorPrimary"
                 android:textSize="@dimen/default_list_text_size"
-                tools:text="@string/current_track"/>
+                tools:text="@string/current_track" />
 
             <LinearLayout
                 android:id="@+id/read_section"
@@ -151,7 +151,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="?android:textColorSecondary"
                     android:maxLines="1"
-                    android:textSize="@dimen/default_sub_text_size"/>
+                    android:textSize="@dimen/default_sub_text_size" />
 
             </LinearLayout>
 
@@ -161,7 +161,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="?android:textColorPrimary"
                 android:textSize="@dimen/default_sub_text_size"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
         </LinearLayout>
 
@@ -181,7 +181,7 @@
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
             app:srcCompat="@drawable/ic_action_rec_stop"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
         <ImageButton
             android:id="@+id/options"
@@ -191,7 +191,7 @@
             android:background="?attr/dashboard_button"
             android:focusable="false"
             app:srcCompat="@drawable/ic_overflow_menu_white"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
         <LinearLayout
             android:id="@+id/check_item"

From 55cf7376a2e1233153d1e224a89615f299bdbd07 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 13 May 2020 15:48:18 +0300
Subject: [PATCH 4/4] Revert srcCompat

---
 OsmAnd/res/drawable/extension_stub.xml |  5 ++---
 OsmAnd/res/layout/gpx_track_item.xml   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/OsmAnd/res/drawable/extension_stub.xml b/OsmAnd/res/drawable/extension_stub.xml
index 5237c87e83..00571fbcd3 100644
--- a/OsmAnd/res/drawable/extension_stub.xml
+++ b/OsmAnd/res/drawable/extension_stub.xml
@@ -8,8 +8,7 @@
 			<solid android:color="#ff8f00"/>
 		</shape>
 	</item>
-	<item
-		android:drawable="@drawable/ic_extension_dark"
-		android:gravity="center">
+	<item>
+		<bitmap android:src="@drawable/ic_extension_dark" android:gravity="center" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index 0f0f1bde06..ec5e6fbc09 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -45,7 +44,7 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_action_polygom_dark"
+            android:src="@drawable/ic_action_polygom_dark"
             android:layout_marginRight="@dimen/list_content_padding"
             android:visibility="visible"
             android:layout_marginEnd="@dimen/list_content_padding" />
@@ -85,7 +84,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    app:srcCompat="@drawable/ic_action_distance_16" />
+                    android:src="@drawable/ic_action_distance_16" />
 
                 <TextView
                     android:id="@+id/distance"
@@ -104,7 +103,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    app:srcCompat="@drawable/ic_action_waypoint_16" />
+                    android:src="@drawable/ic_action_waypoint_16" />
 
                 <TextView
                     android:id="@+id/points_count"
@@ -123,7 +122,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_icon_margin"
                     android:layout_marginEnd="@dimen/gpx_small_icon_margin"
-                    app:srcCompat="@drawable/ic_action_time_16" />
+                    android:src="@drawable/ic_action_time_16" />
 
                 <TextView
                     android:id="@+id/time"
@@ -172,7 +171,7 @@
             android:layout_marginLeft="@dimen/favorites_icon_right_margin"
             android:layout_marginStart="@dimen/favorites_icon_right_margin"
             android:background="?attr/dashboard_button"
-            app:srcCompat="@drawable/ic_action_gsave_dark"
+            android:src="@drawable/ic_action_gsave_dark"
             android:visibility="gone" />
 
         <ImageButton
@@ -180,8 +179,8 @@
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
-            app:srcCompat="@drawable/ic_action_rec_stop"
-            android:visibility="gone" />
+            android:src="@drawable/ic_action_rec_stop"
+            android:visibility="gone"/>
 
         <ImageButton
             android:id="@+id/options"
@@ -190,8 +189,8 @@
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
             android:focusable="false"
-            app:srcCompat="@drawable/ic_overflow_menu_white"
-            android:visibility="gone" />
+            android:src="@drawable/ic_overflow_menu_white"
+            android:visibility="gone"/>
 
         <LinearLayout
             android:id="@+id/check_item"