Skip to content

Commit 5c6a0d6

Browse files
samtsternsamtstern
authored
Version 7.1.1
Version 7.1.1
2 parents 7f2d6a5 + 778aaa8 commit 5c6a0d6

17 files changed

+135
-18
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ libraries.
4848
```groovy
4949
dependencies {
5050
// FirebaseUI for Firebase Realtime Database
51-
implementation 'com.firebaseui:firebase-ui-database:7.1.0'
51+
implementation 'com.firebaseui:firebase-ui-database:7.1.1'
5252
5353
// FirebaseUI for Cloud Firestore
54-
implementation 'com.firebaseui:firebase-ui-firestore:7.1.0'
54+
implementation 'com.firebaseui:firebase-ui-firestore:7.1.1'
5555
5656
// FirebaseUI for Firebase Auth
57-
implementation 'com.firebaseui:firebase-ui-auth:7.1.0'
57+
implementation 'com.firebaseui:firebase-ui-auth:7.1.1'
5858
5959
// FirebaseUI for Cloud Storage
60-
implementation 'com.firebaseui:firebase-ui-storage:7.1.0'
60+
implementation 'com.firebaseui:firebase-ui-storage:7.1.1'
6161
}
6262
```
6363

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,12 @@
9090

9191
</FrameLayout>
9292

93-
<Button
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
9499
android:id="@+id/custom_google_signin_button"
95100
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
96101
android:layout_width="wrap_content"

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@
7373

7474
</FrameLayout>
7575

76-
<Button
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
7782
android:id="@+id/custom_google_signin_button"
7883
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
7984
android:layout_width="wrap_content"

