Skip to content

Commit 7ca207e

Browse files
samtsternsamtstern
authored
Version 3.1.3
2 parents 02b5fa5 + 94b66d9 commit 7ca207e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+215
-97
lines changed

‎README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ libraries.
4646
```groovy
4747
dependencies {
4848
// FirebaseUI for Firebase Realtime Database
49-
implementation 'com.firebaseui:firebase-ui-database:3.1.2'
49+
implementation 'com.firebaseui:firebase-ui-database:3.1.3'
5050
5151
// FirebaseUI for Cloud Firestore
52-
implementation 'com.firebaseui:firebase-ui-firestore:3.1.2'
52+
implementation 'com.firebaseui:firebase-ui-firestore:3.1.3'
5353
5454
// FirebaseUI for Firebase Auth
55-
implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
55+
implementation 'com.firebaseui:firebase-ui-auth:3.1.3'
5656
5757
// FirebaseUI for Cloud Storage
58-
implementation 'com.firebaseui:firebase-ui-storage:3.1.2'
58+
implementation 'com.firebaseui:firebase-ui-storage:3.1.3'
5959
}
6060
```
6161

@@ -102,6 +102,7 @@ For convenience, here are some recent examples:
102102

103103
| FirebaseUI Version | Firebase/Play Services Version |
104104
|--------------------|--------------------------------|
105+
| 3.1.3 | 11.8.0 |
105106
| 3.1.2 | 11.6.2 |
106107
| 3.1.0 | 11.4.2 |
107108
| 3.0.0 | 11.4.2 |

‎app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 16
1010
targetSdkVersion targetSdk
1111
versionCode 1
12-
versionName "1.0"
12+
versionName version
1313

