From 06edbffb5d4ac5620a8b08b9a6a1acc39eed7da8 Mon Sep 17 00:00:00 2001 From: androiddevkkotlin Date: Tue, 17 Nov 2020 01:34:24 +0200 Subject: [PATCH] UI fix: POI/OSM Note, Send GPX , Login/Password. 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. --- OsmAnd/res/layout/osm_login_data.xml | 11 +- OsmAnd/res/layout/send_gpx_fragment.xml | 67 ++-- OsmAnd/res/layout/send_osm_note_fragment.xml | 297 +++++++++--------- OsmAnd/res/layout/send_poi_fragment.xml | 202 ++++++------ .../SendOsmNoteBottomSheetFragment.java | 4 +- .../dialogs/SendPoiBottomSheetFragment.java | 1 + .../bottomsheets/OsmLoginDataBottomSheet.java | 7 - 7 files changed, 301 insertions(+), 288 deletions(-) diff --git a/OsmAnd/res/layout/osm_login_data.xml b/OsmAnd/res/layout/osm_login_data.xml index 4679608265..363287fe72 100644 --- a/OsmAnd/res/layout/osm_login_data.xml +++ b/OsmAnd/res/layout/osm_login_data.xml @@ -1,5 +1,6 @@ + android:hint="@string/user_login" + app:boxBackgroundColor="?attr/text_input_background" + app:boxStrokeColor="@color/osmand_orange" + app:hintTextColor="@color/text_color_secondary_light"> + android:hint="@string/user_password" + app:boxBackgroundColor="?attr/text_input_background" + app:boxStrokeColor="@color/osmand_orange" + app:hintTextColor="@color/text_color_secondary_light"> @@ -51,6 +51,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/bottom_sheet_content_margin" android:hint="@string/gpx_tags_txt" + app:boxBackgroundColor="?attr/text_input_background" app:boxStrokeColor="@color/osmand_orange" app:helperText="@string/enter_text_separated" app:helperTextEnabled="true" @@ -62,7 +63,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/subHeaderPadding" android:imeOptions="actionDone" - android:background = "?attr/text_input_background" android:text="osmand" /> @@ -144,45 +144,41 @@ android:background="?attr/dashboard_divider" /> + android:orientation="horizontal"> + + + android:layout_width="216dp" + android:layout_height="@dimen/bottom_sheet_descr_height" + android:gravity="center_vertical" + android:orientation="vertical"> - \ No newline at end of file diff --git a/OsmAnd/res/layout/send_osm_note_fragment.xml b/OsmAnd/res/layout/send_osm_note_fragment.xml index 6cc897ee89..d98e60b260 100644 --- a/OsmAnd/res/layout/send_osm_note_fragment.xml +++ b/OsmAnd/res/layout/send_osm_note_fragment.xml @@ -1,169 +1,178 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:osmand="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - + - + - - + + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + diff --git a/OsmAnd/res/layout/send_poi_fragment.xml b/OsmAnd/res/layout/send_poi_fragment.xml index 2f1ee7cf51..d81aa9cdda 100644 --- a/OsmAnd/res/layout/send_poi_fragment.xml +++ b/OsmAnd/res/layout/send_poi_fragment.xml @@ -1,123 +1,127 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:osmand="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - + - + - + + android:imeOptions="actionDone" + android:lineSpacingExtra="5sp"/> - + - + - + - + - + - + - + - + - + - + + + diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java index 407e8c0b5f..79f082badd 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java @@ -6,6 +6,7 @@ import android.view.ContextThemeWrapper; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; @@ -71,8 +72,9 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen final View sendOsmNoteView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), 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.setSelection(noteText.getText().length()); TextInputLayout noteHint = sendOsmNoteView.findViewById(R.id.note_hint); noteHint.setHint(AndroidUtils.addColon(app, R.string.osn_bug_name)); accountBlockView = sendOsmNoteView.findViewById(R.id.account_container); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java index 7755568e43..02c6527948 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java @@ -60,6 +60,7 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment { messageEditText = sendOsmPoiView.findViewById(R.id.message_field); String defaultChangeSet = createDefaultChangeSet(app); messageEditText.setText(defaultChangeSet); + messageEditText.setSelection(messageEditText.getText().length()); final TextView accountName = sendOsmPoiView.findViewById(R.id.user_name); OsmandSettings settings = app.getSettings(); String userNameOAuth = settings.USER_DISPLAY_NAME.get(); diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java index 169d89b8cd..622fc11977 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/OsmLoginDataBottomSheet.java @@ -47,8 +47,6 @@ public class OsmLoginDataBottomSheet extends BasePreferenceBottomSheet { userNameEditText = view.findViewById(R.id.name_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 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 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); loginBox.setStartIconDrawable(R.drawable.ic_action_user_account); loginBox.setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);