From dde4bc18bbead42d8d1c9c6c955bd7342a45abf6 Mon Sep 17 00:00:00 2001
From: androiddevkkotlin <androidkotlin@protonmail.ch>
Date: Fri, 13 Nov 2020 14:03:54 +0200
Subject: [PATCH 1/5] Fix appearance

---
 OsmAnd/res/layout/send_gpx_fragment.xml       | 19 ++++++++++++-------
 .../dialogs/SendGpxBottomSheetFragment.java   |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/res/layout/send_gpx_fragment.xml b/OsmAnd/res/layout/send_gpx_fragment.xml
index 333030a190..7981ad801f 100644
--- a/OsmAnd/res/layout/send_gpx_fragment.xml
+++ b/OsmAnd/res/layout/send_gpx_fragment.xml
@@ -41,7 +41,9 @@
 				android:id="@+id/message_field"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:imeOptions="actionDone" />
+				android:imeOptions="actionDone"
+				android:background = "#E5E5E5"
+				android:paddingTop = "@dimen/empty_state_image_margin_bottom"/>
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<com.google.android.material.textfield.TextInputLayout
@@ -60,7 +62,9 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone"
-				android:text="osmand"/>
+				android:text="osmand"
+				android:background = "#E5E5E5"
+				android:paddingTop = "@dimen/empty_state_image_margin_bottom"/>
 		</com.google.android.material.textfield.TextInputLayout>
 
 	</LinearLayout>
@@ -86,7 +90,7 @@
 			android:paddingBottom="@dimen/context_menu_first_line_top_margin"
 			android:text="@string/gpx_visibility_txt"
 			android:textColor="?android:textColorPrimary"
-			android:textSize="@dimen/default_desc_text_size"
+			android:textSize="@dimen/default_list_text_size"
 			osmand:typeface="@string/font_roboto_regular" />
 
 		<net.osmand.plus.widgets.TextViewEx
@@ -125,6 +129,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:letterSpacing="@dimen/description_letter_spacing"
+		android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingTop="@dimen/context_menu_first_line_top_margin"
 		android:paddingRight="@dimen/content_padding"
@@ -178,8 +183,8 @@
 				android:letterSpacing="@dimen/text_button_letter_spacing"
 				android:singleLine="true"
 				android:text="@string/login_account"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/default_list_text_size"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/default_desc_text_size"
 				osmand:typeface="@string/font_roboto_regular" />
 
 			<net.osmand.plus.widgets.TextViewEx
@@ -188,8 +193,8 @@
 				android:layout_height="wrap_content"
 				android:letterSpacing="@dimen/description_letter_spacing"
 				android:maxLines="4"
-				android:textColor="?android:textColorSecondary"
-				android:textSize="@dimen/default_desc_text_size"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size"
 				osmand:typeface="@string/font_roboto_regular" />
 
 		</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java
index c47f757a92..35c6a6ec69 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java
@@ -71,6 +71,7 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
 		String fileName = gpxInfos[0].getFileName();
 		messageField.setText(Algorithms.getFileNameWithoutExtension(fileName));
+		messageField.setSelection(messageField.getText().length());
 
 		final TextView visibilityName = sendOsmPoiView.findViewById(R.id.visibility_name);
 		final TextView visibilityDescription = sendOsmPoiView.findViewById(R.id.visibility_description);

From 2531c6110838e88952359ab2356ac2987e5b7e02 Mon Sep 17 00:00:00 2001
From: androiddevkkotlin <androidkotlin@protonmail.ch>
Date: Fri, 13 Nov 2020 14:20:08 +0200
Subject: [PATCH 2/5] Account block

---
 OsmAnd/res/layout/send_gpx_fragment.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/send_gpx_fragment.xml b/OsmAnd/res/layout/send_gpx_fragment.xml
index 7981ad801f..c689b53086 100644
--- a/OsmAnd/res/layout/send_gpx_fragment.xml
+++ b/OsmAnd/res/layout/send_gpx_fragment.xml
@@ -180,7 +180,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:ellipsize="marquee"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
 				android:singleLine="true"
 				android:text="@string/login_account"
 				android:textColor="?android:textColorSecondary"
@@ -191,10 +192,11 @@
 				android:id="@+id/user_name"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:letterSpacing="@dimen/description_letter_spacing"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:lineSpacingExtra="5dp"
 				android:maxLines="4"
 				android:textColor="?android:textColorPrimary"
-				android:textSize="@dimen/default_list_text_size"
+				android:textSize="@dimen/default_desc_text_size"
 				osmand:typeface="@string/font_roboto_regular" />
 
 		</LinearLayout>

From 130469d8114b9aa33273522694347127baf93ced Mon Sep 17 00:00:00 2001
From: androiddevkkotlin <androidkotlin@protonmail.ch>
Date: Fri, 13 Nov 2020 16:08:42 +0200
Subject: [PATCH 3/5] Color Material

---
 OsmAnd/res/layout/send_gpx_fragment.xml | 7 +++----
 OsmAnd/res/values/attrs.xml             | 1 +
 OsmAnd/res/values/colors.xml            | 2 ++
 OsmAnd/res/values/styles.xml            | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/send_gpx_fragment.xml b/OsmAnd/res/layout/send_gpx_fragment.xml
