From c523a441a7ecd6a710ebc210ba7944871365cde0 Mon Sep 17 00:00:00 2001
From: Andy Porras <andyporras6@gmail.com>
Date: Wed, 8 Oct 2025 23:39:26 -0600
Subject: [PATCH 1/2] Clear the text fields in the track details editor

The previous design used hints to label the name, description, and tags fields. These hints disappeared when the fields were filled in automatically, causing confusion for the user about the purpose of each field.

This change introduces permanent text labels (TextView) above each input field. This ensures that the function of each field is always visible, significantly improving the usability of the screen.

Fixes #609
---
 .../main/res/layout/trackdetail_fields.xml    | 51 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/trackdetail_fields.xml b/app/src/main/res/layout/trackdetail_fields.xml
index 5272ede4f..c42734a2c 100644
--- a/app/src/main/res/layout/trackdetail_fields.xml
+++ b/app/src/main/res/layout/trackdetail_fields.xml
@@ -1,38 +1,67 @@
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:parentTag="android.widget.LinearLayout">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/trackdetail_name_and_title" />
 
     <EditText
         android:id="@+id/trackdetail_item_name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:hint="@string/trackdetail_name"
         android:inputType="text"
+        android:minHeight="48dp"
         android:singleLine="true" />
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/trackdetail_description" />
+
     <EditText
         android:id="@+id/trackdetail_item_description"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/trackdetail_item_name"
-        android:layout_margin="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:hint="@string/trackdetail_description"
         android:inputType="text"
+        android:minHeight="48dp"
         android:singleLine="false" />
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/trackdetail_tags" />
+
     <EditText
         android:id="@+id/trackdetail_item_tags"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/trackdetail_item_description"
-        android:layout_margin="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:hint="@string/trackdetail_tags"
         android:inputType="text"
+        android:minHeight="48dp"
         android:singleLine="true" />
 
     <Spinner
         android:id="@+id/trackdetail_item_osm_visibility"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/trackdetail_item_tags" />
+        android:layout_marginTop="8dp"
+        android:minHeight="48dp" />
 
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01977f784..4b12833ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
     <string name="trackdetail_osm_upload_notyet">(Not uploaded yet)</string>
     <string name="trackdetail_export_display">Display</string>
     <string name="trackdetail_name">Name</string>
+    <string name="trackdetail_name_and_title">Name and title</string>
     <string name="trackdetail_description">Description</string>
     <string name="trackdetail_tags">Tags (comma separated)</string>
     <string name="trackdetail_description_mandatory">You must enter a description</string>

From 6e5d9b59cf992a8071ba1169fb0c836c1bc9e862 Mon Sep 17 00:00:00 2001
From: Andy Porras <andyporras6@gmail.com>
Date: Sun, 9 Nov 2025 13:00:04 -0600
Subject: [PATCH 2/2] Deletion of confusing string

---
 app/src/main/res/layout/trackdetail_fields.xml | 15 +++++++++++----
 app/src/main/res/values/strings.xml            |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/trackdetail_fields.xml b/app/src/main/res/layout/trackdetail_fields.xml
index c42734a2c..21db4b246 100644
--- a/app/src/main/res/layout/trackdetail_fields.xml
+++ b/app/src/main/res/layout/trackdetail_fields.xml
@@ -8,7 +8,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginTop="8dp"
-        android:text="@string/trackdetail_name_and_title" />
+        android:text="@string/trackdetail_name"
+        android:textSize="20sp"
+        android:textColor="@color/colorPrimaryText" />
 
     <EditText
         android:id="@+id/trackdetail_item_name"
@@ -19,14 +21,17 @@
         android:hint="@string/trackdetail_name"
         android:inputType="text"
         android:minHeight="48dp"
-        android:singleLine="true" />
+        android:singleLine="true"
+         />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginTop="8dp"
-        android:text="@string/trackdetail_description" />
+        android:text="@string/trackdetail_description"
+        android:textSize="20sp"
+        android:textColor="@color/colorPrimaryText" />
 
     <EditText
         android:id="@+id/trackdetail_item_description"
@@ -44,7 +49,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginTop="8dp"
-        android:text="@string/trackdetail_tags" />
+        android:text="@string/trackdetail_tags"
+        android:textSize="20sp"
+        android:textColor="@color/colorPrimaryText" />
 
     <EditText
         android:id="@+id/trackdetail_item_tags"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b12833ab..01977f784 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,7 +68,6 @@
     <string name="trackdetail_osm_upload_notyet">(Not uploaded yet)</string>
     <string name="trackdetail_export_display">Display</string>
     <string name="trackdetail_name">Name</string>
-    <string name="trackdetail_name_and_title">Name and title</string>
     <string name="trackdetail_description">Description</string>
     <string name="trackdetail_tags">Tags (comma separated)</string>
     <string name="trackdetail_description_mandatory">You must enter a description</string>