Skip to content

Commit 5342e3d

Browse files
authored
Switch to AppCompatButton compound drawables in auth provider buttons (#1861)
1 parent 6507438 commit 5342e3d

15 files changed

+14
-130
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff 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)

app/src/main/res/layout-land/auth_method_picker_custom_layout.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,7 @@
9090

9191
</FrameLayout>
9292

93-
<!--
94-
NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
95-
in button. However this button is NOT considered part of the public API and you should not
96-
use it in your own app.
97-
-->
98-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
93+
<Button
9994
android:id="@+id/custom_google_signin_button"
10095
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
10196
android:layout_width="wrap_content"

app/src/main/res/layout/auth_method_picker_custom_layout.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@
7373

7474
</FrameLayout>
7575

76-
<!--
77-
NOTE: This sample app uses this class from the FirebaseUI library to show the Google Sign
78-
in button. However this button is NOT considered part of the public API and you should not
79-
use it in your own app.
80-
-->
81-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
76+
<Button
8277
android:id="@+id/custom_google_signin_button"
8378
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
8479
android:layout_width="wrap_content"

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

-96
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
22
android:id="@+id/apple_signin_button"
33
style="@style/FirebaseUI.Button.AccountChooser.AppleButton"
44
android:text="@string/fui_sign_in_with_apple"/>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2-
xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
32
style="@style/FirebaseUI.Button.AccountChooser.FacebookButton"
43
android:text="@string/fui_sign_in_with_facebook" />
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2-
xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
32
style="@style/FirebaseUI.Button.AccountChooser.GitHubButton"
43
android:text="@string/fui_sign_in_with_github" />
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2-
xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
32
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
43
android:text="@string/fui_sign_in_with_google" />
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
22
android:id="@+id/microsoft_signin_button"
33
style="@style/FirebaseUI.Button.AccountChooser.MicrosoftButton"
44
android:text="@string/fui_sign_in_with_microsoft"/>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2-
xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
32
style="@style/FirebaseUI.Button.AccountChooser.TwitterButton"
43
android:text="@string/fui_sign_in_with_twitter" />
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton xmlns:android="http://schemas.android.com/apk/res/android"
1+
<Button xmlns:android="http://schemas.android.com/apk/res/android"
22
android:id="@+id/yahoo_signin_button"
33
style="@style/FirebaseUI.Button.AccountChooser.YahooButton"
44
android:text="@string/fui_sign_in_with_yahoo" />

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
<Button
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
android:id="@+id/anonymous_button"
55
style="@style/FirebaseUI.Button.AccountChooser.AnonymousButton"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
<Button
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/email_button"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
<Button
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/phone_button"

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

-7
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,4 @@
55
<attr name="spacingProportion" format="float" />
66
</declare-styleable>
77

8-
<declare-styleable name="SupportVectorDrawablesButton">
9-
<attr name="drawableStartCompat" format="reference" />
10-
<attr name="drawableEndCompat" format="reference" />
11-
<attr name="drawableTopCompat" format="reference" />
12-
<attr name="drawableBottomCompat" format="reference" />
13-
</declare-styleable>
14-
158
</resources>

0 commit comments

Comments
 (0)