Switch to AppCompatButton compound drawables in auth provider buttons (#1861)

AryanNajafi · web-flow · commit 5342e3dc6922 · 2020-11-09T13:04:32.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1 +1,2 @@
-- Update all dependencies to latest major version.
+- Update all dependencies to latest major version.
+- [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)
diff --git a/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml b/app/src/main/res/layout-land/auth_method_picker_custom_layout.xml
@@ -90,12 +90,7 @@
 
     </FrameLayout>
 
-    <!--
-      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
-      in button. However this button is NOT considered part of the public API and you should not
-      use it in your own app.
-    -->
-    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    <Button
         android:id="@+id/custom_google_signin_button"
         style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/auth_method_picker_custom_layout.xml b/app/src/main/res/layout/auth_method_picker_custom_layout.xml
@@ -73,12 +73,7 @@
 
     </FrameLayout>
 
-    <!--
-      NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
-      in button. However this button is NOT considered part of the public API and you should not
-      use it in your own app.
-    -->
-    <com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    <Button
         android:id="@+id/custom_google_signin_button"
         style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
         android:layout_width="wrap_content"
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java b/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java
diff --git a/auth/src/main/res/layout/fui_idp_button_apple.xml b/auth/src/main/res/layout/fui_idp_button_apple.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/apple_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.AppleButton"
     android:text="@string/fui_sign_in_with_apple"/>
diff --git a/auth/src/main/res/layout/fui_idp_button_facebook.xml b/auth/src/main/res/layout/fui_idp_button_facebook.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.FacebookButton"
     android:text="@string/fui_sign_in_with_facebook" />
diff --git a/auth/src/main/res/layout/fui_idp_button_github.xml b/auth/src/main/res/layout/fui_idp_button_github.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.GitHubButton"
     android:text="@string/fui_sign_in_with_github" />
diff --git a/auth/src/main/res/layout/fui_idp_button_google.xml b/auth/src/main/res/layout/fui_idp_button_google.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
     android:text="@string/fui_sign_in_with_google" />
diff --git a/auth/src/main/res/layout/fui_idp_button_microsoft.xml b/auth/src/main/res/layout/fui_idp_button_microsoft.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/microsoft_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.MicrosoftButton"
     android:text="@string/fui_sign_in_with_microsoft"/>
diff --git a/auth/src/main/res/layout/fui_idp_button_twitter.xml b/auth/src/main/res/layout/fui_idp_button_twitter.xml
@@ -1,4 +1,3 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/FirebaseUI.Button.AccountChooser.TwitterButton"
     android:text="@string/fui_sign_in_with_twitter" />
diff --git a/auth/src/main/res/layout/fui_idp_button_yahoo.xml b/auth/src/main/res/layout/fui_idp_button_yahoo.xml
@@ -1,4 +1,4 @@
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/yahoo_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.YahooButton"
     android:text="@string/fui_sign_in_with_yahoo" />
diff --git a/auth/src/main/res/layout/fui_provider_button_anonymous.xml b/auth/src/main/res/layout/fui_provider_button_anonymous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/anonymous_button"
     style="@style/FirebaseUI.Button.AccountChooser.AnonymousButton"
diff --git a/auth/src/main/res/layout/fui_provider_button_email.xml b/auth/src/main/res/layout/fui_provider_button_email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/email_button"
diff --git a/auth/src/main/res/layout/fui_provider_button_phone.xml b/auth/src/main/res/layout/fui_provider_button_phone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/phone_button"
diff --git a/auth/src/main/res/values/attrs.xml b/auth/src/main/res/values/attrs.xml
@@ -5,11 +5,4 @@
         <attr name="spacingProportion" format="float" />
     </declare-styleable>
 
-    <declare-styleable name="SupportVectorDrawablesButton">
-        <attr name="drawableStartCompat" format="reference" />
-        <attr name="drawableEndCompat" format="reference" />
-        <attr name="drawableTopCompat" format="reference" />
-        <attr name="drawableBottomCompat" format="reference" />
-    </declare-styleable>
-
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-- Update all dependencies to latest major version.`
	`1`	`+- Update all dependencies to latest major version.`
	`2`	`+- [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)`