index c689b53086..5f66120778 100644
--- a/OsmAnd/res/layout/send_gpx_fragment.xml
+++ b/OsmAnd/res/layout/send_gpx_fragment.xml
@@ -40,9 +40,9 @@
 			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/message_field"
 				android:layout_width="match_parent"
+				android:background = "?attr/background_field"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone"
-				android:background = "#E5E5E5"
 				android:paddingTop = "@dimen/empty_state_image_margin_bottom"/>
 		</com.google.android.material.textfield.TextInputLayout>
 
@@ -62,9 +62,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone"
-				android:text="osmand"
-				android:background = "#E5E5E5"
-				android:paddingTop = "@dimen/empty_state_image_margin_bottom"/>
+				android:background = "?attr/background_field"
+				android:text="osmand" />
 		</com.google.android.material.textfield.TextInputLayout>
 
 	</LinearLayout>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 8e8c8aee32..3ef63acbbd 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -138,6 +138,7 @@
 		<attr name="btn_radio_button_right" format="reference"/>
 		<attr name="btn_radio_button_center" format="reference"/>
 		<attr name="bg_dash_line" format="reference"/>
+		<attr name="background_field" format="reference"/>
 	</declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 1b1e9bde50..ccb1b4f54f 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -477,5 +477,7 @@
 	<color name="switch_button_active_stroke_dark">#80D28521</color>
 	<color name="empty_hint_bg">#80000000</color>
 	<color name="input_layout_bg_color">#4DCCCCCC</color>
+	<color name="background_field_light">#14000000</color>
+	<color name="background_field_dark">#0DFFFFFF</color>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index d96c5fa196..75c5530c95 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -245,6 +245,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
+        <item name="background_field">@color/background_field_light</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -539,6 +540,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
+        <item name="background_field">@color/background_field_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">

From e52f0060da204dbe6ca67d16a84ce27de978d80c Mon Sep 17 00:00:00 2001
From: androiddevkkotlin <androidkotlin@protonmail.ch>
Date: Fri, 13 Nov 2020 16:59:56 +0200
Subject: [PATCH 4/5] Fix names, fix conflicts

---
 OsmAnd/res/layout/send_gpx_fragment.xml | 4 ++--
 OsmAnd/res/values/attrs.xml             | 2 +-
 OsmAnd/res/values/styles.xml            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/send_gpx_fragment.xml b/OsmAnd/res/layout/send_gpx_fragment.xml
index 91ad141d74..fd3d7ff16e 100644
--- a/OsmAnd/res/layout/send_gpx_fragment.xml
+++ b/OsmAnd/res/layout/send_gpx_fragment.xml
@@ -39,7 +39,7 @@
 			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/message_field"
 				android:layout_width="match_parent"
-				android:background = "?attr/background_field"
+				android:background = "?attr/text_input_background"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone" />
 
@@ -61,7 +61,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionDone"
-				android:background = "?attr/background_field"
+				android:background = "?attr/text_input_background"
 				android:text="osmand" />
 		</com.google.android.material.textfield.TextInputLayout>
 
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 3ef63acbbd..ae88075cb7 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -138,7 +138,7 @@
 		<attr name="btn_radio_button_right" format="reference"/>
 		<attr name="btn_radio_button_center" format="reference"/>
 		<attr name="bg_dash_line" format="reference"/>
-		<attr name="background_field" format="reference"/>
+		<attr name="text_input_background" format="reference"/>
 	</declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 75c5530c95..5b0e2789bb 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -245,7 +245,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
-        <item name="background_field">@color/background_field_light</item>
+        <item name="text_input_background">@color/background_field_light</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -540,7 +540,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
-        <item name="background_field">@color/background_field_dark</item>
+        <item name="text_input_background">@color/background_field_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">

From 25bebf2e71a343f42e5d9fd64aa9fb5bc81dd21d Mon Sep 17 00:00:00 2001
From: androiddevkkotlin <androidkotlin@protonmail.ch>
Date: Fri, 13 Nov 2020 17:05:20 +0200
Subject: [PATCH 5/5] Colors rename

---
 OsmAnd/res/values/colors.xml | 4 ++--
 OsmAnd/res/values/styles.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index ccb1b4f54f..3e9a872edb 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -477,7 +477,7 @@
 	<color name="switch_button_active_stroke_dark">#80D28521</color>
 	<color name="empty_hint_bg">#80000000</color>
 	<color name="input_layout_bg_color">#4DCCCCCC</color>
-	<color name="background_field_light">#14000000</color>
-	<color name="background_field_dark">#0DFFFFFF</color>
+	<color name="text_input_background_light">#14000000</color>
+	<color name="text_input_background_dark">#0DFFFFFF</color>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 5b0e2789bb..50432d35a9 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -245,7 +245,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
-        <item name="text_input_background">@color/background_field_light</item>
+        <item name="text_input_background">@color/text_input_background_light</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -540,7 +540,7 @@
         <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
         <item name="checkboxStyle">@style/CheckboxStyle</item>
         <item name="radioButtonStyle">@style/RadioButtonStyle</item>
-        <item name="text_input_background">@color/background_field_dark</item>
+        <item name="text_input_background">@color/text_input_background_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">