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

UI fix: POI/OSM Note, Send GPX , Login/Password.

Browse source 
TextFields Background color make the same for all textfields.
Textfield top right and left rounded corners are missing.
Account block, check text styles and sizes and size in Figma.
 If the text filed not empty, put the cursor at the end of the text.
This commit is contained in:
androiddevkkotlin 2020-11-17 01:34:24 +02:00
parent 0c449093df
commit 06edbffb5d
7 changed files with 301 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/res/layout/osm_login_data.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -29,7 +30,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:hint="@string/user_login"> android:hint="@string/user_login"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange"
app:hintTextColor="@color/text_color_secondary_light">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/name_edit_text" android:id="@+id/name_edit_text"
@ -43,7 +47,10 @@
android:id="@+id/password_text_box" android:id="@+id/password_text_box"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/user_password"> android:hint="@string/user_password"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange"
app:hintTextColor="@color/text_color_secondary_light">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/password_edit_text" android:id="@+id/password_edit_text"

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

@ -33,13 +33,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:hint="@string/shared_string_description" android:hint="@string/shared_string_description"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange" app:boxStrokeColor="@color/osmand_orange"
app:hintTextColor="@color/text_color_secondary_light"> app:hintTextColor="@color/text_color_secondary_light">
<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/text_input_background"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" /> android:imeOptions="actionDone" />
@ -51,6 +51,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:hint="@string/gpx_tags_txt" android:hint="@string/gpx_tags_txt"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange" app:boxStrokeColor="@color/osmand_orange"
app:helperText="@string/enter_text_separated" app:helperText="@string/enter_text_separated"
app:helperTextEnabled="true" app:helperTextEnabled="true"
@ -62,7 +63,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/subHeaderPadding" android:layout_marginBottom="@dimen/subHeaderPadding"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:background = "?attr/text_input_background"
android:text="osmand" /> android:text="osmand" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -144,45 +144,41 @@
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider" />
<LinearLayout <LinearLayout
android:id="@+id/account_block" android:layout_width="360dp"
android:layout_width="match_parent" android:layout_height="48dp"
android:layout_height="wrap_content" android:layout_marginTop="9dp"
android:minHeight="@dimen/context_menu_buttons_bottom_height" android:minHeight="@dimen/context_menu_buttons_bottom_height"
tools:background="?android:attr/selectableItemBackground"> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/route_info_buttons_padding_left_right"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/route_info_buttons_padding_left_right"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large"
android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
android:tint="@color/active_buttons_and_links_text_disabled_light" android:tint="@color/active_buttons_and_links_text_disabled_light"
osmand:srcCompat="@drawable/ic_action_user_account" /> osmand:srcCompat="@drawable/ic_action_user_account" />
<RelativeLayout
android:id="@+id/padding_ver"
android:layout_width="32dp"
android:layout_height="36dp"
android:layout_marginTop="6dp"
android:alpha="0.01" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="216dp"
android:layout_height="wrap_content" android:layout_height="@dimen/bottom_sheet_descr_height"
android:layout_gravity="center_vertical" android:gravity="center_vertical"
android:layout_weight="1" android:orientation="vertical">
android:orientation="vertical"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/account_name" android:id="@+id/account_title"
android:layout_width="match_parent" android:layout_width="216dp"
android:layout_height="wrap_content" android:layout_height="@dimen/context_menu_padding_margin_large"
android:ellipsize="marquee" android:layout_marginTop="@dimen/subHeaderPadding"
android:letterSpacing="@dimen/description_letter_spacing" android:gravity="center_vertical"
android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin" android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
android:singleLine="true"
android:text="@string/login_account" android:text="@string/login_account"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_desc_text_size"
@ -190,17 +186,18 @@
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/user_name" android:id="@+id/user_name"
android:layout_width="match_parent" android:layout_width="216dp"
android:layout_height="wrap_content" android:layout_height="@dimen/context_menu_sub_info_height"
android:letterSpacing="@dimen/text_button_letter_spacing" android:layout_marginBottom="@dimen/subHeaderPadding"
android:lineSpacingExtra="5dp" android:gravity="center_vertical"
android:maxLines="4" android:letterSpacing="@dimen/description_letter_spacing"
android:lineSpacingExtra="5sp"
android:text="@string/login_account"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

