Revamp Firestore sample with new public repo changes (#4)

SUPERCILEX · samtstern · commit 4c194a98c771 · 2017-09-13T13:53:55.000-07:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
         <!-- Firestore demo -->
         <activity
             android:name=".database.firestore.FirestoreChatActivity"
-            android:label="@string/name_chat" />
+            android:label="@string/title_firestore_activity" />
 
         <!-- Realtime database demo -->
         <activity
diff --git a/app/src/main/java/com/firebase/uidemo/ChooserActivity.java b/app/src/main/java/com/firebase/uidemo/ChooserActivity.java
@@ -58,14 +58,14 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
                 R.string.title_auth_activity,
-                R.string.name_firestore_chat,
+                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_auth,
-                R.string.desc_firestore_chat,
+                R.string.desc_firestore,
                 R.string.desc_realtime_database,
                 R.string.desc_storage
         };
diff --git a/app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java b/app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java
@@ -2,7 +2,6 @@
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -14,15 +13,17 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
 import com.firebase.ui.firestore.FirestoreRecyclerOptions;
 import com.firebase.uidemo.R;
 import com.firebase.uidemo.database.ChatHolder;
-import com.google.android.gms.tasks.OnCompleteListener;
+import com.firebase.uidemo.database.realtime.Chat;
+import com.firebase.uidemo.util.LifecycleActivity;
+import com.firebase.uidemo.util.SignInResultNotifier;
 import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.CollectionReference;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.Query;
 
@@ -31,14 +32,28 @@
 import butterknife.OnClick;
 
 /**
- * Class demonstrating a simple real-time chat app that relies on {@link FirestoreRecyclerAdapter}.
+ * Class demonstrating how to setup a {@link RecyclerView} with an adapter while taking sign-in
+ * states into consideration. Also demonstrates adding data to a ref and then reading it back using
+ * the {@link FirestoreRecyclerAdapter} to build a simple chat app.
+ * <p>
+ * For a general intro to the RecyclerView, see <a href="https://developer.android.com/training/material/lists-cards.html">Creating
+ * Lists</a>.
  */
-public class FirestoreChatActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener {
+public class FirestoreChatActivity extends LifecycleActivity
+        implements FirebaseAuth.AuthStateListener {
+    private static final String TAG = "FirestoreChatActivity";
 
-    private static final String TAG = "FirestoreChat";
+    private static final CollectionReference sChatCollection =
+            FirebaseFirestore.getInstance().collection("chats");
+    /** Get the last 50 chat messages ordered by timestamp . */
+    private static final Query sChatQuery = sChatCollection.orderBy("timestamp").limit(50);
+
+    static {
+        FirebaseFirestore.setLoggingEnabled(true);
+    }
 
     @BindView(R.id.messagesList)
-    RecyclerView mRecycler;
+    RecyclerView mRecyclerView;
 
     @BindView(R.id.sendButton)
     Button mSendButton;
@@ -49,117 +64,110 @@ public class FirestoreChatActivity extends AppCompatActivity implements Firebase
     @BindView(R.id.emptyTextView)
     TextView mEmptyListMessage;
 
-    private FirebaseAuth mAuth;
-    private FirebaseFirestore mFirestore;
-    private FirestoreRecyclerAdapter<Chat, ChatHolder> mAdapter;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chat);
         ButterKnife.bind(this);
 
-        // Enable verbose Firestore logging
-        FirebaseFirestore.setLoggingEnabled(true);
-
-        mAuth = FirebaseAuth.getInstance();
-        mFirestore = FirebaseFirestore.getInstance();
-
-        // Get the last 50 chat messages, ordered by timestamp
-        Query query = mFirestore.collection("chats").orderBy("timestamp").limit(50);
-
-        LinearLayoutManager manager = new LinearLayoutManager(this);
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
 
-        FirestoreRecyclerOptions<Chat> options = new FirestoreRecyclerOptions.Builder<Chat>()
-                .setQuery(query, Chat.class)
-                .build();
-
-        mAdapter = new FirestoreRecyclerAdapter<Chat, ChatHolder>(options) {
+        ImeHelper.setImeOnDoneListener(mMessageEdit, new ImeHelper.DonePressedListener() {
             @Override
-            public void onBindViewHolder(ChatHolder holder, int position, Chat model) {
-                holder.bind(model);
-            }
-
-            @Override
-            public ChatHolder onCreateViewHolder(ViewGroup group, int i) {
-                View view = LayoutInflater.from(group.getContext())
-                        .inflate(R.layout.message, group, false);
-
-                return new ChatHolder(view);
+            public void onDonePressed() {
+                onSendClick();
             }
+        });
+    }
 
-            @Override
-            public void onDataChanged() {
-                // If there are no chat messages, show a view that invites the user to add a message.
-                mEmptyListMessage.setVisibility(getItemCount() == 0 ? View.VISIBLE : View.GONE);
-            }
-        };
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (isSignedIn()) { attachRecyclerViewAdapter(); }
+        FirebaseAuth.getInstance().addAuthStateListener(this);
+    }
 
