Cleanup (#2)

Author: SUPERCILEX

app/src/main/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.firebase.uidemo">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.firebase.uidemo">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -31,16 +32,16 @@
 
         <!-- Chat demo -->
         <activity
-            android:name=".database.ChatActivity"
+            android:name=".database.realtime.ChatActivity"
             android:label="@string/name_chat" />
         <activity
-            android:name=".database.ChatIndexActivity"
+            android:name=".database.realtime.ChatIndexActivity"
             android:label="@string/name_chat" />
 
         <!-- Firestore demo -->
         <activity
-            android:name=".firestore.FirestoreChatActivity"
-            android:label="@string/name_chat"/>
+            android:name=".database.firestore.FirestoreChatActivity"
+            android:label="@string/name_chat" />
 
         <!-- Auth UI demo -->
         <activity

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

@@ -26,8 +26,8 @@
 import android.widget.TextView;
 
 import com.firebase.uidemo.auth.AuthUiActivity;
-import com.firebase.uidemo.database.ChatActivity;
-import com.firebase.uidemo.firestore.FirestoreChatActivity;
+import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
+import com.firebase.uidemo.database.realtime.ChatActivity;
 import com.firebase.uidemo.storage.ImageActivity;
 
 import butterknife.BindView;
@@ -96,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) {

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

@@ -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;
 

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

@@ -11,5 +11,4 @@ public abstract class AbstractChat {
 
     public abstract String getUid();
 
-
 }

app/src/main/java/com/firebase/uidemo/firestore/Chat.java renamed to app/src/main/java/com/firebase/uidemo/database/firestore/Chat.java

@@ -1,4 +1,4 @@
-package com.firebase.uidemo.firestore;
+package com.firebase.uidemo.database.firestore;
 
 import com.firebase.uidemo.database.AbstractChat;
 import com.google.firebase.firestore.IgnoreExtraProperties;
@@ -12,7 +12,7 @@ public class Chat extends AbstractChat {
     private String mName;
     private String mMessage;
     private String mUid;
-    private @ServerTimestamp Date mTimestamp;
+    private Date mTimestamp;
 
     public Chat() {
         // Needed for Firebase

app/src/main/java/com/firebase/uidemo/firestore/FirestoreChatActivity.java renamed to app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

@@ -1,4 +1,4 @@
-package com.firebase.uidemo.firestore;
+package com.firebase.uidemo.database.firestore;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
         LinearLayoutManager manager = new LinearLayoutManager(this);
         mAdapter = new FirestoreRecyclerAdapter<Chat, ChatHolder>(query, Chat.class) {
             @Override
-            public void onBindViewHolder(ChatHolder holder, int i, Chat model) {
+            public void onBindViewHolder(ChatHolder holder, int position, Chat model) {
                 holder.bind(model);
             }
 

app/src/main/java/com/firebase/uidemo/database/Chat.java renamed to app/src/main/java/com/firebase/uidemo/database/realtime/Chat.java

@@ -1,5 +1,6 @@
-package com.firebase.uidemo.database;
+package com.firebase.uidemo.database.realtime;
 
+import com.firebase.uidemo.database.AbstractChat;
 import com.google.firebase.database.IgnoreExtraProperties;
 
 @IgnoreExtraProperties

app/src/main/java/com/firebase/uidemo/database/ChatActivity.java renamed to app/src/main/java/com/firebase/uidemo/database/realtime/ChatActivity.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.firebase.uidemo.database;
+package com.firebase.uidemo.database.realtime;
 
 import android.arch.lifecycle.LifecycleRegistry;
 import android.arch.lifecycle.LifecycleRegistryOwner;
@@ -30,6 +30,7 @@
 
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
 import com.firebase.uidemo.R;
+import com.firebase.uidemo.database.ChatHolder;
 import com.firebase.uidemo.util.SignInResultNotifier;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.AuthResult;
@@ -64,9 +65,9 @@ protected void onCreate(Bundle savedInstanceState) {
         mAuth = FirebaseAuth.getInstance();
         mAuth.addAuthStateListener(this);
 
-        mSendButton = (Button) findViewById(R.id.sendButton);
-        mMessageEdit = (EditText) findViewById(R.id.messageEdit);
-        mEmptyListMessage = (TextView) findViewById(R.id.emptyTextView);
+        mSendButton = findViewById(R.id.sendButton);
+        mMessageEdit = findViewById(R.id.messageEdit);
+        mEmptyListMessage = findViewById(R.id.emptyTextView);
 
         mChatRef = FirebaseDatabase.getInstance().getReference().child("chats");
 
@@ -75,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mManager = new LinearLayoutManager(this);
         mManager.setReverseLayout(false);
 
-        mMessages = (RecyclerView) findViewById(R.id.messagesList);
+        mMessages = findViewById(R.id.messagesList);
         mMessages.setHasFixedSize(true);
         mMessages.setLayoutManager(mManager);
 

app/src/main/java/com/firebase/uidemo/database/ChatIndexActivity.java renamed to app/src/main/java/com/firebase/uidemo/database/realtime/ChatIndexActivity.java

@@ -1,10 +1,11 @@
-package com.firebase.uidemo.database;
+package com.firebase.uidemo.database.realtime;
 
 import android.view.View;
 
 import com.firebase.ui.database.FirebaseIndexRecyclerAdapter;
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
 import com.firebase.uidemo.R;
+import com.firebase.uidemo.database.ChatHolder;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;

app/src/main/res/layout/activity_chat.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".database.ChatActivity">
+    tools:context=".database.realtime.ChatActivity">
 
     <TextView
         android:id="@+id/emptyTextView"

app/src/main/res/xml-v25/shortcuts.xml

@@ -30,6 +30,6 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetPackage="com.firebase.uidemo"
-            android:targetClass="com.firebase.uidemo.database.ChatActivity"/>
+            android:targetClass="com.firebase.uidemo.database.realtime.ChatActivity"/>
     </shortcut>
 </shortcuts>

auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java

@@ -22,7 +22,6 @@
 import com.twitter.sdk.android.core.identity.TwitterAuthClient;
 import com.twitter.sdk.android.core.models.User;
 
-
 public class TwitterProvider extends Callback<TwitterSession> implements IdpProvider {
     private static final String TAG = "TwitterProvider";
 

common/.gitignore

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply from: '../library/quality/quality.gradle'
-check.dependsOn 'compileDebugAndroidTestJavaWithJavac'
 
 android {
     compileSdkVersion compileSdk
@@ -11,7 +10,6 @@ android {
         targetSdkVersion targetSdk
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -23,7 +21,13 @@ android {
 }
 
 dependencies {
+    // Common dependencies across database modules. Each module still has to provide an
+    // Architecture Components annotation processor and optionally, test dependencies.
+
     compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
     // Needed to override play services
     compile "com.android.support:support-v4:$supportLibraryVersion"
+
+    compile "android.arch.lifecycle:runtime:$architectureVersion"
+    compile "android.arch.lifecycle:extensions:$architectureVersion"
 }

common/build.gradle

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase.firestore.common" />
+<manifest package="com.firebase.ui.common" />

common/src/main/AndroidManifest.xml

@@ -1,22 +1,22 @@
 package com.firebase.ui.common;
 
 import android.support.annotation.RestrictTo;
-
-import java.util.HashMap;
-import java.util.Map;
+import android.util.LruCache;
 
 /**
- * Implementation of {@link BaseSnapshotParser} that caches results,
- * so parsing a snapshot repeatedly is not expensive.
+ * Implementation of {@link BaseSnapshotParser} that caches results, so parsing a snapshot
+ * repeatedly is not expensive.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class BaseCachingSnapshotParser<S, T> implements BaseSnapshotParser<S, T> {
 
-    private Map<String, T> mObjectCache = new HashMap<>();
-    private BaseSnapshotParser<S, T> mInnerParser;
+    private static final int MAX_CACHE_SIZE = 100;
+
+    private final LruCache<String, T> mObjectCache = new LruCache<>(MAX_CACHE_SIZE);
+    private final BaseSnapshotParser<S, T> mParser;
 
-    public BaseCachingSnapshotParser(BaseSnapshotParser<S, T> innerParser) {
-        mInnerParser = innerParser;
+    public BaseCachingSnapshotParser(BaseSnapshotParser<S, T> parser) {
+        mParser = parser;
     }
 
     /**
@@ -27,27 +27,27 @@ public BaseCachingSnapshotParser(BaseSnapshotParser<S, T> innerParser) {
     @Override
     public T parseSnapshot(S snapshot) {
         String id = getId(snapshot);
-        if (mObjectCache.containsKey(id)) {
-            return mObjectCache.get(id);
-        } else {
-            T object = mInnerParser.parseSnapshot(snapshot);
+        T result = mObjectCache.get(id);
+        if (result == null) {
+            T object = mParser.parseSnapshot(snapshot);
             mObjectCache.put(id, object);
-            return object;
+            result = object;
         }
+        return result;
     }
 
     /**
      * Clear all data in the cache.
      */
-    public void clearData() {
-        mObjectCache.clear();
+    public void clear() {
+        mObjectCache.evictAll();
     }
 
     /**
-     * Invalidate the cache for a certain document ID.
+     * Invalidate the cache for a certain document.
      */
-    public void invalidate(String id) {
-        mObjectCache.remove(id);
+    public void invalidate(S snapshot) {
+        mObjectCache.remove(getId(snapshot));
     }
 
 }

common/src/main/java/com/firebase/ui/common/BaseCachingSnapshotParser.java

@@ -14,8 +14,7 @@ public interface BaseChangeEventListener<S, E> {
      * @param oldIndex  The previous index of the element, or -1 if it was not
      *                  previously tracked.
      */
-    void onChildChanged(ChangeEventType type, S snapshot,
-                        int newIndex, int oldIndex);
+    void onChildChanged(ChangeEventType type, S snapshot, int newIndex, int oldIndex);
 
     /**
      * Callback triggered after all child events in a particular snapshot have been