Merge from public upstream

Author: SUPERCILEX

app/src/main/AndroidManifest.xml

@@ -30,31 +30,31 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <!-- Chat demo -->
+        <!-- Auth UI demo -->
         <activity
-            android:name=".database.realtime.ChatActivity"
-            android:label="@string/name_chat" />
+            android:name=".auth.AuthUiActivity"
+            android:label="@string/title_auth_activity" />
         <activity
-            android:name=".database.realtime.ChatIndexActivity"
-            android:label="@string/name_chat" />
+            android:name=".auth.SignedInActivity"
+            android:label="@string/title_auth_activity" />
 
         <!-- Firestore demo -->
         <activity
             android:name=".database.firestore.FirestoreChatActivity"
             android:label="@string/name_chat" />
 
-        <!-- Auth UI demo -->
+        <!-- Realtime database demo -->
         <activity
-            android:name=".auth.AuthUiActivity"
-            android:label="@string/name_auth_ui" />
+            android:name=".database.realtime.RealtimeDbChatActivity"
+            android:label="@string/title_realtime_database_activity" />
         <activity
-            android:name=".auth.SignedInActivity"
-            android:label="@string/name_auth_ui" />
+            android:name=".database.realtime.RealtimeDbChatIndexActivity"
+            android:label="@string/title_realtime_database_activity" />
 
         <!-- Storage UI demo -->
         <activity
             android:name=".storage.ImageActivity"
-            android:label="@string/name_image" />
+            android:label="@string/title_storage_activity" />
 
     </application>
 

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

@@ -27,7 +27,7 @@
 
 import com.firebase.uidemo.auth.AuthUiActivity;
 import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
-import com.firebase.uidemo.database.realtime.ChatActivity;
+import com.firebase.uidemo.database.realtime.RealtimeDbChatActivity;
 import com.firebase.uidemo.storage.ImageActivity;
 
 import butterknife.BindView;
@@ -50,24 +50,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
         private static final Class[] CLASSES = new Class[]{
-                ChatActivity.class,
-                FirestoreChatActivity.class,
                 AuthUiActivity.class,
+                FirestoreChatActivity.class,
+                RealtimeDbChatActivity.class,
                 ImageActivity.class,
         };
 
         private static final int[] DESCRIPTION_NAMES = new int[]{
-                R.string.name_chat,
+                R.string.title_auth_activity,
                 R.string.name_firestore_chat,
-                R.string.name_auth_ui,
-                R.string.name_image
+                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,
                 R.string.desc_firestore_chat,
-                R.string.desc_auth_ui,
-                R.string.desc_image
+                R.string.desc_realtime_database,
+                R.string.desc_storage
         };
 
         @Override

app/src/main/java/com/firebase/uidemo/database/ChatHolder.java

@@ -28,12 +28,12 @@ public class ChatHolder extends RecyclerView.ViewHolder {
 
     public ChatHolder(View itemView) {
         super(itemView);
-        mNameField = (TextView) itemView.findViewById(R.id.name_text);
-        mTextField = (TextView) itemView.findViewById(R.id.message_text);
-        mLeftArrow = (FrameLayout) itemView.findViewById(R.id.left_arrow);
-        mRightArrow = (FrameLayout) itemView.findViewById(R.id.right_arrow);
-        mMessageContainer = (RelativeLayout) itemView.findViewById(R.id.message_container);
-        mMessage = (LinearLayout) itemView.findViewById(R.id.message);
+        mNameField = itemView.findViewById(R.id.name_text);
+        mTextField = itemView.findViewById(R.id.message_text);
+        mLeftArrow = itemView.findViewById(R.id.left_arrow);
+        mRightArrow = itemView.findViewById(R.id.right_arrow);
+        mMessageContainer = itemView.findViewById(R.id.message_container);
+        mMessage = itemView.findViewById(R.id.message);
         mGreen300 = ContextCompat.getColor(itemView.getContext(), R.color.material_green_300);
         mGray300 = ContextCompat.getColor(itemView.getContext(), R.color.material_gray_300);
     }