-        mRecycler.setLayoutManager(manager);
-        mRecycler.setAdapter(mAdapter);
+    @Override
+    protected void onStop() {
+        super.onStop();
+        FirebaseAuth.getInstance().removeAuthStateListener(this);
     }
 
     @Override
     public void onAuthStateChanged(@NonNull FirebaseAuth auth) {
-        if (auth.getCurrentUser() != null) {
-            mAdapter.startListening();
-            mSendButton.setEnabled(true);
+        mSendButton.setEnabled(isSignedIn());
+        mMessageEdit.setEnabled(isSignedIn());
+
+        if (isSignedIn()) {
+            attachRecyclerViewAdapter();
         } else {
-            mAdapter.stopListening();
-            mSendButton.setEnabled(false);
+            Toast.makeText(this, R.string.signing_in, Toast.LENGTH_SHORT).show();
+            auth.signInAnonymously().addOnCompleteListener(new SignInResultNotifier(this));
         }
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-        signInAnonymously();
-        mAuth.addAuthStateListener(this);
+    private boolean isSignedIn() {
+        return FirebaseAuth.getInstance().getCurrentUser() != null;
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        mAuth.removeAuthStateListener(this);
-        mAdapter.stopListening();
-    }
+    private void attachRecyclerViewAdapter() {
+        final RecyclerView.Adapter adapter = newAdapter();
 
-    private void signInAnonymously() {
-        if (mAuth.getCurrentUser() != null) {
-            return;
-        }
+        // Scroll to bottom on new messages
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                mRecyclerView.smoothScrollToPosition(adapter.getItemCount());
+            }
+        });
 
-        mAuth.signInAnonymously()
-                .addOnFailureListener(this, new OnFailureListener() {
-                    @Override
-                    public void onFailure(@NonNull Exception e) {
-                        Log.w(TAG, "signIn:failure", e);
-                        Toast.makeText(FirestoreChatActivity.this,
-                                "Authentication failed.", Toast.LENGTH_LONG).show();
-                    }
-                });
+        mRecyclerView.setAdapter(adapter);
     }
 
     @OnClick(R.id.sendButton)
     public void onSendClick() {
-        String uid = mAuth.getCurrentUser().getUid();
+        String uid = FirebaseAuth.getInstance().getCurrentUser().getUid();
         String name = "User " + uid.substring(0, 6);
 
-        Chat chat = new Chat(name, mMessageEdit.getText().toString(), uid);
-
-        mFirestore.collection("chats").add(chat)
-                .addOnCompleteListener(this,
-                        new OnCompleteListener<DocumentReference>() {
-                            @Override
-                            public void onComplete(@NonNull Task<DocumentReference> task) {
-                                if (!task.isSuccessful()) {
-                                    Log.e(TAG, "Failed to write message", task.getException());
-                                }
-                            }
-                        });
+        onAddMessage(new Chat(name, mMessageEdit.getText().toString(), uid));
 
         mMessageEdit.setText("");
     }
+
+    protected RecyclerView.Adapter newAdapter() {
+        FirestoreRecyclerOptions<Chat> options =
+                new FirestoreRecyclerOptions.Builder<Chat>()
+                        .setQuery(sChatQuery, Chat.class)
+                        .setLifecycleOwner(this)
+                        .build();
+
+        return new FirestoreRecyclerAdapter<Chat, ChatHolder>(options) {
+            @Override
+            public ChatHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+                return new ChatHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.message, parent, false));
+            }
+
+            @Override
+            protected void onBindViewHolder(ChatHolder holder, int position, Chat model) {
+                holder.bind(model);
+            }
+
+            @Override
+            public void onDataChanged() {
+                // If there are no chat messages, show a view that invites the user to add a message.
+                mEmptyListMessage.setVisibility(getItemCount() == 0 ? View.VISIBLE : View.GONE);
+            }
+        };
+    }
+
+    protected void onAddMessage(Chat chat) {
+        sChatCollection.add(chat).addOnFailureListener(this, new OnFailureListener() {
+            @Override
+            public void onFailure(@NonNull Exception e) {
+                Log.e(TAG, "Failed to write message", e);
+            }
+        });
+    }
 }
diff --git a/app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java b/app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java
@@ -38,7 +38,7 @@
  * For a general intro to the RecyclerView, see <a href="https://developer.android.com/training/material/lists-cards.html">Creating
  * Lists</a>.
  */
-public abstract class RealtimeDbChatActivity extends LifecycleActivity
+public class RealtimeDbChatActivity extends LifecycleActivity
         implements FirebaseAuth.AuthStateListener {
     private static final String TAG = "RealtimeDatabaseDemo";
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,13 +3,13 @@
 
     <!-- Chooser -->
     <string name="title_auth_activity">Auth UI demo</string>
-    <string name="name_firestore_chat">FirestoreChatActivity</string>
+    <string name="title_firestore_activity">FirestoreChatActivity</string>
     <string name="title_realtime_database_activity">Real-time database demo</string>
     <string name="title_storage_activity">Storage Image Demo</string>
 
     <string name="desc_auth">Demonstrates the Firebase Auth UI flow, with customization options.</string>
+    <string name="desc_firestore">Demonstrates using a FirestoreRecyclerAdapter to load data from Cloud Firestore into a RecyclerView for a basic chat app.</string>
     <string name="desc_realtime_database">Demonstrates using a FirebaseRecyclerAdapter to load data from Firebase Database into a RecyclerView for a basic chat app.</string>
-    <string name="desc_firestore_chat">Demonstrates using a FirestoreRecyclerAdapter to load data from Cloud Firestore into a RecyclerView for a basic chat app.</string>
     <string name="desc_storage">Demonstrates displaying an image from Cloud Storage using Glide.</string>
 
     <!-- Auth UI -->
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
@@ -11,6 +11,17 @@
             android:targetClass="com.firebase.uidemo.auth.AuthUiActivity"/>
     </shortcut>
 
+    <shortcut
+        android:shortcutId="firestore"
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutShortLabel="@string/title_firestore_activity">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="com.firebase.uidemo"
+            android:targetClass="com.firebase.uidemo.database.firestore.FirestoreChatActivity"/>
+    </shortcut>
+
     <shortcut
         android:shortcutId="realtime-database"
         android:enabled="true"
