From 6d356bae3d59a6cae962519cf9db1686f5c3fa91 Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Thu, 11 Mar 2021 00:00:03 +0200
Subject: [PATCH 1/2] Osmand crashes on Export / Import

https://github.com/osmandapp/OsmAnd/issues/10986
---
 OsmAnd/res/layout/enough_space_warning_card.xml | 2 +-
 OsmAnd/res/layout/select_folder_row.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/enough_space_warning_card.xml b/OsmAnd/res/layout/enough_space_warning_card.xml
index d572d20366..3fcbb69bac 100644
--- a/OsmAnd/res/layout/enough_space_warning_card.xml
+++ b/OsmAnd/res/layout/enough_space_warning_card.xml
@@ -20,7 +20,7 @@
 			android:layout_marginLeft="@dimen/content_padding"
 			android:layout_marginTop="@dimen/content_padding"
 			android:layout_marginRight="@dimen/content_padding"
-			android:src="@drawable/ic_action_sdcard_warning_colored" />
+			app:srcCompat="@drawable/ic_action_sdcard_warning_colored" />
 
 		<LinearLayout
 			android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/select_folder_row.xml b/OsmAnd/res/layout/select_folder_row.xml
index d9340cc5f2..c8c5f4e600 100644
--- a/OsmAnd/res/layout/select_folder_row.xml
+++ b/OsmAnd/res/layout/select_folder_row.xml
@@ -1,7 +1,7 @@
 <?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:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/card_row_min_height"
 	android:background="?attr/list_background_color"
@@ -27,7 +27,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
-		android:drawableRight="@drawable/ic_action_markers_list"
 		android:drawablePadding="@dimen/content_padding_small_half"
 		android:drawableTint="?attr/active_color_basic"
 		android:ellipsize="end"
@@ -39,6 +38,7 @@
 		android:paddingRight="@dimen/content_padding_half"
 		android:text="@string/shared_string_list"
 		android:textColor="?attr/color_dialog_buttons"
+		app:srcCompat="@drawable/ic_action_markers_list"
 		osmand:typeface="@string/font_roboto_medium" />
 
 </LinearLayout>
\ No newline at end of file

From 1dddb08f54c7ab8818e863b5b86f42f202e8da6e Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Thu, 11 Mar 2021 11:12:58 +0200
Subject: [PATCH 2/2] Fix icon visibility and position

---
 OsmAnd/res/layout/select_folder_row.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/select_folder_row.xml b/OsmAnd/res/layout/select_folder_row.xml
index c8c5f4e600..1d855ff70f 100644
--- a/OsmAnd/res/layout/select_folder_row.xml
+++ b/OsmAnd/res/layout/select_folder_row.xml
@@ -28,7 +28,6 @@
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground"
 		android:drawablePadding="@dimen/content_padding_small_half"
-		android:drawableTint="?attr/active_color_basic"
 		android:ellipsize="end"
 		android:gravity="center_vertical"
 		android:maxLines="1"
@@ -38,7 +37,8 @@
 		android:paddingRight="@dimen/content_padding_half"
 		android:text="@string/shared_string_list"
 		android:textColor="?attr/color_dialog_buttons"
-		app:srcCompat="@drawable/ic_action_markers_list"
+		app:drawableEndCompat="@drawable/ic_action_markers_list"
+		app:drawableTint="?attr/active_color_basic"
 		osmand:typeface="@string/font_roboto_medium" />
 
 </LinearLayout>
\ No newline at end of file