From 0fecbb0ce5b5b3d4e2d6c225726d2dcda7c55c1e Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Tue, 1 Dec 2020 15:05:02 -0800
Subject: [PATCH] Revert "Switch to AppCompatButton compound drawables in auth
 provider buttons (#1861)"

This reverts commit 5342e3dc69221069745945ef613be7eeaf0573eb.
---
 CHANGELOG.md                                  |  1 +
 .../auth_method_picker_custom_layout.xml      |  7 +-
 .../auth_method_picker_custom_layout.xml      |  7 +-
 .../util/ui/SupportVectorDrawablesButton.java | 96 +++++++++++++++++++
 .../main/res/layout/fui_idp_button_apple.xml  |  2 +-
 .../res/layout/fui_idp_button_facebook.xml    |  3 +-
 .../main/res/layout/fui_idp_button_github.xml |  3 +-
 .../main/res/layout/fui_idp_button_google.xml |  3 +-
 .../res/layout/fui_idp_button_microsoft.xml   |  2 +-
 .../res/layout/fui_idp_button_twitter.xml     |  3 +-
 .../main/res/layout/fui_idp_button_yahoo.xml  |  2 +-
 .../layout/fui_provider_button_anonymous.xml  |  2 +-
 .../res/layout/fui_provider_button_email.xml  |  2 +-
 .../res/layout/fui_provider_button_phone.xml  |  2 +-
 auth/src/main/res/values/attrs.xml            |  7 ++
 15 files changed, 130 insertions(+), 12 deletions(-)
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb..dbba81a66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+- Fix broken button styling (#1864)
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
index f8714d86d..97c6d9f94 100644
--- 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,7 +90,12 @@
 
     </FrameLayout>
 
-    <Button
+    <!--
+      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
         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
index d0944e73b..e5f4ec016 100644
--- 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,7 +73,12 @@
 
     </FrameLayout>
 
-    <Button
+    <!--
+      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
         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
new file mode 100644
index 000000000..15f89b80e
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/ui/SupportVectorDrawablesButton.java
@@ -0,0 +1,96 @@
+package com.firebase.ui.auth.util.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+
+import com.firebase.ui.auth.R;
+
+import androidx.annotation.RestrictTo;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.core.widget.TextViewCompat;
+
+/**
+ * A custom button that supports using vector drawables with the {@code
+ * android:drawable[Start/End/Top/Bottom]} attribute pre-L.
+ * <p>
+ * AppCompat can only load vector drawables with srcCompat pre-L and doesn't provide a similar
+ * compatibility attribute for compound drawables. Thus, we must load compound drawables at runtime
+ * using AppCompat and inject them into the button to support pre-L devices.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class SupportVectorDrawablesButton extends AppCompatButton {
+    public SupportVectorDrawablesButton(Context context) {
+        super(context);
+    }
+
+    public SupportVectorDrawablesButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initSupportVectorDrawablesAttrs(attrs);
+    }
+
+    public SupportVectorDrawablesButton(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initSupportVectorDrawablesAttrs(attrs);
+    }
+
+    /**
+     * Loads the compound drawables natively on L+ devices and using AppCompat pre-L.
+     * <p>
+     * <i>Note:</i> If we ever need a TextView with compound drawables, this same technique is
+     * applicable.
+     */
+    private void initSupportVectorDrawablesAttrs(AttributeSet attrs) {
+        if (attrs == null) { return; }
+
+        TypedArray attributeArray = getContext().obtainStyledAttributes(
+                attrs,
+                R.styleable.SupportVectorDrawablesButton);
+
+        Drawable drawableStart = null;
+        Drawable drawableEnd = null;
+        Drawable drawableTop = null;
+        Drawable drawableBottom = null;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            drawableStart = attributeArray.getDrawable(
+                    R.styleable.SupportVectorDrawablesButton_drawableStartCompat);
+            drawableEnd = attributeArray.getDrawable(
+                    R.styleable.SupportVectorDrawablesButton_drawableEndCompat);
+            drawableTop = attributeArray.getDrawable(
+                    R.styleable.SupportVectorDrawablesButton_drawableTopCompat);
+            drawableBottom = attributeArray.getDrawable(
+                    R.styleable.SupportVectorDrawablesButton_drawableBottomCompat);
+        } else {
+            int drawableStartId = attributeArray.getResourceId(
+                    R.styleable.SupportVectorDrawablesButton_drawableStartCompat, -1);
+            int drawableEndId = attributeArray.getResourceId(
+                    R.styleable.SupportVectorDrawablesButton_drawableEndCompat, -1);
+            int drawableTopId = attributeArray.getResourceId(
+                    R.styleable.SupportVectorDrawablesButton_drawableTopCompat, -1);
+            int drawableBottomId = attributeArray.getResourceId(
+                    R.styleable.SupportVectorDrawablesButton_drawableBottomCompat, -1);
+
+            if (drawableStartId != -1) {
+                drawableStart = AppCompatResources.getDrawable(getContext(), drawableStartId);
+            }
+            if (drawableEndId != -1) {
+                drawableEnd = AppCompatResources.getDrawable(getContext(), drawableEndId);
+            }
+            if (drawableTopId != -1) {
+                drawableTop = AppCompatResources.getDrawable(getContext(), drawableTopId);
+            }
+            if (drawableBottomId != -1) {
+                drawableBottom = AppCompatResources.getDrawable(getContext(), drawableBottomId);
+            }
+        }
+
+        TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                this, drawableStart, drawableTop, drawableEnd, drawableBottom);
+
+        attributeArray.recycle();
+    }
+}
diff --git a/auth/src/main/res/layout/fui_idp_button_apple.xml b/auth/src/main/res/layout/fui_idp_button_apple.xml
index 699addeec..497bcff2b 100644
--- 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 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton 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
index 4135aa461..47eb88122 100644
--- a/auth/src/main/res/layout/fui_idp_button_facebook.xml
+++ b/auth/src/main/res/layout/fui_idp_button_facebook.xml
@@ -1,3 +1,4 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    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
index e8fd1ad8d..06e970841 100644
--- a/auth/src/main/res/layout/fui_idp_button_github.xml
+++ b/auth/src/main/res/layout/fui_idp_button_github.xml
@@ -1,3 +1,4 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    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
index 24371fbcc..ff5e282c6 100644
--- a/auth/src/main/res/layout/fui_idp_button_google.xml
+++ b/auth/src/main/res/layout/fui_idp_button_google.xml
@@ -1,3 +1,4 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    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
index fcb41d0a5..5597164c7 100644
--- 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 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton 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
index bd2c59697..f186afebc 100644
--- a/auth/src/main/res/layout/fui_idp_button_twitter.xml
+++ b/auth/src/main/res/layout/fui_idp_button_twitter.xml
@@ -1,3 +1,4 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
+    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
index e54c49317..3a5a61b80 100644
--- 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 @@
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton 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
index 1fc8a9bec..361d3c007 100644
--- 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"?>
-<Button
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
     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
index 3df0dd4b1..5aeb41bc1 100644
--- 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"?>
-<Button
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
     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
index 41137c436..4deb10967 100644
--- 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"?>
-<Button
+<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
     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
index 596c7c0ee..a65d9d3ca 100644
--- a/auth/src/main/res/values/attrs.xml
+++ b/auth/src/main/res/values/attrs.xml
@@ -5,4 +5,11 @@
         <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>