diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java index 19ee7fa83..089d01e02 100644 --- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java +++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java @@ -313,20 +313,20 @@ private String getSelectedTosUrl() { @MainThread private boolean isGoogleConfigured() { return !UNCHANGED_CONFIG_VALUE.equals( - getResources().getString(R.string.default_web_client_id)); + getString(R.string.default_web_client_id)); } @MainThread private boolean isFacebookConfigured() { return !UNCHANGED_CONFIG_VALUE.equals( - getResources().getString(R.string.facebook_application_id)); + getString(R.string.facebook_application_id)); } @MainThread private boolean isTwitterConfigured() { List twitterConfigs = Arrays.asList( - getResources().getString(R.string.twitter_consumer_key), - getResources().getString(R.string.twitter_consumer_secret) + getString(R.string.twitter_consumer_key), + getString(R.string.twitter_consumer_secret) ); return !twitterConfigs.contains(UNCHANGED_CONFIG_VALUE); diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml index eea8a0044..7845471c5 100644 --- a/auth/src/main/AndroidManifest.xml +++ b/auth/src/main/AndroidManifest.xml @@ -34,7 +34,7 @@ diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java index fb4001bc9..49abbc7e1 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java @@ -113,9 +113,7 @@ public void onClick(View view) { } private String getIdpPromptString(String email) { - return getResources().getString(R.string.welcome_back_idp_prompt, - email, - mIdpProvider.getName(this)); + return getString(R.string.welcome_back_idp_prompt, email, mIdpProvider.getName(this)); } @Override diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java index b1366c68f..32030bb51 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java @@ -79,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) { mPasswordField = (EditText) findViewById(R.id.password); // Create welcome back text with email bolded - String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body, mEmail); + String bodyText = getString(R.string.welcome_back_password_prompt_body, mEmail); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText); int emailStart = bodyText.indexOf(mEmail); spannableStringBuilder.setSpan(new StyleSpan(Typeface.BOLD), diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java index d5e69e62c..766681735 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java @@ -114,11 +114,6 @@ public View onCreateView(LayoutInflater inflater, public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - // Set title - if (getActivity().getActionBar() != null) { - getActivity().getActionBar().setTitle(R.string.title_check_email); - } - // Set listener if (!(getActivity() instanceof CheckEmailListener)) { throw new IllegalStateException("Activity must implement CheckEmailListener"); diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java index 79cd8086c..aaf793c55 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java @@ -20,7 +20,7 @@ public class RecoveryEmailSentDialog extends DialogBase { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { return new AlertDialog.Builder(getContext(), R.style.FirebaseUI_Dialog) - .setTitle(R.string.title_confirm_recover_password_activity) + .setTitle(R.string.title_confirm_recover_password) .setMessage(getString(R.string.confirm_recovery_body, getArguments().getString(ExtraConstants.EXTRA_EMAIL))) .setOnDismissListener(new DialogInterface.OnDismissListener() { diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java index de1218e0e..a9e1f1db2 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java @@ -153,10 +153,7 @@ public void run() { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - // Set title - if (getActivity().getActionBar() != null) { - getActivity().getActionBar().setTitle(R.string.title_register_email_activity); - } + getActivity().setTitle(R.string.title_register_email); mSaveSmartLock = mHelper.getSaveSmartLockInstance(getActivity()); setUpTermsOfService(); @@ -173,14 +170,15 @@ public void onSaveInstanceState(Bundle outState) { } private void setUpTermsOfService() { - if (mHelper.getFlowParams().termsOfServiceUrl == null) { + if (TextUtils.isEmpty(mHelper.getFlowParams().termsOfServiceUrl)) { return; } + ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.linkColor)); - String preamble = getResources().getString(R.string.create_account_preamble); - String link = getResources().getString(R.string.terms_of_service); + String preamble = getString(R.string.create_account_preamble); + String link = getString(R.string.terms_of_service); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(preamble + link); int start = preamble.length(); spannableStringBuilder.setSpan(foregroundColorSpan, start, start + link.length(), 0); @@ -277,7 +275,8 @@ public void onFailure(@NonNull Exception e) { if (e instanceof FirebaseAuthWeakPasswordException) { // Password too weak - mPasswordInput.setError(getString(R.string.error_weak_password)); + mPasswordInput.setError(getResources().getQuantityString( + R.plurals.error_weak_password, R.integer.min_password_length)); } else if (e instanceof FirebaseAuthInvalidCredentialsException) { // Email address is malformed mEmailInput.setError(getString(R.string.invalid_email_address)); diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java index 3d26688a5..cb4bf0e00 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/EmailFieldValidator.java @@ -23,8 +23,7 @@ public class EmailFieldValidator extends BaseValidator { public EmailFieldValidator(TextInputLayout errorContainer) { super(errorContainer); - mErrorMessage = mErrorContainer.getContext().getResources().getString( - R.string.invalid_email_address); + mErrorMessage = mErrorContainer.getResources().getString(R.string.invalid_email_address); mEmptyMessage = mErrorContainer.getResources().getString(R.string.missing_email_address); } diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java index dd117926e..fd60ad720 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java @@ -25,7 +25,7 @@ public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) { super(errorContainer); mMinLength = minLength; mErrorMessage = mErrorContainer.getResources() - .getQuantityString(R.plurals.password_length, minLength, mMinLength); + .getQuantityString(R.plurals.error_weak_password, mMinLength, mMinLength); } @Override diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java index 7a01b6763..3a56d7b4e 100644 --- a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java +++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/RequiredFieldValidator.java @@ -21,7 +21,7 @@ public class RequiredFieldValidator extends BaseValidator { public RequiredFieldValidator(TextInputLayout errorContainer) { super(errorContainer); - mErrorMessage = mErrorContainer.getContext().getResources().getString(R.string.required_field); + mErrorMessage = mErrorContainer.getResources().getString(R.string.required_field); } @Override diff --git a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml index 22bf29b0c..2aab977b5 100644 --- a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml +++ b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/FirebaseUI.Text.Heading" - android:text="@string/welcome_back"/> + android:text="@string/welcome_back_email_header"/> ui_flow + @string/app_name - @string/sign_in_default - @string/sign_in_default - @string/sign_in_default - @string/create_account_title - @string/recover_password_title - @string/check_your_email + Loading… + Sign in + An error has occurred. + + Google + Facebook + Twitter + + + Sign in with Google + Sign in with Facebook + Sign in with Twitter + Sign in with email + + + Next Email Password - First & last name - Get instructions sent to this email that explain how to - reset your password. - Create account You can\'t leave this empty. - - Strong passwords have at least %1$d character and a mix of letters - and numbers - Strong passwords have at least %1$d characters and a mix of letters - and numbers - That email address isn\'t correct Enter your email address to continue - Password not strong enough. Use at least 6 characters and a mix of letters and numbers. - An account already exists with that email address. - Send + Checking for existing accounts… + + + Sign up + First & last name Save - Follow the instructions sent to %1$s to recover your - password. - That email address doesn\'t match an existing account - Welcome back! - Trouble signing in? - Next - Sign in - Sign in with Google - Sign in with Facebook - Check your email - Recover password + Signing up… + + Password not strong enough. Use at least %1$d character and a mix of letters and numbers + Password not strong enough. Use at least %1$d characters and a mix of letters and numbers + + Email account registration unsuccessful + An account already exists with that email address. + "By tapping SAVE you are indicating that you agree to the " + Terms of Service + + + @string/sign_in_default + @string/sign_in_default You already have an account + Welcome back! You\'ve already used %1$s. Sign in with %2$s to continue. - You\'ve already used - %1$s to sign in. Enter - your password for that account. - Google - Facebook - Twitter - "By tapping SAVE you are indicating that you agree to the " - Terms of Service - Sign in with email - Sign in with Twitter - Email account registration unsuccessful - An error has occurred. - + + You\'ve already used %1$s + to sign in. Enter your password for that account. + + Signing in… + Trouble signing in? - Loading… + + Recover password + Check your email + Get instructions sent to this email that explain how to + reset your password. + Send + Follow the instructions sent to %1$s to recover your password. Sending… - Signing in… - Signing up… - Checking for existing accounts… + That email address doesn\'t match an existing account App logo diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java index 4f6d3e623..5ab00d90b 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java +++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java @@ -93,7 +93,7 @@ public void testSignUpButton_validatesFields() { assertEquals( String.format( registerEmailActivity.getResources().getQuantityString( - R.plurals.password_length, + R.plurals.error_weak_password, R.integer.min_password_length), registerEmailActivity.getResources() .getInteger(R.integer.min_password_length)