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] 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