Remove BaselineTextView (#1672)

Co-Authored-By: Rosário Pereira Fernandes <[email protected]>

Author: samtstern

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

@@ -128,6 +128,7 @@ public void onClick(DialogInterface dialog, int id) {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == RequestCodes.EMAIL_LINK_PROMPT_FOR_EMAIL_FLOW
                 || requestCode == RequestCodes.EMAIL_LINK_CROSS_DEVICE_LINKING_FLOW) {
             IdpResponse response = IdpResponse.fromResultIntent(data);

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

@@ -1,5 +1,6 @@
 package com.firebase.ui.auth.ui.email;
 
+import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
@@ -22,8 +23,6 @@
 import androidx.annotation.RestrictTo;
 import androidx.fragment.app.FragmentActivity;
 
-import static android.text.Layout.JUSTIFICATION_MODE_INTER_WORD;
-
 /**
  * Fragment that tells the user that a linking flow cannot be completed as they have opened the
  * email link on a different device.
@@ -52,6 +51,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
 
     @SuppressWarnings("WrongConstant")
     @Override
+    @SuppressLint("WrongConstant")
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         mProgressBar = view.findViewById(R.id.top_progress_bar);
         mContinueButton = view.findViewById(R.id.button_continue);
@@ -73,7 +73,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
         // Justifies the text
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            body.setJustificationMode(JUSTIFICATION_MODE_INTER_WORD);
+            body.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_INTER_WORD);
         }
 
         TextView footerText = view.findViewById(R.id.email_footer_tos_and_pp_text);

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

@@ -1,5 +1,6 @@
 package com.firebase.ui.auth.ui.email;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -22,8 +23,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 
-import static android.text.Layout.JUSTIFICATION_MODE_INTER_WORD;
-
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class WelcomeBackEmailLinkPrompt extends AppCompatBase implements View.OnClickListener {
 
@@ -85,7 +84,7 @@ private void setBodyText() {
         body.setText(spannableStringBuilder);
         // Justifies the text
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            body.setJustificationMode(JUSTIFICATION_MODE_INTER_WORD);
+            body.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_INTER_WORD);
         }
     }
 

auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java

@@ -27,7 +27,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
 
-            <com.firebase.ui.auth.util.ui.BaselineTextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/phone_layout"
                 style="@style/FirebaseUI.TextInputLayout.PhoneField"
                 android:layout_width="0dp"
@@ -41,7 +41,7 @@
                     style="@style/FirebaseUI.TextInputEditText.PhoneField"
                     android:imeOptions="actionDone" />
 
-            </com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/send_code"

auth/src/main/res/layout/fui_phone_layout.xml

@@ -39,7 +39,7 @@ object Config {
             const val paging = "androidx.paging:paging-runtime:2.1.0"
             const val recyclerView = "androidx.recyclerview:recyclerview:1.0.0"
 
-            const val design = "com.google.android.material:material:1.0.0"
+            const val design = "com.google.android.material:material:1.1.0"
         }
 
         object Firebase {