From 078b41f2abf49e4ca9cc87fe2dea46ee4c39f275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredd=20Badilla=20V=C3=ADquez?=
 <freddalessandro2876@gmail.com>
Date: Wed, 18 Dec 2024 20:20:20 -0600
Subject: [PATCH] Solving issue #347
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The problem reported on the issue was wrong, all works good, the text doesn´t seen well, but it has a scrollbar to solve the problem, but when i was testing that i saw that the component on the trackmanager were loking bad and this in the available layouts section too, so i fixed that.

First, to the trackmaneger i put a line to the date or name to see text in a uniform way and separate the waypoints and trackpoints counter in two lines, this with the objetive of a friendly interface.

Second, to the available layouts, i put a scroll bar and the same adjust to the text that i used in the track manager, to see text in a properly way.
---
 .../osmtracker/activity/AvailableLayouts.java |   5 +-
 .../main/res/layout-iw/waypointlist_item.xml  |   2 -
 app/src/main/res/layout/available_layouts.xml |  17 +--
 app/src/main/res/layout/tracklist_item.xml    | 104 +++++++++++-------
 app/src/main/res/values/values.xml            |   2 +-
 5 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java b/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
index 30553259f..36b99b203 100644
--- a/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
+++ b/app/src/main/java/net/osmtracker/activity/AvailableLayouts.java
@@ -151,10 +151,11 @@ public void setAvailableLayouts(List<String> options) {
             Button layoutButton = new Button(this);
             layoutButton.setHeight(150);
             layoutButton.setText(CustomLayoutsUtils.convertFileName(option));
-            layoutButton.setTextSize((float)22 );
+            layoutButton.setTextSize(16f);
             layoutButton.setTextColor(Color.WHITE);
+            layoutButton.setSingleLine(false);
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-            layoutParams.setMargins(110, 0, 110, 0);
+            layoutParams.setMargins(50, 10, 50, 10);
             layoutButton.setLayoutParams(layoutParams);
             layoutButton.setPadding(10,20,10,20);
             layoutButton.setOnClickListener(listener);
diff --git a/app/src/main/res/layout-iw/waypointlist_item.xml b/app/src/main/res/layout-iw/waypointlist_item.xml
index 953fc6650..692226d2c 100644
--- a/app/src/main/res/layout-iw/waypointlist_item.xml
+++ b/app/src/main/res/layout-iw/waypointlist_item.xml
@@ -5,6 +5,4 @@
 	<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_timestamp" android:layout_height="wrap_content" android:text="{timestamp}" android:layout_below="@+id/wplist_item_location" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>
 	<TextView style="@android:style/TextAppearance.Large" android:layout_width="wrap_content" android:id="@+id/wplist_item_name" android:layout_height="wrap_content" android:text="{name}" android:layout_alignParentTop="true" android:layout_alignParentRight="true"></TextView>
 	<TextView android:layout_width="wrap_content" android:id="@+id/wplist_item_location" android:layout_height="wrap_content" android:text="{location}" android:layout_below="@+id/wplist_item_name" android:layout_alignParentLeft="true" android:layout_marginLeft="10dp"></TextView>
-
-	
 </RelativeLayout>
diff --git a/app/src/main/res/layout/available_layouts.xml b/app/src/main/res/layout/available_layouts.xml
index 3a6d16c14..540744ee4 100644
--- a/app/src/main/res/layout/available_layouts.xml
+++ b/app/src/main/res/layout/available_layouts.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="4dp"
-    android:id="@+id/root_layout">
+    android:fillViewport="true">
 
-
-</LinearLayout>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/root_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="5dp" />
+</ScrollView>
diff --git a/app/src/main/res/layout/tracklist_item.xml b/app/src/main/res/layout/tracklist_item.xml
index 4308c5aeb..c173862d6 100644
--- a/app/src/main/res/layout/tracklist_item.xml
+++ b/app/src/main/res/layout/tracklist_item.xml
@@ -41,53 +41,73 @@
 			style="@android:style/TextAppearance.Large"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:autoSizeTextType="uniform"   
+			android:maxLines="1"       
 			android:text="{start_date}" />
 
-		<TextView
-			android:id="@+id/trackmgr_item_waypoints"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@+id/trackmgr_item_nameordate"
-			android:layout_marginEnd="3dp"
-			android:layout_marginRight="3dp"
-			android:text="@string/trackmgr_waypoints_count"
-			android:textStyle="bold" />
+		<LinearLayout
+        android:id="@+id/waypoints_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/trackmgr_item_nameordate"
+        android:orientation="horizontal">
 
-		<TextView
-			android:id="@+id/trackmgr_item_wps"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toEndOf="@id/trackmgr_item_waypoints"
-			android:layout_toRightOf="@id/trackmgr_item_waypoints"
-			android:text="{x}" />
+			<TextView
+				android:id="@+id/trackmgr_item_waypoints"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@+id/trackmgr_item_nameordate"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginEnd="3dp"
+				android:layout_marginRight="3dp"
+				android:text="@string/trackmgr_waypoints_count"
+				android:textStyle="bold" />
 
-		<TextView
-			android:id="@+id/trackmgr_item_trackpoints"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_marginStart="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginEnd="3dp"
-			android:layout_marginRight="3dp"
-			android:layout_toEndOf="@id/trackmgr_item_wps"
-			android:layout_toRightOf="@id/trackmgr_item_wps"
-			android:text="@string/trackmgr_trackpoints_count"
-			android:textStyle="bold" />
+			<TextView
+				android:id="@+id/trackmgr_item_wps"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_toEndOf="@id/trackmgr_item_waypoints"
+				android:layout_toRightOf="@id/trackmgr_item_waypoints"
+				android:text="{x}" />
+		</LinearLayout>
 
-		<TextView
-			android:id="@+id/trackmgr_item_tps"
-			style="@android:style/TextAppearance.Small"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toEndOf="@id/trackmgr_item_trackpoints"
-			android:layout_toRightOf="@id/trackmgr_item_trackpoints"
-			android:text="{y}" />
+		<LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/waypoints_container"
+        android:orientation="horizontal">
+
+			<TextView
+				android:id="@+id/trackmgr_item_trackpoints"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_marginStart="8dp"
+				android:layout_marginLeft="8dp"
+				android:layout_marginEnd="3dp"
+				android:layout_marginRight="3dp"
+				android:layout_toEndOf="@id/trackmgr_item_wps"
+				android:layout_toRightOf="@id/trackmgr_item_wps"
+				android:text="@string/trackmgr_trackpoints_count"
+				android:textStyle="bold" />
+
+			<TextView
+				android:id="@+id/trackmgr_item_tps"
+				style="@android:style/TextAppearance.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/trackmgr_item_nameordate"
+				android:layout_toEndOf="@id/trackmgr_item_trackpoints"
+				android:layout_toRightOf="@id/trackmgr_item_trackpoints"
+				android:text="{y}" />
+
+		</LinearLayout>
 
 	</RelativeLayout>
 
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 91590768b..e34d0695d 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -3,5 +3,5 @@
 
 	<string name="about_link"><a href="https://github.com/labexp/osmtracker-android">https://github.com/labexp/osmtracker-android</a></string>
     <string name="about_translate_link">https://www.transifex.com/projects/p/osmtracker-android/</string>
-    
+
 </resources>