firebase · samtstern · Oct 3, 2017 · Jul 13, 2017 · Jul 25, 2017 · Jul 26, 2017
diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 [![Build Status](https://travis-ci.org/firebase/FirebaseUI-Android.svg?branch=master)](https://travis-ci.org/firebase/FirebaseUI-Android)
 
 FirebaseUI is an open-source library for Android that allows you to
-quickly connect common UI elements to [Firebase](https://firebase.google.com)
-APIs like the Realtime Database or Firebase Authentication.
+quickly connect common UI elements to [Firebase](https://firebase.google.com) APIs.
 
 A compatible FirebaseUI client is also available for [iOS](https://github.com/firebase/firebaseui-ios).
 
@@ -19,10 +18,11 @@ A compatible FirebaseUI client is also available for [iOS](https://github.com/fi
 
 ## Usage
 
-FirebaseUI has separate modules for using Firebase Database, Auth, and Storage. To
-get started, see the individual instructions for each module:
+FirebaseUI has separate modules for using Firebase Realtime Database, Cloud Firestore, 
+Firebase Auth, and Cloud Storage. To get started, see the individual instructions for each module:
 
   * [firebase-ui-database](database/README.md)
+  * [firebase-ui-firestore](firestore/README.md)
   * [firebase-ui-auth](auth/README.md)
   * [firebase-ui-storage](storage/README.md)
 
@@ -38,17 +38,17 @@ libraries.
 
 ```groovy
 dependencies {
-    // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:2.4.0'
+    // FirebaseUI for Firebase Realtime Database
+    compile 'com.firebaseui:firebase-ui-database:3.0.0'
+
+    // FirebaseUI for Cloud Firestore
+    compile 'com.firebaseui:firebase-ui-firestore:3.0.0'
 
-    // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:2.4.0'
+    // FirebaseUI for Firebase Auth
+    compile 'com.firebaseui:firebase-ui-auth:3.0.0'
 
-    // FirebaseUI Storage only
-    compile 'com.firebaseui:firebase-ui-storage:2.4.0'
-
-    // Single target that includes all FirebaseUI libraries above
-    compile 'com.firebaseui:firebase-ui:2.4.0'
+    // FirebaseUI for Cloud Storage
+    compile 'com.firebaseui:firebase-ui-storage:3.0.0'
 }
 ```
 
@@ -63,6 +63,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 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)
 
 ## Dependencies
@@ -78,6 +79,9 @@ firebase-ui-auth
 firebase-ui-database
 |--- com.google.firebase:firebase-database
 
+firebase-ui-firestore
+|--- com.google.firebase:firebase-firestore
+
 firebase-ui-storage
 |--- com.google.firebase:firebase-storage
 ```
@@ -91,6 +95,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 3.0.0              | 11.4.2                         |
 | 2.4.0              | 11.4.0                         |
 | 2.3.0              | 11.0.4                         |
 | 2.2.0              | 11.0.4                         |
@@ -121,7 +126,7 @@ compile "com.android.support:customtabs:$BAR"
 compile "com.android.support:cardview-v7:$BAR"
 ```
 
-Database:
+Realtime Database:
 
 ```groovy
 compile "com.google.firebase:firebase-database:$FOO"
@@ -130,6 +135,15 @@ compile "com.android.support:recyclerview-v7:$BAR"
 compile "com.android.support:support-v4:$BAR"
 ```
 
+Firestore:
+
+```groovy
+compile "com.google.firebase:firebase-firestore:$FOO"
+
+compile "com.android.support:recyclerview-v7:$BAR"
+compile "com.android.support:support-v4:$BAR"
+```
+
 Storage:
 
 ```groovy

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,6 +13,7 @@ android {
         versionName "1.0"
 
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -34,28 +35,36 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "com.android.support:design:$supportLibraryVersion"
+    compile 'com.android.support:multidex:1.0.1'
 
     compile project(path: ':auth')
     compile project(path: ':database')
+    compile project(path: ':firestore')
     compile project(path: ':storage')
 
     compile "com.google.android.gms:play-services-auth:$firebaseVersion"
     compile "com.google.firebase:firebase-auth:$firebaseVersion"
     compile "com.google.firebase:firebase-database:$firebaseVersion"
     compile "com.google.firebase:firebase-storage:$firebaseVersion"
 
-    compile('com.facebook.android:facebook-android-sdk:4.25.0')
+    compile('com.facebook.android:facebook-login:4.27.0')
     compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
 
+    compile "android.arch.lifecycle:runtime:$architectureVersion"
+    compile "android.arch.lifecycle:extensions:$architectureVersion"
+
+    compile 'com.github.bumptech.glide:glide:4.1.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.1.1'
+
     // 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.
-    compile 'pub.devrel:easypermissions:0.4.3'
+    compile 'pub.devrel:easypermissions:1.0.1'
     compile 'com.jakewharton:butterknife:8.7.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,33 +21,40 @@
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <!-- Chat demo -->
-        <activity
-            android:name=".database.ChatActivity"
-            android:label="@string/name_chat" />
-        <activity
-            android:name=".database.ChatIndexActivity"
-            android:label="@string/name_chat" />
-
         <!-- Auth UI demo -->
         <activity
             android:name=".auth.AuthUiActivity"
-            android:label="@string/name_auth_ui" />
+            android:label="@string/title_auth_activity" />
         <activity
             android:name=".auth.SignedInActivity"
-            android:label="@string/name_auth_ui" />
+            android:label="@string/title_auth_activity" />
+
+        <!-- Firestore demo -->
+        <activity
+            android:name=".database.firestore.FirestoreChatActivity"
+            android:label="@string/title_firestore_activity" />
+
+        <!-- Realtime database demo -->
+        <activity
+            android:name=".database.realtime.RealtimeDbChatActivity"
+            android:label="@string/title_realtime_database_activity" />
+        <activity
+            android:name=".database.realtime.RealtimeDbChatIndexActivity"
+            android:label="@string/title_realtime_database_activity" />
 
-        <!-- Storage UI demo-->
+        <!-- Storage UI demo -->
         <activity
             android:name=".storage.ImageActivity"
-            android:label="@string/name_image" />
+            android:label="@string/title_storage_activity" />
 
     </application>
 

diff --git a/app/src/main/java/com/firebase/uidemo/ChooserActivity.java b/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
@@ -26,7 +26,8 @@
 import android.widget.TextView;
 
 import com.firebase.uidemo.auth.AuthUiActivity;
-import com.firebase.uidemo.database.ChatActivity;
+import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
+import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
 import com.firebase.uidemo.storage.ImageActivity;
 
 import butterknife.BindView;
@@ -49,21 +50,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
         private static final Class[] CLASSES = new Class[]{
-                ChatActivity.class,
                 AuthUiActivity.class,
+                FirestoreChatActivity.class,
+                RealtimeDbChatActivity.class,
                 ImageActivity.class,
         };
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
-                R.string.name_chat,
-                R.string.name_auth_ui,
-                R.string.name_image
+                R.string.title_auth_activity,
+                R.string.title_firestore_activity,
+                R.string.title_realtime_database_activity,
+                R.string.title_storage_activity
         };
 
         private static final int[] DESCRIPTION_IDS = new int[]{
-                R.string.desc_chat,
-                R.string.desc_auth_ui,
-                R.string.desc_image
+                R.string.desc_auth,
+                R.string.desc_firestore,
+                R.string.desc_realtime_database,
+                R.string.desc_storage
         };
 
         @Override
@@ -92,8 +96,8 @@ private static class ActivityStarterHolder extends RecyclerView.ViewHolder imple
 
         public ActivityStarterHolder(View itemView) {
             super(itemView);
-            mTitle = (TextView) itemView.findViewById(R.id.text1);
-            mDescription = (TextView) itemView.findViewById(R.id.text2);
+            mTitle = itemView.findViewById(R.id.text1);
+            mDescription = itemView.findViewById(R.id.text2);
         }
 
         private void bind(Class aClass, @StringRes int name, @StringRes int description) {

diff --git a/app/src/main/java/com/firebase/uidemo/auth/FirebaseUIDemo.java b/app/src/main/java/com/firebase/uidemo/auth/FirebaseUIDemo.java
@@ -1,13 +1,13 @@
 package com.firebase.uidemo.auth;
 
-import android.app.Application;
 import android.content.Context;
+import android.support.multidex.MultiDexApplication;
 import android.support.v7.app.AppCompatDelegate;
 
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 
-public class FirebaseUIDemo extends Application {
+public class FirebaseUIDemo extends MultiDexApplication {
     private RefWatcher mRefWatcher;
 
     static {

diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -31,11 +31,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.uidemo.R;
+import com.firebase.uidemo.storage.GlideApp;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.EmailAuthProvider;
@@ -69,7 +69,6 @@ public class SignedInActivity extends AppCompatActivity {
     @BindView(R.id.user_display_name)
     TextView mUserDisplayName;
 
-
     @BindView(R.id.user_phone_number)
     TextView mUserPhoneNumber;
 
@@ -165,7 +164,7 @@ public void onComplete(@NonNull Task<Void> task) {
     private void populateProfile() {
         FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
         if (user.getPhotoUrl() != null) {
-            Glide.with(this)
+            GlideApp.with(this)
                     .load(user.getPhotoUrl())
                     .fitCenter()
                     .into(mUserProfilePicture);

diff --git a/app/src/main/java/com/firebase/uidemo/database/AbstractChat.java b/app/src/main/java/com/firebase/uidemo/database/AbstractChat.java
@@ -0,0 +1,14 @@
+package com.firebase.uidemo.database;
+
+/**
+ * Common interface for chat messages, helps share code between RTDB and Firestore examples.
+ */
+public abstract class AbstractChat {
+
+    public abstract String getName();
+
+    public abstract String getMessage();
+
+    public abstract String getUid();
+
+}