Merge branch 'version-4.3.3-dev' into version-4.4.0-dev

Change-Id: I0e404042125e45db3da96b061fa64f65c6e4d5c1

Author: samtstern

auth/build.gradle.kts

@@ -13,6 +13,7 @@ android {
         disable("UnusedQuantity")
         disable("UnknownNullness")  // TODO fix in future PR
         disable("TypographyQuotes") // Straight versus directional quotes
+        disable("MissingTranslation") // TODO remove after translations for fui_missing_first_and_last_name are added
     }
 
     testOptions {

auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java

@@ -154,7 +154,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 mPasswordInput,
                 getResources().getInteger(R.integer.fui_min_password_length));
         mNameValidator = requireName
-                ? new RequiredFieldValidator(nameInput)
+                ? new RequiredFieldValidator(nameInput,
+                      getResources().getString(R.string.fui_missing_first_and_last_name))
                 : new NoOpValidator(nameInput);
         mEmailFieldValidator = new EmailFieldValidator(mEmailInput);
 

auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java

@@ -160,7 +160,7 @@ private void validateAndSignIn() {
     private void validateAndSignIn(String password) {
         // Check for null or empty password
         if (TextUtils.isEmpty(password)) {
-            mPasswordLayout.setError(getString(R.string.fui_required_field));
+            mPasswordLayout.setError(getString(R.string.fui_error_invalid_password));
             return;
         } else {
             mPasswordLayout.setError(null);

auth/src/main/java/com/firebase/ui/auth/util/ui/fieldvalidators/RequiredFieldValidator.java

@@ -26,6 +26,11 @@ public RequiredFieldValidator(TextInputLayout errorContainer) {
         mErrorMessage = mErrorContainer.getResources().getString(R.string.fui_required_field);
     }
 
+    public RequiredFieldValidator(TextInputLayout errorContainer, String errorMessage) {
+        super(errorContainer);
+        mErrorMessage = errorMessage;
+    }
+
     @Override
     protected boolean isValid(CharSequence charSequence) {
         return charSequence != null && charSequence.length() > 0;

auth/src/main/res/values/strings.xml

@@ -37,6 +37,7 @@
     <string name="fui_required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
     <string name="fui_invalid_email_address" translation_description="Inline error for invalid email address">That email address isn\'t correct</string>
     <string name="fui_missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="fui_missing_first_and_last_name" translation_description="Inline error for empty email address in input field">Please enter a first and last name.</string>
     <string name="fui_progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
 
     <!-- Email sign up -->

auth/src/test/java/com/firebase/ui/auth/ui/email/EmailActivityTest.java

@@ -127,7 +127,7 @@ public void testSignUpButton_validatesFields() {
         TextInputLayout passwordLayout = emailActivity.findViewById(R.id.password_layout);
 
         assertEquals(
-                emailActivity.getString(R.string.fui_required_field),
+                emailActivity.getString(R.string.fui_missing_first_and_last_name),
                 nameLayout.getError().toString());
         assertEquals(
                 String.format(

auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java

@@ -69,7 +69,7 @@ public void testSignInButton_validatesFields() {
                 welcomeBack.findViewById(R.id.password_layout);
 
         assertEquals(
-                welcomeBack.getString(R.string.fui_required_field),
+                welcomeBack.getString(R.string.fui_error_invalid_password),
                 passwordLayout.getError().toString());
 
         // should block and not start a new activity