‎auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Gradle, add the dependency:
6666
```groovy
6767
dependencies {
6868
// ...
69-
implementation 'com.firebaseui:firebase-ui-auth:7.1.0'
69+
implementation 'com.firebaseui:firebase-ui-auth:7.1.1'
7070
7171
// Required only if Facebook login support is required
7272
// Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
package com.firebase.ui.auth.util.ui;
2+
3+
import android.content.Context;
4+
import android.content.res.TypedArray;
5+
import android.graphics.drawable.Drawable;
6+
import android.os.Build;
7+
import android.util.AttributeSet;
8+
9+
import com.firebase.ui.auth.R;
10+
11+
import androidx.annotation.RestrictTo;
12+
import androidx.appcompat.content.res.AppCompatResources;
13+
import androidx.appcompat.widget.AppCompatButton;
14+
import androidx.core.widget.TextViewCompat;
15+
16+
/**
17+
* A custom button that supports using vector drawables with the {@code
18+
* android:drawable[Start/End/Top/Bottom]} attribute pre-L.
19+
* <p>
20+
* AppCompat can only load vector drawables with srcCompat pre-L and doesn't provide a similar
21+
* compatibility attribute for compound drawables. Thus, we must load compound drawables at runtime
22+
* using AppCompat and inject them into the button to support pre-L devices.
23+
*/
24+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
25+
public class SupportVectorDrawablesButton extends AppCompatButton {
26+
public SupportVectorDrawablesButton(Context context) {
27+
super(context);
28+
}
29+
30+
public SupportVectorDrawablesButton(Context context, AttributeSet attrs) {
31+
super(context, attrs);
32+
initSupportVectorDrawablesAttrs(attrs);
33+
}
34+
35+
public SupportVectorDrawablesButton(Context context, AttributeSet attrs, int defStyleAttr) {
36+
super(context, attrs, defStyleAttr);
37+
initSupportVectorDrawablesAttrs(attrs);
38+
}
39+
40+
/**
41+
* Loads the compound drawables natively on L+ devices and using AppCompat pre-L.
42+
* <p>
43+
* <i>Note:</i> If we ever need a TextView with compound drawables, this same technique is
44+
* applicable.
45+
*/
46+
private void initSupportVectorDrawablesAttrs(AttributeSet attrs) {
47+
if (attrs == null) { return; }
48+
49+
TypedArray attributeArray = getContext().obtainStyledAttributes(
50+
attrs,
51+
R.styleable.SupportVectorDrawablesButton);
52+
53+
Drawable drawableStart = null;
54+
Drawable drawableEnd = null;
55+
Drawable drawableTop = null;
56+
Drawable drawableBottom = null;
57+
58+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
59+
drawableStart = attributeArray.getDrawable(
60+
R.styleable.SupportVectorDrawablesButton_drawableStartCompat);
61+
drawableEnd = attributeArray.getDrawable(
62+
R.styleable.SupportVectorDrawablesButton_drawableEndCompat);
63+
drawableTop = attributeArray.getDrawable(
64+
R.styleable.SupportVectorDrawablesButton_drawableTopCompat);
65+
drawableBottom = attributeArray.getDrawable(
66+
R.styleable.SupportVectorDrawablesButton_drawableBottomCompat);
67+
} else {
68+
int drawableStartId = attributeArray.getResourceId(
69+
R.styleable.SupportVectorDrawablesButton_drawableStartCompat, -1);
70+
int drawableEndId = attributeArray.getResourceId(
71+
R.styleable.SupportVectorDrawablesButton_drawableEndCompat, -1);
72+
int drawableTopId = attributeArray.getResourceId(
73+
R.styleable.SupportVectorDrawablesButton_drawableTopCompat, -1);
74+
int drawableBottomId = attributeArray.getResourceId(
75+
R.styleable.SupportVectorDrawablesButton_drawableBottomCompat, -1);
76+
77+
if (drawableStartId != -1) {
78+
drawableStart = AppCompatResources.getDrawable(getContext(), drawableStartId);
79+
}
80+
if (drawableEndId != -1) {
81+
drawableEnd = AppCompatResources.getDrawable(getContext(), drawableEndId);
82+
}
83+
if (drawableTopId != -1) {
84+
drawableTop = AppCompatResources.getDrawable(getContext(), drawableTopId);
85+
}
86+
if (drawableBottomId != -1) {
87+
drawableBottom = AppCompatResources.getDrawable(getContext(), drawableBottomId);
88+
}
89+
}
90+
91+
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(
92+
this, drawableStart, drawableTop, drawableEnd, drawableBottom);
93+
94+
attributeArray.recycle();
95+
}
96+
}

‎auth/src/main/res/layout/fui_idp_button_apple.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Button xmlns:android="http://schemas.android.com/apk/res/android"
1+
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton 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"/>

‎auth/src/main/res/layout/fui_idp_button_facebook.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
<Button xmlns:android="http://schemas.android.com/apk/res/android"
1+
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
xmlns:android="http://schemas.android.com/apk/res/android"
23
style="@style/FirebaseUI.Button.AccountChooser.FacebookButton"
34
android:text="@string/fui_sign_in_with_facebook" />

‎auth/src/main/res/layout/fui_idp_button_github.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
<Button xmlns:android="http://schemas.android.com/apk/res/android"
1+
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
xmlns:android="http://schemas.android.com/apk/res/android"
23
style="@style/FirebaseUI.Button.AccountChooser.GitHubButton"
34
android:text="@string/fui_sign_in_with_github" />

‎auth/src/main/res/layout/fui_idp_button_google.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
<Button xmlns:android="http://schemas.android.com/apk/res/android"
1+
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton
2+
xmlns:android="http://schemas.android.com/apk/res/android"
23
style="@style/FirebaseUI.Button.AccountChooser.GoogleButton"
34
android:text="@string/fui_sign_in_with_google" />

‎auth/src/main/res/layout/fui_idp_button_microsoft.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Button xmlns:android="http://schemas.android.com/apk/res/android"
1+
<com.firebase.ui.auth.util.ui.SupportVectorDrawablesButton 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"/>

0 commit comments

Comments
 (0)