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