1414
multiDexEnabled true
1515
vectorDrawables.useSupportLibrary = true
@@ -45,19 +45,19 @@ dependencies {
4545
implementation project(path: ':database')
4646
implementation project(path: ':storage')
4747

48-
implementation 'com.facebook.android:facebook-login:4.28.0'
48+
implementation 'com.facebook.android:facebook-login:4.29.0'
4949
// Needed to override Facebook
5050
implementation "com.android.support:cardview-v7:$supportLibraryVersion"
5151
implementation "com.android.support:customtabs:$supportLibraryVersion"
5252
implementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
5353

54-
implementation 'com.github.bumptech.glide:glide:4.3.1'
55-
annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
54+
implementation 'com.github.bumptech.glide:glide:4.4.0'
55+
annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
5656

5757
// The following dependencies are not required to use the Firebase UI library.
5858
// They are used to make some aspects of the demo app implementation simpler for
5959
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
60-
implementation 'pub.devrel:easypermissions:1.0.1'
60+
implementation 'pub.devrel:easypermissions:1.1.1'
6161
implementation 'com.jakewharton:butterknife:8.8.1'
6262
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
6363
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

‎app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,19 @@ private void showDownloadUI() {
155155

156156
@Override
157157
public void onRequestPermissionsResult(int requestCode,
158-
String[] permissions,
159-
int[] grantResults) {
158+
@NonNull String[] permissions,
159+
@NonNull int[] grantResults) {
160160
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
161161
EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
162162
}
163163

164164
@Override
165-
public void onPermissionsGranted(int requestCode, List<String> perms) {
165+
public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
166166
// See #choosePhoto with @AfterPermissionGranted
167167
}
168168

169169
@Override
170-
public void onPermissionsDenied(int requestCode, List<String> perms) {
170+
public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
171171
if (EasyPermissions.somePermissionPermanentlyDenied(this,
172172
Collections.singletonList(PERMS))) {
173173
new AppSettingsDialog.Builder(this).build().show();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:layout_alignParentStart="true"
2121
android:layout_alignParentLeft="true"
2222
android:layout_alignParentTop="true"
23-
android:layout_above="@id/footer"
23+
android:layout_above="@+id/footer"
2424
android:clipToPadding="false"
2525
android:padding="16dp"
2626
tools:listitem="@layout/message" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
android:id="@+id/text2"
2929
android:layout_width="match_parent"
3030
android:layout_height="wrap_content"
31-
android:layout_alignStart="@id/text1"
32-
android:layout_alignLeft="@id/text1"
33-
android:layout_below="@id/text1"
31+
android:layout_alignStart="@+id/text1"
32+
android:layout_alignLeft="@+id/text1"
33+
android:layout_below="@+id/text1"
3434
android:textAppearance="?android:attr/textAppearanceListItem"
3535
android:textIsSelectable="false" />
3636

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
android:id="@+id/right_arrow"
5252
android:layout_width="50dp"
5353
android:layout_height="50dp"
54-
android:layout_alignEnd="@id/message"
54+
android:layout_alignEnd="@+id/message"
5555
android:layout_marginEnd="25dp"
56-
android:layout_alignRight="@id/message"
56+
android:layout_alignRight="@+id/message"
5757
android:layout_marginRight="25dp"
5858
android:layout_alignParentTop="true"
5959
android:background="@drawable/ic_chat_message_arrow"

‎auth/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Gradle, add the dependency:
6262
```groovy
6363
dependencies {
6464
// ...
65-
implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
65+
implementation 'com.firebaseui:firebase-ui-auth:3.1.3'
6666
6767
// Required only if Facebook login support is required
6868
// Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94

‎auth/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 16
99
targetSdkVersion targetSdk
1010
versionCode 1
11-
versionName "1.0"
11+
versionName version
1212

1313
vectorDrawables.useSupportLibrary = true
1414
resourcePrefix "fui_"
@@ -36,7 +36,7 @@ android {
3636
dependencies {
3737
implementation "com.android.support:design:$supportLibraryVersion"
3838
implementation "com.android.support:customtabs:$supportLibraryVersion"
39-
implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta3'
39+
implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
4040

4141
implementation "android.arch.lifecycle:extensions:$architectureVersion"
4242
annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
@@ -52,10 +52,12 @@ dependencies {
5252

5353
testImplementation 'junit:junit:4.12'
5454
//noinspection GradleDynamicVersion
55-
testImplementation 'org.mockito:mockito-core:2.12.+'
56-
testImplementation 'org.robolectric:robolectric:3.5.1'
57-
testImplementation 'com.facebook.android:facebook-login:4.28.0'
55+
testImplementation 'org.mockito:mockito-core:2.13.+'
56+
testImplementation 'org.robolectric:robolectric:3.6.1'
57+
testImplementation 'com.facebook.android:facebook-login:4.29.0'
5858
testImplementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
59+
60+
lintChecks project(':lint')
5961
}
6062

6163
javadoc.include([

‎auth/src/main/java/com/firebase/ui/auth/AuthUI.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,20 @@ public static AuthUI getInstance() {
184184
*/
185185
@NonNull
186186
public static AuthUI getInstance(@NonNull FirebaseApp app) {
187+
AuthUI authUi;
188+
synchronized (INSTANCES) {
189+
authUi = INSTANCES.get(app);
190+
if (authUi == null) {
191+
authUi = new AuthUI(app);
192+
authUi.mAuth.setFirebaseUIVersion(BuildConfig.VERSION_NAME);
193+
INSTANCES.put(app, authUi);
194+
}
195+
}
196+
return authUi;
197+
}
198+
199+
@RestrictTo(RestrictTo.Scope.TESTS)
200+
static AuthUI getTestInstance(FirebaseApp app) {
187201
AuthUI authUi;
188202
synchronized (INSTANCES) {
189203
authUi = INSTANCES.get(app);

‎auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import android.support.annotation.RestrictTo;
2121
import android.support.design.widget.TextInputLayout;
2222
import android.support.v4.app.FragmentTransaction;
23+
import android.support.v4.view.ViewCompat;
2324

2425
import com.firebase.ui.auth.IdpResponse;
2526
import com.firebase.ui.auth.R;
@@ -123,7 +124,11 @@ public void onNewUser(User user) {
123124
FragmentTransaction ft = getSupportFragmentManager().beginTransaction()
124125
.replace(R.id.fragment_register_email, fragment, RegisterEmailFragment.TAG);
125126

126-
if (emailLayout != null) ft.addSharedElement(emailLayout, "email_field");
127+
if (emailLayout != null) {
128+
String emailFieldName = getString(R.string.fui_email_field_name);
129+
ViewCompat.setTransitionName(emailLayout, emailFieldName);
130+
ft.addSharedElement(emailLayout, emailFieldName);
131+
}
127132

128133
ft.disallowAddToBackStack().commit();
129134
} else {

‎auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:id="@+id/logo"
1414
style="@style/FirebaseUI.AuthMethodPicker.Logo"
1515
app:layout_constraintStart_toStartOf="parent"
16-
app:layout_constraintEnd_toStartOf="@id/container"
16+
app:layout_constraintEnd_toStartOf="@+id/container"
1717
app:layout_constraintTop_toTopOf="parent"
1818
app:layout_constraintBottom_toBottomOf="parent"
1919
tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
app:layout_constraintStart_toStartOf="parent"
1616
app:layout_constraintEnd_toEndOf="parent"
1717
app:layout_constraintTop_toTopOf="parent"
18-
app:layout_constraintBottom_toTopOf="@id/container"
18+
app:layout_constraintBottom_toTopOf="@+id/container"
1919
tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->
2020

2121
<ScrollView

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="@dimen/fui_field_padding_vert"
2020
android:transitionGroup="true"
21-
android:transitionName="email_field"
21+
android:transitionName="@string/fui_email_field_name"
2222
app:errorEnabled="true"
2323
tools:ignore="UnusedAttribute">
2424

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
android:layout_height="wrap_content"
2626
android:textAppearance="?android:attr/textAppearanceMedium"
2727
android:textColor="@color/fui_linkColor"
28-
app:layout_constraintTop_toBottomOf="@id/header"
28+
app:layout_constraintTop_toBottomOf="@+id/header"
2929
tools:ignore="SelectableText" />
3030

3131
<android.support.design.widget.TextInputLayout
3232
android:id="@+id/confirmation_code_layout"
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
3535
android:layout_marginBottom="@dimen/fui_field_padding_vert"
36-
app:layout_constraintTop_toBottomOf="@id/edit_phone_number">
36+
app:layout_constraintTop_toBottomOf="@+id/edit_phone_number">
3737

3838
<com.firebase.ui.auth.ui.phone.SpacedEditText
3939
android:id="@+id/confirmation_code"
@@ -57,7 +57,7 @@
5757
style="@style/FirebaseUI.VerifyPhoneButton"
5858
android:layout_gravity="end"
5959
android:text="@string/fui_continue_phone_login"
60-
app:layout_constraintTop_toBottomOf="@id/confirmation_code_layout" />
60+
app:layout_constraintTop_toBottomOf="@+id/confirmation_code_layout" />
6161

6262
<TextView
6363
android:id="@+id/ticker"
@@ -71,7 +71,7 @@
7171
android:textIsSelectable="false"
7272
app:layout_constraintStart_toStartOf="parent"
7373
app:layout_constraintEnd_toEndOf="parent"
74-
app:layout_constraintTop_toBottomOf="@id/submit_confirmation_code"
74+
app:layout_constraintTop_toBottomOf="@+id/submit_confirmation_code"
7575
tools:text="Resend in 0:01" />
7676

7777
<TextView
@@ -86,7 +86,7 @@
8686
android:visibility="gone"
8787
app:layout_constraintStart_toStartOf="parent"
8888
app:layout_constraintEnd_toEndOf="parent"
89-
app:layout_constraintTop_toTopOf="@id/ticker"
89+
app:layout_constraintTop_toTopOf="@+id/ticker"
9090
tools:text="Resend code" />
9191

9292
<android.support.constraint.Barrier
@@ -103,7 +103,7 @@
103103
android:layout_height="wrap_content"
104104
android:layout_marginTop="@dimen/fui_field_padding_vert"
105105
android:textIsSelectable="false"
106-
app:layout_constraintTop_toBottomOf="@id/tos_barrier"
106+
app:layout_constraintTop_toBottomOf="@+id/tos_barrier"
107107
tools:text="@string/fui_create_account_preamble_tos_and_pp" />
108108

109109
</android.support.constraint.ConstraintLayout>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
android:id="@+id/country_list"
1414
style="@style/FirebaseUI.CountrySpinner"
1515
app:layout_constraintStart_toStartOf="parent"
16-
app:layout_constraintBaseline_toBaselineOf="@id/phone_layout" />
16+
app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
1717

1818
<com.firebase.ui.auth.util.ui.BaselineTextInputLayout
1919
android:id="@+id/phone_layout"
2020
style="@style/FirebaseUI.TextInputLayout.PhoneField"
2121
android:layout_width="0dp"
2222
android:layout_height="wrap_content"
23-
app:layout_constraintStart_toEndOf="@id/country_list"
23+
app:layout_constraintStart_toEndOf="@+id/country_list"
2424
app:layout_constraintEnd_toEndOf="parent"
2525
app:layout_constraintTop_toTopOf="parent">
2626

@@ -36,7 +36,7 @@
3636
style="@style/FirebaseUI.VerifyPhoneButton"
3737
android:layout_marginTop="@dimen/fui_field_padding_vert"
3838
android:text="@string/fui_verify_phone_number"
39-
app:layout_constraintTop_toBottomOf="@id/phone_layout" />
39+
app:layout_constraintTop_toBottomOf="@+id/phone_layout" />
4040

4141
<TextView
4242
android:id="@+id/send_sms_tos"
@@ -46,7 +46,7 @@
4646
android:layout_marginTop="@dimen/fui_field_padding_vert"
4747
android:textColor="?android:textColorTertiary"
4848
android:textIsSelectable="false"
49-
app:layout_constraintTop_toBottomOf="@id/send_code" />
49+
app:layout_constraintTop_toBottomOf="@+id/send_code" />
5050

5151
</android.support.constraint.ConstraintLayout>
5252

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="@dimen/fui_field_padding_vert"
2020
android:transitionGroup="true"
21-
android:transitionName="email_field"
21+
android:transitionName="@string/fui_email_field_name"
2222
app:errorEnabled="true"
2323
tools:ignore="UnusedAttribute">
2424

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:layout_width="match_parent"
2525
android:layout_height="wrap_content"
2626
android:textIsSelectable="false"
27-
app:layout_constraintTop_toBottomOf="@id/heading"
27+
app:layout_constraintTop_toBottomOf="@+id/heading"
2828
tools:text="@string/fui_welcome_back_password_prompt_body" />
2929

3030
<android.support.design.widget.TextInputLayout
@@ -33,7 +33,7 @@
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
3535
android:layout_marginTop="@dimen/fui_field_padding_vert"
36-
app:layout_constraintTop_toBottomOf="@id/welcome_back_password_body"
36+
app:layout_constraintTop_toBottomOf="@+id/welcome_back_password_body"
3737
app:passwordToggleEnabled="true">
3838

3939
<android.support.design.widget.TextInputEditText
@@ -50,16 +50,16 @@
5050
android:layout_marginTop="@dimen/fui_field_padding_vert"
5151
android:text="@string/fui_trouble_signing_in"
5252
app:layout_constraintStart_toStartOf="parent"
53-
app:layout_constraintEnd_toStartOf="@id/button_done"
54-
app:layout_constraintTop_toBottomOf="@id/password_layout" />
53+
app:layout_constraintEnd_toStartOf="@+id/button_done"
54+
app:layout_constraintTop_toBottomOf="@+id/password_layout" />
5555

5656
<Button
5757
android:id="@+id/button_done"
5858
style="@style/FirebaseUI.Button"
5959
android:text="@string/fui_sign_in_default"
60-
app:layout_constraintStart_toEndOf="@id/trouble_signing_in"
60+
app:layout_constraintStart_toEndOf="@+id/trouble_signing_in"
6161
app:layout_constraintEnd_toEndOf="parent"
62-
app:layout_constraintTop_toTopOf="@id/trouble_signing_in" />
62+
app:layout_constraintTop_toTopOf="@+id/trouble_signing_in" />
6363

6464
</android.support.constraint.ConstraintLayout>
6565

‎auth/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<string name="fui_create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping <xliff:g example="SAVE" id="btn" translation_description="">%1$s</xliff:g> you are indicating that you agree to the <xliff:g example="https://google.com/privacy" id="pp" translation_description="">%2$s</xliff:g>.</string>
4848
<string name="fui_terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
4949
<string name="fui_privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
50+
<string name="fui_email_field_name" translatable="false">email_field</string>
5051

5152
<!-- Idp/Email welcome back -->
5253
<string name="fui_title_welcome_back_idp_prompt" translatable="false">@string/fui_sign_in_default</string>

0 commit comments

Comments
 (0)