From 55a1669afbfcd6d4d68aaf11f75702626c390da3 Mon Sep 17 00:00:00 2001
From: Skalii <skaliy.d@gmail.com>
Date: Fri, 29 Jan 2021 18:12:20 +0200
Subject: [PATCH] fix max-width in stats block; fix align icon to the right in
 stats block

---
 OsmAnd/res/layout/item_gpx_stat_block.xml | 44 +++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/layout/item_gpx_stat_block.xml b/OsmAnd/res/layout/item_gpx_stat_block.xml
index 18dfa5cdde..dd0ed2a571 100644
--- a/OsmAnd/res/layout/item_gpx_stat_block.xml
+++ b/OsmAnd/res/layout/item_gpx_stat_block.xml
@@ -10,43 +10,59 @@
 	android:orientation="horizontal">
 
 	<LinearLayout
-		android:layout_width="match_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:layout_marginEnd="@dimen/content_padding"
 		android:layout_marginRight="@dimen/content_padding"
+		android:gravity="center_vertical"
+		android:maxWidth="@dimen/grid_menu_item_width"
 		android:orientation="vertical">
 
 		<LinearLayout
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="horizontal">
+			android:gravity="center_vertical"
+			android:orientation="horizontal"
+			android:weightSum="2">
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/value"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_weight="1"
 				android:background="@null"
+				android:lines="1"
 				android:textColor="?android:attr/textColorPrimary"
 				android:textSize="@dimen/default_desc_text_size"
 				osmand:typeface="@string/font_roboto_medium"
 				tools:text="700 km" />
 
-			<androidx.appcompat.widget.AppCompatImageView
-				android:id="@+id/image"
-				android:layout_width="@dimen/context_menu_transport_icon_size"
-				android:layout_height="@dimen/context_menu_transport_icon_size"
-				android:layout_gravity="center_vertical"
-				android:layout_marginStart="@dimen/context_menu_first_line_top_margin"
-				android:layout_marginLeft="@dimen/context_menu_first_line_top_margin"
-				tools:src="@drawable/ic_action_track_16" />
+			<FrameLayout
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_marginStart="@dimen/content_padding_half"
+				android:layout_marginLeft="@dimen/content_padding_half"
+				android:layout_weight="1">
+
+				<androidx.appcompat.widget.AppCompatImageView
+					android:id="@+id/image"
+					android:layout_width="@dimen/context_menu_transport_icon_size"
+					android:layout_height="@dimen/context_menu_transport_icon_size"
+					android:layout_gravity="center_vertical|end"
+					tools:src="@drawable/ic_action_track_16" />
+
+			</FrameLayout>
 
 		</LinearLayout>
 
 		<TextView
 			android:id="@+id/title"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:background="@null"
+			android:ellipsize="end"
+			android:lines="1"
+			android:maxWidth="@dimen/grid_menu_item_width"
 			android:textColor="?android:attr/textColorSecondary"
 			android:textSize="@dimen/default_desc_text_size"
 			tools:text="@string/distance" />