Version 3.1.3

firebase · Jan 5, 2018 · 7ca207e · 7ca207e
2 parents 02b5fa5 + 94b66d9
commit 7ca207e
Show file tree

Hide file tree

Showing 45 changed files with 215 additions and 97 deletions.
diff --git a/README.md b/README.md
@@ -46,16 +46,16 @@ libraries.
 ```groovy
 dependencies {
 // FirebaseUI for Firebase Realtime Database
-implementation 'com.firebaseui:firebase-ui-database:3.1.2'
+implementation 'com.firebaseui:firebase-ui-database:3.1.3'
 
 // FirebaseUI for Cloud Firestore
-implementation 'com.firebaseui:firebase-ui-firestore:3.1.2'
+implementation 'com.firebaseui:firebase-ui-firestore:3.1.3'
 
 // FirebaseUI for Firebase Auth
-implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
+implementation 'com.firebaseui:firebase-ui-auth:3.1.3'
 
 // FirebaseUI for Cloud Storage
-implementation 'com.firebaseui:firebase-ui-storage:3.1.2'
+implementation 'com.firebaseui:firebase-ui-storage:3.1.3'
 }
 ```
 
@@ -102,6 +102,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 3.1.3              | 11.8.0                         |
 | 3.1.2              | 11.6.2                         |
 | 3.1.0              | 11.4.2                         |
 | 3.0.0              | 11.4.2                         |

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -45,19 +45,19 @@ dependencies {
     implementation project(path: ':database')
     implementation project(path: ':storage')
 
-    implementation 'com.facebook.android:facebook-login:4.28.0'
+    implementation 'com.facebook.android:facebook-login:4.29.0'
     // Needed to override Facebook
     implementation "com.android.support:cardview-v7:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
     implementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
 
-    implementation 'com.github.bumptech.glide:glide:4.3.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
+    implementation 'com.github.bumptech.glide:glide:4.4.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
 
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    implementation 'pub.devrel:easypermissions:1.0.1'
+    implementation 'pub.devrel:easypermissions:1.1.1'
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'

diff --git a/app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java b/app/src/main/java/com/firebase/uidemo/storage/ImageActivity.java
@@ -155,19 +155,19 @@ private void showDownloadUI() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String[] permissions,
-                                           int[] grantResults) {
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
     }
 
     @Override
-    public void onPermissionsGranted(int requestCode, List<String> perms) {
+    public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
         // See #choosePhoto with @AfterPermissionGranted
     }
 
     @Override
-    public void onPermissionsDenied(int requestCode, List<String> perms) {
+    public void onPermissionsDenied(int requestCode, @NonNull List<String> perms) {
         if (EasyPermissions.somePermissionPermanentlyDenied(this,
                                                             Collections.singletonList(PERMS))) {
             new AppSettingsDialog.Builder(this).build().show();

diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
@@ -20,7 +20,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_above="@id/footer"
+        android:layout_above="@+id/footer"
         android:clipToPadding="false"
         android:padding="16dp"
         tools:listitem="@layout/message" />

diff --git a/app/src/main/res/layout/activity_chooser_item.xml b/app/src/main/res/layout/activity_chooser_item.xml
@@ -28,9 +28,9 @@
             android:id="@+id/text2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignStart="@id/text1"
-            android:layout_alignLeft="@id/text1"
-            android:layout_below="@id/text1"
+            android:layout_alignStart="@+id/text1"
+            android:layout_alignLeft="@+id/text1"
+            android:layout_below="@+id/text1"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textIsSelectable="false" />
 

diff --git a/app/src/main/res/layout/message.xml b/app/src/main/res/layout/message.xml
@@ -51,9 +51,9 @@
         android:id="@+id/right_arrow"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_alignEnd="@id/message"
+        android:layout_alignEnd="@+id/message"
         android:layout_marginEnd="25dp"
-        android:layout_alignRight="@id/message"
+        android:layout_alignRight="@+id/message"
         android:layout_marginRight="25dp"
         android:layout_alignParentTop="true"
         android:background="@drawable/ic_chat_message_arrow"

diff --git a/auth/README.md b/auth/README.md
@@ -62,7 +62,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:3.1.2'
+    implementation 'com.firebaseui:firebase-ui-auth:3.1.3'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94

diff --git a/auth/build.gradle b/auth/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion targetSdk
         versionCode 1
-        versionName "1.0"
+        versionName version
 
         vectorDrawables.useSupportLibrary = true
         resourcePrefix "fui_"
@@ -36,7 +36,7 @@ android {
 dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
 
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
@@ -52,10 +52,12 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
     //noinspection GradleDynamicVersion
-    testImplementation 'org.mockito:mockito-core:2.12.+'
-    testImplementation 'org.robolectric:robolectric:3.5.1'
-    testImplementation 'com.facebook.android:facebook-login:4.28.0'
+    testImplementation 'org.mockito:mockito-core:2.13.+'
+    testImplementation 'org.robolectric:robolectric:3.6.1'
+    testImplementation 'com.facebook.android:facebook-login:4.29.0'
     testImplementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }
+
+    lintChecks project(':lint')
 }
 
 javadoc.include([

diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -184,6 +184,20 @@ public static AuthUI getInstance() {
      */
     @NonNull
     public static AuthUI getInstance(@NonNull FirebaseApp app) {
+        AuthUI authUi;
+        synchronized (INSTANCES) {
+            authUi = INSTANCES.get(app);
+            if (authUi == null) {
+                authUi = new AuthUI(app);
+                authUi.mAuth.setFirebaseUIVersion(BuildConfig.VERSION_NAME);
+                INSTANCES.put(app, authUi);
+            }
+        }
+        return authUi;
+    }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    static AuthUI getTestInstance(FirebaseApp app) {
         AuthUI authUi;
         synchronized (INSTANCES) {
             authUi = INSTANCES.get(app);

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/EmailActivity.java
@@ -20,6 +20,7 @@
 import android.support.annotation.RestrictTo;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewCompat;
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
@@ -123,7 +124,11 @@ public void onNewUser(User user) {
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction()
                     .replace(R.id.fragment_register_email, fragment, RegisterEmailFragment.TAG);
 
-            if (emailLayout != null) ft.addSharedElement(emailLayout, "email_field");
+            if (emailLayout != null) {
+                String emailFieldName = getString(R.string.fui_email_field_name);
+                ViewCompat.setTransitionName(emailLayout, emailFieldName);
+                ft.addSharedElement(emailLayout, emailFieldName);
+            }
 
             ft.disallowAddToBackStack().commit();
         } else {

diff --git a/auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml b/auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml
@@ -13,7 +13,7 @@
         android:id="@+id/logo"
         style="@style/FirebaseUI.AuthMethodPicker.Logo"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/container"
+        app:layout_constraintEnd_toStartOf="@+id/container"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="ContentDescription" />  <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->

diff --git a/auth/src/main/res/layout/fui_auth_method_picker_layout.xml b/auth/src/main/res/layout/fui_auth_method_picker_layout.xml
@@ -15,7 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/container"
+        app:layout_constraintBottom_toTopOf="@+id/container"
         tools:ignore="ContentDescription" /> <!-- TODO remove once the bug is fixed: https://issuetracker.google.com/issues/38281866-->
 
     <ScrollView

diff --git a/auth/src/main/res/layout/fui_check_email_layout.xml b/auth/src/main/res/layout/fui_check_email_layout.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:transitionGroup="true"
-            android:transitionName="email_field"
+            android:transitionName="@string/fui_email_field_name"
             app:errorEnabled="true"
             tools:ignore="UnusedAttribute">
 

diff --git a/auth/src/main/res/layout/fui_confirmation_code_layout.xml b/auth/src/main/res/layout/fui_confirmation_code_layout.xml
@@ -25,15 +25,15 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/fui_linkColor"
-            app:layout_constraintTop_toBottomOf="@id/header"
+            app:layout_constraintTop_toBottomOf="@+id/header"
             tools:ignore="SelectableText" />
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/confirmation_code_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/fui_field_padding_vert"
-            app:layout_constraintTop_toBottomOf="@id/edit_phone_number">
+            app:layout_constraintTop_toBottomOf="@+id/edit_phone_number">
 
             <com.firebase.ui.auth.ui.phone.SpacedEditText
                 android:id="@+id/confirmation_code"
@@ -57,7 +57,7 @@
             style="@style/FirebaseUI.VerifyPhoneButton"
             android:layout_gravity="end"
             android:text="@string/fui_continue_phone_login"
-            app:layout_constraintTop_toBottomOf="@id/confirmation_code_layout" />
+            app:layout_constraintTop_toBottomOf="@+id/confirmation_code_layout" />
 
         <TextView
             android:id="@+id/ticker"
@@ -71,7 +71,7 @@
             android:textIsSelectable="false"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/submit_confirmation_code"
+            app:layout_constraintTop_toBottomOf="@+id/submit_confirmation_code"
             tools:text="Resend in 0:01" />
 
         <TextView
@@ -86,7 +86,7 @@
             android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/ticker"
+            app:layout_constraintTop_toTopOf="@+id/ticker"
             tools:text="Resend code" />
 
         <android.support.constraint.Barrier
@@ -103,7 +103,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:textIsSelectable="false"
-            app:layout_constraintTop_toBottomOf="@id/tos_barrier"
+            app:layout_constraintTop_toBottomOf="@+id/tos_barrier"
             tools:text="@string/fui_create_account_preamble_tos_and_pp" />
 
     </android.support.constraint.ConstraintLayout>

diff --git a/auth/src/main/res/layout/fui_phone_layout.xml b/auth/src/main/res/layout/fui_phone_layout.xml
@@ -13,14 +13,14 @@
             android:id="@+id/country_list"
             style="@style/FirebaseUI.CountrySpinner"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/phone_layout" />
+            app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
 
         <com.firebase.ui.auth.util.ui.BaselineTextInputLayout
             android:id="@+id/phone_layout"
             style="@style/FirebaseUI.TextInputLayout.PhoneField"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toEndOf="@id/country_list"
+            app:layout_constraintStart_toEndOf="@+id/country_list"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -36,7 +36,7 @@
             style="@style/FirebaseUI.VerifyPhoneButton"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:text="@string/fui_verify_phone_number"
-            app:layout_constraintTop_toBottomOf="@id/phone_layout" />
+            app:layout_constraintTop_toBottomOf="@+id/phone_layout" />
 
         <TextView
             android:id="@+id/send_sms_tos"
@@ -46,7 +46,7 @@
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:textColor="?android:textColorTertiary"
             android:textIsSelectable="false"
-            app:layout_constraintTop_toBottomOf="@id/send_code" />
+            app:layout_constraintTop_toBottomOf="@+id/send_code" />
 
     </android.support.constraint.ConstraintLayout>
 

diff --git a/auth/src/main/res/layout/fui_register_email_layout.xml b/auth/src/main/res/layout/fui_register_email_layout.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:transitionGroup="true"
-            android:transitionName="email_field"
+            android:transitionName="@string/fui_email_field_name"
             app:errorEnabled="true"
             tools:ignore="UnusedAttribute">
 

diff --git a/auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml
@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textIsSelectable="false"
-            app:layout_constraintTop_toBottomOf="@id/heading"
+            app:layout_constraintTop_toBottomOf="@+id/heading"
             tools:text="@string/fui_welcome_back_password_prompt_body" />
 
         <android.support.design.widget.TextInputLayout
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/fui_field_padding_vert"
-            app:layout_constraintTop_toBottomOf="@id/welcome_back_password_body"
+            app:layout_constraintTop_toBottomOf="@+id/welcome_back_password_body"
             app:passwordToggleEnabled="true">
 
             <android.support.design.widget.TextInputEditText
@@ -50,16 +50,16 @@
             android:layout_marginTop="@dimen/fui_field_padding_vert"
             android:text="@string/fui_trouble_signing_in"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/button_done"
-            app:layout_constraintTop_toBottomOf="@id/password_layout" />
+            app:layout_constraintEnd_toStartOf="@+id/button_done"
+            app:layout_constraintTop_toBottomOf="@+id/password_layout" />
 
         <Button
             android:id="@+id/button_done"
             style="@style/FirebaseUI.Button"
             android:text="@string/fui_sign_in_default"
-            app:layout_constraintStart_toEndOf="@id/trouble_signing_in"
+            app:layout_constraintStart_toEndOf="@+id/trouble_signing_in"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/trouble_signing_in" />
+            app:layout_constraintTop_toTopOf="@+id/trouble_signing_in" />
 
     </android.support.constraint.ConstraintLayout>
 

diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <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>
     <string name="fui_terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
     <string name="fui_privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="fui_email_field_name" translatable="false">email_field</string>
 
     <!-- Idp/Email welcome back -->
     <string name="fui_title_welcome_back_idp_prompt" translatable="false">@string/fui_sign_in_default</string>