Skip to content

Switch to AppCompatButton compound drawables in auth provider buttons #1861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- Update all dependencies to latest major version.
- Update all dependencies to latest major version.
- [Auth] Remove SupportVectorDrawablesButton (#1860) (contributed by @AryanNajafi)
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 1 addition & 6 deletions app/src/main/res/layout/auth_method_picker_custom_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_idp_button_apple.xml
Original file line number Diff line number Diff line change
@@ -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"/>
3 changes: 1 addition & 2 deletions auth/src/main/res/layout/fui_idp_button_facebook.xml
Original file line number Diff line number Diff line change
@@ -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" />
3 changes: 1 addition & 2 deletions auth/src/main/res/layout/fui_idp_button_github.xml
Original file line number Diff line number Diff line change
@@ -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" />
3 changes: 1 addition & 2 deletions auth/src/main/res/layout/fui_idp_button_google.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_idp_button_microsoft.xml
Original file line number Diff line number Diff line change
@@ -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"/>
3 changes: 1 addition & 2 deletions auth/src/main/res/layout/fui_idp_button_twitter.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_idp_button_yahoo.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_provider_button_anonymous.xml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_provider_button_email.xml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/fui_provider_button_phone.xml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 0 additions & 7 deletions auth/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>