297
OsmAnd/res/layout/send_osm_note_fragment.xml
View file

@ -1,169 +1,178 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:osmand="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent"
android:orientation="vertical"> android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding">
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/note_hint" android:id="@+id/note_hint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:hint="@string/osn_bug_name"> android:hint="@string/osn_bug_name"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange"
app:hintTextColor="@color/text_color_secondary_light">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/note_text" android:id="@+id/note_text"
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"
</com.google.android.material.textfield.TextInputLayout> android:lineSpacingExtra="5sp"/>
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/upload_anonymously_switch" android:id="@+id/upload_anonymously_switch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minHeight="@dimen/context_menu_buttons_bottom_height" android:layout_marginBottom="@dimen/content_padding_small"
android:layout_marginBottom="@dimen/content_padding_small" android:letterSpacing="@dimen/text_button_letter_spacing"
android:paddingBottom="@dimen/content_padding_small" android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:paddingTop="@dimen/content_padding_small" android:paddingLeft="@dimen/content_padding_small"
android:paddingLeft="@dimen/content_padding_small" android:paddingTop="@dimen/content_padding_small"
android:paddingRight="@dimen/content_padding_small" android:paddingRight="@dimen/content_padding_small"
android:text="@string/upload_anonymously" android:paddingBottom="@dimen/content_padding_small"
android:textColor="?android:textColorPrimary" android:text="@string/upload_anonymously"
android:textSize="@dimen/default_list_text_size" android:textColor="?android:textColorPrimary"
android:letterSpacing="@dimen/text_button_letter_spacing" android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" /> osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/account_container" android:id="@+id/account_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/text_margin_small" android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:minHeight="@dimen/context_menu_buttons_bottom_height" android:orientation="vertical"
android:orientation="vertical"> android:paddingTop="@dimen/text_margin_small">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_padding_half"
android:minHeight="@dimen/context_menu_buttons_bottom_height">
<androidx.appcompat.widget.AppCompatImageView <LinearLayout
android:id="@android:id/icon" android:layout_width="360dp"
android:layout_width="@dimen/standard_icon_size" android:layout_height="48dp"
android:layout_height="@dimen/standard_icon_size" android:layout_marginTop="9dp"
android:layout_gravity="center" android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:layout_marginLeft="@dimen/content_padding" android:orientation="horizontal">
android:layout_marginRight="@dimen/content_padding"
osmand:srcCompat="@drawable/ic_action_user_account"
android:tint="@color/active_buttons_and_links_text_disabled_light"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<LinearLayout <androidx.appcompat.widget.AppCompatImageView
android:layout_width="0dp" android:id="@android:id/icon"
android:layout_height="wrap_content" android:layout_width="@dimen/route_info_buttons_padding_left_right"
android:layout_gravity="center_vertical" android:layout_height="@dimen/route_info_buttons_padding_left_right"
android:layout_weight="1" android:layout_gravity="center"
android:orientation="vertical" android:layout_marginLeft="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:tint="@color/active_buttons_and_links_text_disabled_light"
android:paddingRight="@dimen/content_padding" osmand:srcCompat="@drawable/ic_action_user_account" />
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <RelativeLayout
android:id="@+id/account_title" android:id="@+id/padding_ver"
android:layout_width="match_parent" android:layout_width="32dp"
android:layout_height="wrap_content" android:layout_height="36dp"
android:ellipsize="marquee" android:layout_marginTop="6dp"
android:letterSpacing="@dimen/text_button_letter_spacing" android:alpha="0.01" />
android:singleLine="true"
android:text="@string/login_account"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <LinearLayout
android:id="@+id/user_name" android:layout_width="216dp"
android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_descr_height"
android:layout_height="wrap_content" android:gravity="center_vertical"
android:letterSpacing="@dimen/description_letter_spacing" android:orientation="vertical">
android:maxLines="4"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> <net.osmand.plus.widgets.TextViewEx
android:id="@+id/account_title"
android:layout_width="216dp"
android:layout_height="@dimen/context_menu_padding_margin_large"
android:layout_marginTop="@dimen/subHeaderPadding"
android:gravity="center_vertical"
android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
android:text="@string/login_account"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> <net.osmand.plus.widgets.TextViewEx
android:id="@+id/user_name"
android:layout_width="216dp"
android:layout_height="@dimen/context_menu_sub_info_height"
android:layout_marginBottom="@dimen/subHeaderPadding"
android:gravity="center_vertical"
android:letterSpacing="@dimen/description_letter_spacing"
android:lineSpacingExtra="5sp"
android:text="@string/login_account"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
<LinearLayout </LinearLayout>
android:id="@+id/sign_in_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/text_margin_small"
android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:orientation="vertical">
<View <LinearLayout
android:layout_width="match_parent" android:id="@+id/sign_in_container"
android:layout_height="1dp" android:layout_width="match_parent"
android:background="?attr/dashboard_divider" /> android:layout_height="wrap_content"
android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:orientation="vertical"
android:paddingTop="@dimen/text_margin_small">
<net.osmand.plus.widgets.TextViewEx <View
android:id="@+id/description" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="wrap_content" android:background="?attr/dashboard_divider" />
android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
android:textColor="?android:textColorPrimary"
android:paddingTop="@dimen/content_padding_small"
android:paddingLeft="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_small"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular"
android:text="@string/osm_login_descr" />
<include <net.osmand.plus.widgets.TextViewEx
android:id="@+id/sign_in_button" android:id="@+id/description"
layout="@layout/bottom_sheet_dialog_button" android:layout_width="match_parent"
android:layout_marginBottom="@dimen/content_padding_half" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/content_padding" android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
android:layout_marginRight="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:layout_width="match_parent" android:paddingLeft="@dimen/content_padding"
android:layout_height="@dimen/dialog_button_height" /> android:paddingTop="@dimen/content_padding_small"
android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_small"
android:text="@string/osm_login_descr"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<include <include
android:id="@+id/login_button" android:id="@+id/sign_in_button"
layout="@layout/bottom_sheet_dialog_button" layout="@layout/bottom_sheet_dialog_button"
android:layout_marginTop="@dimen/content_padding_small" android:layout_width="match_parent"
android:layout_marginBottom="@dimen/content_padding" android:layout_height="@dimen/dialog_button_height"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_width="match_parent" android:layout_marginBottom="@dimen/content_padding_half" />
android:layout_height="@dimen/dialog_button_height" />
</LinearLayout> <include
android:id="@+id/login_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding_small"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginBottom="@dimen/content_padding" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

