Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix names, fix conflicts

Browse source
This commit is contained in:
androiddevkkotlin 2020-11-13 16:59:56 +02:00
parent cc6fd93d7f
commit e52f0060da
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/send_gpx_fragment.xml
View file

@ -39,7 +39,7 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/message_field" android:id="@+id/message_field"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background = "?attr/background_field" android:background = "?attr/text_input_background"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" /> android:imeOptions="actionDone" />
@ -61,7 +61,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:background = "?attr/background_field" android:background = "?attr/text_input_background"
android:text="osmand" /> android:text="osmand" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

2
OsmAnd/res/values/attrs.xml
View file

@ -138,7 +138,7 @@
<attr name="btn_radio_button_right" format="reference"/> <attr name="btn_radio_button_right" format="reference"/>
<attr name="btn_radio_button_center" format="reference"/> <attr name="btn_radio_button_center" format="reference"/>
<attr name="bg_dash_line" 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>
<declare-styleable name="PagerSlidingTabStrip"> <declare-styleable name="PagerSlidingTabStrip">

4
OsmAnd/res/values/styles.xml
View file

@ -245,7 +245,7 @@
<item name="btn_radio_button_center">@drawable/radio_button_center_light</item> <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
<item name="checkboxStyle">@style/CheckboxStyle</item> <item name="checkboxStyle">@style/CheckboxStyle</item>
<item name="radioButtonStyle">@style/RadioButtonStyle</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>
<style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> <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="btn_radio_button_center">@drawable/radio_button_center_dark</item>
<item name="checkboxStyle">@style/CheckboxStyle</item> <item name="checkboxStyle">@style/CheckboxStyle</item>
<item name="radioButtonStyle">@style/RadioButtonStyle</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>
<style name="FreeVersionBanner" parent="OsmandDarkTheme"> <style name="FreeVersionBanner" parent="OsmandDarkTheme">