Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Merge latest changes from WordPress-Android#24

Merged
shiki merged 13 commits intodevelopfrom
merge/WordPress-Android/10255
Jul 23, 2019
Merged

Merge latest changes from WordPress-Android#24
shiki merged 13 commits intodevelopfrom
merge/WordPress-Android/10255

Conversation

@shiki
Copy link
Copy Markdown
Contributor

@shiki shiki commented Jul 22, 2019

This contains the changes from:

Testing

I'm not quite sure how testing should be done for this type of PR. I have created draft pull requests using this branch:

I have tested both WC and WP and did not see any issues.

Reviewing

Only 1 reviewer is needed but anyone can review.

Tasks

  • Merge this if it gets approved.
  • Set the corresponding WC and WP draft pull requests as Ready for review.

maxme and others added 13 commits July 3, 2019 14:51
…-wp-2

Merge login lib changes and implement new interface methods
This time, the _Next_ button is not enabled until the user has entered an invalid site address.
The invalid address error message will only be shown 2 seconds after the user stopped typing.
This is to match the new iOS error message.
This is based on Editorial’s advice.
…20-login-subtree-update

# Conflicts:
#	libs/login/WordPressLoginFlow/build.gradle
#	libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
#	libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_request_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout-land/login_magic_link_sent_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout-land/signup_bottom_sheet_dialog.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout-land/signup_magic_link.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_email_password_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_form_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_input_row.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_magic_link_request_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/layout/login_username_password_screen.xml
#	libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
Copy link
Copy Markdown
Contributor

@AmandaRiu AmandaRiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! :shipit:

@shiki shiki merged commit 3bf6e99 into develop Jul 23, 2019
@shiki shiki deleted the merge/WordPress-Android/10255 branch July 23, 2019 22:26
wzieba pushed a commit that referenced this pull request Oct 15, 2024
…10255

Merge latest changes from WordPress-Android
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants