Address nits

Change-Id: If1abde44b7225eb2b3b112231b5653f4a74d85df

Author: samtstern

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" />
@@ -16,6 +17,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
+
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -58,6 +60,7 @@
         <activity
             android:name=".storage.ImageActivity"
             android:label="@string/title_storage_activity" />
+
     </application>
 
 </manifest>

app/src/main/java/com/firebase/uidemo/database/firestore/FirestorePagingActivity.java

@@ -67,7 +67,7 @@ private void setUpAdapter() {
                 .build();
 
         FirestorePagingOptions<Item> options = new FirestorePagingOptions.Builder<Item>()
-                .setOwner(this)
+                .setLifecycleOwner(this)
                 .setQuery(baseQuery, config, Item.class)
                 .build();
 

app/src/main/res/menu/menu_firestore_paging.xml

@@ -7,4 +7,5 @@
         android:id="@+id/item_add_data"
         android:title="@string/menu_add_data"
         app:showAsAction="never" />
+
 </menu>

constants.gradle

@@ -8,7 +8,6 @@ project.ext {
     targetSdk = 27
     minSdk = 14
 
-    firebaseVersion = '11.8.0'
     firebaseVersion = '12.0.1'
     supportLibraryVersion = '27.1.0'
     architectureVersion = '1.1.1'

firestore/build.gradle

@@ -21,9 +21,7 @@ dependencies {
     api "com.android.support:support-v4:$supportLibraryVersion"
     api "com.android.support:recyclerview-v7:$supportLibraryVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
-
-
-    api "android.arch.paging:common:1.0.0-alpha7"
+    
     api "android.arch.paging:runtime:1.0.0-alpha7"
 
     androidTestImplementation 'junit:junit:4.12'

firestore/src/main/java/com/firebase/ui/firestore/paging/FirestoreDataSource.java

@@ -51,7 +51,6 @@ public FirestoreDataSource(Query baseQuery) {
     @Override
     public void loadInitial(@NonNull LoadInitialParams<PageKey> params,
                             @NonNull final LoadInitialCallback<PageKey, DocumentSnapshot> callback) {
-        logd("loadInitial: " + params.requestedLoadSize);
 
         // Set initial loading state
         mLoadingState.postValue(LoadingState.LOADING_INITIAL);
@@ -60,8 +59,8 @@ public void loadInitial(@NonNull LoadInitialParams<PageKey> params,
                 .get()
                 .addOnSuccessListener(new OnSuccessListener<QuerySnapshot>() {
                     @Override
-                    public void onSuccess(QuerySnapshot snapshots) {
-                        List<DocumentSnapshot> data = snapshots.getDocuments();
+                    public void onSuccess(QuerySnapshot snapshot) {
+                        List<DocumentSnapshot> data = snapshot.getDocuments();
                         DocumentSnapshot last = getLast(data);
 
                         PageKey nextPage = new PageKey(last, null);
@@ -101,7 +100,6 @@ public void loadBefore(@NonNull LoadParams<PageKey> params,
     public void loadAfter(@NonNull LoadParams<PageKey> params,
                           @NonNull final LoadCallback<PageKey, DocumentSnapshot> callback) {
         final PageKey key = params.key;
-        logd("loadAfter: " + key + ", " + params.requestedLoadSize);
 
         // Set loading state
         mLoadingState.postValue(LoadingState.LOADING_MORE);
@@ -110,8 +108,8 @@ public void loadAfter(@NonNull LoadParams<PageKey> params,
                 .get()
                 .addOnSuccessListener(new OnSuccessListener<QuerySnapshot>() {
                     @Override
-                    public void onSuccess(QuerySnapshot snapshots) {
-                        List<DocumentSnapshot> data = snapshots.getDocuments();
+                    public void onSuccess(QuerySnapshot snapshot) {
+                        List<DocumentSnapshot> data = snapshot.getDocuments();
                         DocumentSnapshot last = getLast(data);
 
                         PageKey nextPage = new PageKey(last, null);
@@ -140,17 +138,11 @@ public LiveData<LoadingState> getLoadingState() {
     }
 
     @Nullable
-    private DocumentSnapshot getLast(List<DocumentSnapshot> data) {
-        if (data == null || data.isEmpty()) {
+    private DocumentSnapshot getLast(@NonNull List<DocumentSnapshot> data) {
+        if (data.isEmpty()) {
             return null;
         } else {
             return data.get(data.size() - 1);
         }
     }
-
-    private static void logd(String message) {
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-            Log.d(TAG, message);
-        }
-    }
 }

firestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingAdapter.java

@@ -10,7 +10,6 @@
 import android.support.annotation.Nullable;
 import android.support.v7.util.DiffUtil;
 import android.support.v7.widget.RecyclerView;
-import android.view.ViewGroup;
 
 import com.firebase.ui.firestore.SnapshotParser;
 import com.google.firebase.firestore.DocumentSnapshot;
@@ -47,7 +46,7 @@ public void onChanged(@Nullable PagedList<DocumentSnapshot> snapshots) {
                         return;
                     }
 
-                    onListChanged(snapshots);
+                    submitList(snapshots);
                 }
             };
 
@@ -96,10 +95,6 @@ public void stopListening() {
         mData.getLoadingState().removeObserver(mStateObserver);
     }
 
-    @NonNull
-    @Override
-    public abstract VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType);
-
     @Override
     public void onBindViewHolder(@NonNull VH holder, int position) {
         DocumentSnapshot snapshot = getItem(position);
@@ -111,8 +106,4 @@ public void onBindViewHolder(@NonNull VH holder, int position) {
     protected void onLoadingStateChanged(@NonNull LoadingState state) {
         // For overriding
     }
-
-    private void onListChanged(@NonNull PagedList<DocumentSnapshot> snapshots) {
-        submitList(snapshots);
-    }
 }

firestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingOptions.java

@@ -59,8 +59,6 @@ public Builder<T> setQuery(@NonNull Query query,
         public Builder<T> setQuery(@NonNull Query query,
                                    @NonNull PagedList.Config config,
                                    @NonNull SnapshotParser<T> parser) {
-
-
             // Build paged list
             FirestoreDataSource.Factory factory = new FirestoreDataSource.Factory(query);
             mData = new PagingData(new LivePagedListBuilder<>(factory, config).build());
@@ -70,11 +68,12 @@ public Builder<T> setQuery(@NonNull Query query,
         }
 
         @NonNull
-        public Builder<T> setOwner(@NonNull LifecycleOwner owner) {
+        public Builder<T> setLifecycleOwner(@NonNull LifecycleOwner owner) {
             mOwner = owner;
             return this;
         }
 
+        @NonNull
         public FirestorePagingOptions<T> build() {
             return new FirestorePagingOptions<>(mData, mParser, mOwner);
         }