Merge pull request #1311 from firebase/version-4.0

Version 4.0

Author: samtstern

.opensource/project.json

@@ -20,7 +20,8 @@
         "storage/README.md",
         "firestore/README.md",
         "docs/upgrade-to-2.0.md",
-        "docs/upgrade-to-3.0.md"
+        "docs/upgrade-to-3.0.md",
+        "docs/upgrade-to-4.0.md"
     ],
 
     // Related projects on Github, in the format $owner/$repo[/$subproject]

README.md

@@ -47,16 +47,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:3.3.1'
+    implementation 'com.firebaseui:firebase-ui-database:4.0.0'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:3.3.1'
+    implementation 'com.firebaseui:firebase-ui-firestore:4.0.0'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:3.3.1'
+    implementation 'com.firebaseui:firebase-ui-auth:4.0.0'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:3.3.1'
+    implementation 'com.firebaseui:firebase-ui-storage:4.0.0'
 }
 ```
 
@@ -70,6 +70,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
 If you are using an old version of FirebaseUI and upgrading, please see the appropriate
 migration guide:
 
+* [Upgrade from 3.3.1 to 4.x.x](./docs/upgrade-to-4.0.md)
 * [Upgrade from 2.3.0 to 3.x.x](./docs/upgrade-to-3.0.md)
 * [Upgrade from 1.2.0 to 2.x.x](./docs/upgrade-to-2.0.md)
 
@@ -93,24 +94,20 @@ firebase-ui-storage
 |--- com.google.firebase:firebase-storage
 ```
 
-Each version of FirebaseUI has dependency on a fixed version of these libraries, defined as the variable `firebase_version`
-in `common/constants.gradle`. If you are using any dependencies in your app of the form
-`implementation 'com.google.firebase:firebase-*:x.y.z'` or
-`implementation 'com.google.android.gms:play-services-*:x.y.z'`
-you need to make sure that you use the same version that your chosen version of FirebaseUI requires.
+As of version `15.0.0`, Firebase and Google Play services libraries have independent, semantic
+versions. This means that FirebaseUI has independent dependencies on each of the libraries above.
+For best results, your app should depend on a version of each dependency with the same major
+version number as the version used by FirebaseUI.
 
-For convenience, here are some recent examples:
-
-| FirebaseUI Version | Firebase/Play Services Version |
-|--------------------|--------------------------------|
-| 3.3.1              | 15.0.0                         |
-| 3.3.0              | 12.0.1                         |
-| 3.2.2              | 11.8.0                         |
-| 3.1.3              | 11.8.0                         |
-| 3.0.0              | 11.4.2                         |
-| 2.4.0              | 11.4.0                         |
-| 1.1.1              | 10.0.0 or 10.0.1               |
+As of version `4.0.0`, FirebaseUI has the following dependency versions:
 
+| Library              | Version                        |
+|----------------------|--------------------------------|
+| `firebase-auth`      | 15.1.0                         |
+| `play-services-auth` | 15.0.1                         |
+| `firebase-database`  | 15.0.1                         |
+| `firebase-firestore` | 16.0.0                         |
+| `firebase-storage`   | 15.0.2                         |
 
 ### Upgrading dependencies
 

app/build.gradle

@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    implementation "com.google.firebase:firebase-core:$firebaseVersion"
+    implementation "com.google.firebase:firebase-core:$coreVersion"
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation 'com.android.support:multidex:1.0.3'
 
@@ -45,14 +45,17 @@ dependencies {
     implementation project(path: ':database')
     implementation project(path: ':storage')
 
-    implementation 'com.facebook.android:facebook-login:4.31.0'
+    implementation 'com.facebook.android:facebook-login:4.32.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.6.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1'
+    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
+
+    // Used for FirestorePagingActivity
+    implementation "android.arch.paging:runtime:$pagingVersion"
 
     // 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

app/src/main/AndroidManifest.xml

@@ -43,6 +43,11 @@
             android:name=".database.firestore.FirestoreChatActivity"
             android:label="@string/title_firestore_activity" />
 
+        <!-- Firestore paging demo -->
+        <activity
+            android:name=".database.firestore.FirestorePagingActivity"
+            android:label="@string/title_firestore_paging_activity" />
+
         <!-- Realtime database demo -->
         <activity
             android:name=".database.realtime.RealtimeDbChatActivity"

app/src/main/java/com/firebase/uidemo/ChooserActivity.java

@@ -28,6 +28,7 @@
 
 import com.firebase.uidemo.auth.AuthUiActivity;
 import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
+import com.firebase.uidemo.database.firestore.FirestorePagingActivity;
 import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
 import com.firebase.uidemo.storage.ImageActivity;
 
@@ -53,20 +54,23 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit
         private static final Class[] CLASSES = new Class[]{
                 AuthUiActivity.class,
                 FirestoreChatActivity.class,
+                FirestorePagingActivity.class,
                 RealtimeDbChatActivity.class,
                 ImageActivity.class,
         };
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
                 R.string.title_auth_activity,
                 R.string.title_firestore_activity,
+                R.string.title_firestore_paging_activity,
                 R.string.title_realtime_database_activity,
                 R.string.title_storage_activity
         };
 
         private static final int[] DESCRIPTION_IDS = new int[]{
                 R.string.desc_auth,
                 R.string.desc_firestore,
+                R.string.desc_firestore_paging,
                 R.string.desc_realtime_database,
                 R.string.desc_storage
         };

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -18,6 +18,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
@@ -26,7 +27,6 @@
 import android.support.v7.app.AppCompatDelegate;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -39,6 +39,9 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.uidemo.R;
 import com.google.android.gms.common.Scopes;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
 import java.util.ArrayList;
@@ -60,7 +63,6 @@ public class AuthUiActivity extends AppCompatActivity {
     private static final int RC_SIGN_IN = 100;
 
     @BindView(R.id.root) View mRootView;
-    @BindView(R.id.sign_in) Button mSignIn;
 
     @BindView(R.id.google_provider) CheckBox mUseGoogleProvider;
     @BindView(R.id.facebook_provider) CheckBox mUseFacebookProvider;
@@ -166,6 +168,21 @@ public void signIn(View view) {
                 RC_SIGN_IN);
     }
 
+    @OnClick(R.id.sign_in_silent)
+    public void silentSignIn(View view) {
+        AuthUI.getInstance().silentSignIn(this, getSelectedProviders())
+                .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+                    @Override
+                    public void onComplete(@NonNull Task<AuthResult> task) {
+                        if (task.isSuccessful()) {
+                            startSignedInActivity(null);
+                        } else {
+                            showSnackbar(R.string.sign_in_failed);
+                        }
+                    }
+                });
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);