Add message to allow user to login manually in the enter email screen.

[notandyvee]

Fix #1689

This PR adds a new label on the screen to enter your email for a magic link. That lable will have a link to login manually, meaning with password instead.

Test

• On app launch click login.
• Under the "Log In With Email" button, there is a new label, "We'll email you a code to log in, or you can log in manually".
• The "log in manually" is hyperlinked.
• Clicking the hyperlink should take you to login with password screen.

Release

N/A

[dangermattic]

	1 Warning
⚠️	This PR is assigned to the milestone 2.34 ❄️. The due date for this milestone has already passed. Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

[wpmobilebot]

📲 You can test the changes from this Pull Request in Simplenote Android by scanning the QR code below to install the corresponding build.

	App Name	Simplenote Android
	Build Type	Debug
	Commit	f1a36ae
	Direct Download	simplenote-android-prototype-build-pr1693-f1a36ae-0191ed52-2066-419b-8108-359aa96ea3ed.apk

[roundhill]

Worked pretty well, requesting a change to support localizing the linked text.

Also, when you press the back arrow from the password field, you end up at the welcome screen. Is that expected? I think it works ok but I expected to be back to the email login form.

[roundhill]

I don't think this will work for localized strings... can it instead work like this string does?

<string name="simperium_footer_signup">By creating an account, you agree to our %1$s%2$s%3$sTerms and Conditions%4$s</string>

And the code that formats it:

String.format(
                if (this.isLogin) this.resources.getString(R.string.simperium_footer_login) else this.resources.getString(
                    R.string.simperium_footer_signup
                ), "<span style=\"color:#", colorLink, "\">", "</span>"
            )

Something like that?

[notandyvee]

Also, when you press the back arrow from the password field, you end up at the welcome screen. Is that expected?

Unfortunately it is. This is a remnant of the old way of doing things. I can update it, but would require me to replace the user and password screen with one that isn't made by simperium. Or we can ticket it to fix it. Basically a bigger fix.

I don't think this will work for localized strings... can it instead work like this string does?

And great catch! This was an oversight. You are correct it wouldn't work for localized strings. The fix could be to localize the substring as well. Not sure if there is risk with the people translating and needing to translate the last part.

As to why I opted out of doing what you are suggesting is because the entire TextView is clickable. It felt off to highlight part of the text but make the whole thing clickable. But if you don't mind, I can do it that way instead. You let me know @roundhill .

[roundhill]

As to why I opted out of doing what you are suggesting is because the entire TextView is clickable. It felt off to highlight part of the text but make the whole thing clickable. But if you don't mind, I can do it that way instead. You let me know @roundhill .

Ah, I see. I think it's ok to make it all clickable so that the localization can work properly.

[notandyvee]

@roundhill I made the changes. Using the old method for now. Will create an issue to explore using a ClickableSpan instead of a click action on the text view.

[roundhill]

Looks good to me, and tested well!