202
OsmAnd/res/layout/send_poi_fragment.xml
View file

@ -1,123 +1,127 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent"
xmlns:osmand="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/content_padding" android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding" android:paddingLeft="@dimen/content_padding"
android:paddingTop="@dimen/bottom_sheet_content_margin" android:paddingTop="@dimen/bottom_sheet_content_margin"
android:paddingEnd="@dimen/content_padding" android:paddingEnd="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"> android:paddingRight="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:text="@string/upload_poi" android:letterSpacing="@dimen/text_button_letter_spacing"
android:textSize="@dimen/default_list_text_size" android:text="@string/upload_poi"
osmand:typeface="@string/font_roboto_medium" android:textSize="@dimen/default_list_text_size"
android:letterSpacing="@dimen/text_button_letter_spacing"/> osmand:typeface="@string/font_roboto_medium" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/message_label" android:id="@+id/message_label"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:layout_marginBottom="@dimen/bottom_sheet_content_margin"
android:hint="@string/shared_string_message"> android:hint="@string/shared_string_message"
app:boxBackgroundColor="?attr/text_input_background"
app:boxStrokeColor="@color/osmand_orange"
app:hintTextColor="@color/text_color_secondary_light">
<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:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionDone" /> android:imeOptions="actionDone"
android:lineSpacingExtra="5sp"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
android:id="@+id/close_change_set_checkbox" android:id="@+id/close_change_set_checkbox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/content_padding" android:layout_marginBottom="@dimen/content_padding"
android:minHeight="@dimen/context_menu_buttons_bottom_height" android:letterSpacing="@dimen/text_button_letter_spacing"
android:text="@string/close_changeset" android:minHeight="@dimen/context_menu_buttons_bottom_height"
android:paddingLeft="@dimen/content_padding_small" android:paddingLeft="@dimen/content_padding_small"
android:paddingRight="@dimen/content_padding_small" android:paddingRight="@dimen/content_padding_small"
android:textColor="?android:textColorPrimary" android:text="@string/close_changeset"
android:textSize="@dimen/default_list_text_size" android:textColor="?android:textColorPrimary"
osmand:typeface="@string/font_roboto_regular" android:textSize="@dimen/default_list_text_size"
android:letterSpacing="@dimen/text_button_letter_spacing" /> osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider" />
<LinearLayout <LinearLayout
android:id="@+id/account_container" android:layout_width="360dp"
android:layout_width="match_parent" android:layout_height="48dp"
android:layout_height="wrap_content" android:layout_marginTop="9dp"
android:minHeight="@dimen/context_menu_buttons_bottom_height" android:minHeight="@dimen/context_menu_buttons_bottom_height"
tools:background="?android:attr/selectableItemBackground"> android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/route_info_buttons_padding_left_right"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/route_info_buttons_padding_left_right"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/bottom_sheet_icon_margin" android:tint="@color/active_buttons_and_links_text_disabled_light"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin_large" osmand:srcCompat="@drawable/ic_action_user_account" />
android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
osmand:srcCompat="@drawable/ic_action_user_account"
android:tint="@color/active_buttons_and_links_text_disabled_light"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
<LinearLayout <RelativeLayout
android:layout_width="0dp" android:id="@+id/padding_ver"
android:layout_height="wrap_content" android:layout_width="32dp"
android:layout_gravity="center_vertical" android:layout_height="36dp"
android:layout_weight="1" android:layout_marginTop="6dp"
android:orientation="vertical" android:alpha="0.01" />
android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding">
<net.osmand.plus.widgets.TextViewEx <LinearLayout
android:id="@+id/account_name" android:layout_width="216dp"
android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_descr_height"
android:layout_height="wrap_content" android:gravity="center_vertical"
android:ellipsize="marquee" android:orientation="vertical">
android:singleLine="true"
android:letterSpacing="@dimen/text_button_letter_spacing"
android:text="@string/login_account"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:id="@+id/user_name" android:id="@+id/account_title"
android:layout_width="match_parent" android:layout_width="216dp"
android:layout_height="wrap_content" android:layout_height="@dimen/context_menu_padding_margin_large"
android:letterSpacing="@dimen/description_letter_spacing" android:layout_marginTop="@dimen/subHeaderPadding"
android:maxLines="4" android:gravity="center_vertical"
android:textColor="?android:textColorSecondary" android:lineSpacingExtra="@dimen/map_widget_text_small_bottom_margin"
android:textSize="@dimen/default_desc_text_size" android:text="@string/login_account"
osmand:typeface="@string/font_roboto_regular" /> android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> <net.osmand.plus.widgets.TextViewEx
android:id="@+id/user_name"
android:layout_width="216dp"
android:layout_height="@dimen/context_menu_sub_info_height"
android:layout_marginBottom="@dimen/subHeaderPadding"
android:gravity="center_vertical"
android:letterSpacing="@dimen/description_letter_spacing"
android:lineSpacingExtra="5sp"
android:text="@string/login_account"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
osmand:typeface="@string/font_roboto_regular" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

4
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
View file

@ -6,6 +6,7 @@ import android.view.ContextThemeWrapper;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@ -71,8 +72,9 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen
final View sendOsmNoteView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), final View sendOsmNoteView = View.inflate(new ContextThemeWrapper(getContext(), themeRes),
R.layout.send_osm_note_fragment, null); R.layout.send_osm_note_fragment, null);
TextView noteText = sendOsmNoteView.findViewById(R.id.note_text); EditText noteText = sendOsmNoteView.findViewById(R.id.note_text);
noteText.setText(((OsmNotesPoint) poi[0]).getText()); noteText.setText(((OsmNotesPoint) poi[0]).getText());
noteText.setSelection(noteText.getText().length());
TextInputLayout noteHint = sendOsmNoteView.findViewById(R.id.note_hint); TextInputLayout noteHint = sendOsmNoteView.findViewById(R.id.note_hint);
noteHint.setHint(AndroidUtils.addColon(app, R.string.osn_bug_name)); noteHint.setHint(AndroidUtils.addColon(app, R.string.osn_bug_name));
accountBlockView = sendOsmNoteView.findViewById(R.id.account_container); accountBlockView = sendOsmNoteView.findViewById(R.id.account_container);

1
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
View file

@ -60,6 +60,7 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
messageEditText = sendOsmPoiView.findViewById(R.id.message_field); messageEditText = sendOsmPoiView.findViewById(R.id.message_field);
String defaultChangeSet = createDefaultChangeSet(app); String defaultChangeSet = createDefaultChangeSet(app);
messageEditText.setText(defaultChangeSet); messageEditText.setText(defaultChangeSet);
messageEditText.setSelection(messageEditText.getText().length());
final TextView accountName = sendOsmPoiView.findViewById(R.id.user_name); final TextView accountName = sendOsmPoiView.findViewById(R.id.user_name);
OsmandSettings settings = app.getSettings(); OsmandSettings settings = app.getSettings();
String userNameOAuth = settings.USER_DISPLAY_NAME.get(); String userNameOAuth = settings.USER_DISPLAY_NAME.get();

7
OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java
View file

@ -47,8 +47,6 @@ public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {
userNameEditText = view.findViewById(R.id.name_edit_text); userNameEditText = view.findViewById(R.id.name_edit_text);
passwordEditText = view.findViewById(R.id.password_edit_text); passwordEditText = view.findViewById(R.id.password_edit_text);
userNameEditText.setBackgroundColor(getResolvedColor(R.color.background_field));
passwordEditText.setBackgroundColor(getResolvedColor(R.color.background_field));
String name = app.getSettings().USER_NAME.get(); String name = app.getSettings().USER_NAME.get();
String password = app.getSettings().USER_PASSWORD.get(); String password = app.getSettings().USER_PASSWORD.get();
@ -64,11 +62,6 @@ public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet {
TextInputLayout loginBox = view.findViewById(R.id.name_text_box); TextInputLayout loginBox = view.findViewById(R.id.name_text_box);
TextInputLayout passwordBox = view.findViewById(R.id.password_text_box); TextInputLayout passwordBox = view.findViewById(R.id.password_text_box);
loginBox.setBoxStrokeColor(getResolvedColor(R.color.osmand_orange));
loginBox.setHintTextColor(AppCompatResources.getColorStateList(getContext(),R.color.hint_label));
passwordBox.setBoxStrokeColor(getResolvedColor(R.color.osmand_orange));
passwordBox.setHintTextColor(AppCompatResources.getColorStateList(getContext(),R.color.hint_label));
passwordBox.setStartIconDrawable(R.drawable.ic_action_lock); passwordBox.setStartIconDrawable(R.drawable.ic_action_lock);
loginBox.setStartIconDrawable(R.drawable.ic_action_user_account); loginBox.setStartIconDrawable(R.drawable.ic_action_user_account);
loginBox.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT); loginBox.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);