Clear focus after search & add loading buffer

Author: kaaes

app/src/main/java/com/spotify/sdk/android/MainActivity.java

@@ -53,11 +53,12 @@ protected void onCreate(Bundle savedInstanceState) {
         mActionListener.init(token);
 
         // Setup search field
-        SearchView searchView = (SearchView) findViewById(R.id.search_view);
+        final SearchView searchView = (SearchView) findViewById(R.id.search_view);
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 mActionListener.search(query);
+                searchView.clearFocus();
                 return true;
             }
 

app/src/main/java/com/spotify/sdk/android/ResultListScrollListener.java

@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2015 Spotify AB
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
 package com.spotify.sdk.android;
 
 import android.support.v7.widget.LinearLayoutManager;
@@ -32,7 +10,8 @@ public abstract class ResultListScrollListener extends RecyclerView.OnScrollList
 
     private final LinearLayoutManager mLayoutManager;
 
-    private int mItemCount;
+    private static final int SCROLL_BUFFER = 3;
+    private int mCurrentItemCount = 0;
 
     private boolean mAwaitingItems = true;
 
@@ -41,7 +20,7 @@ public ResultListScrollListener(LinearLayoutManager layoutManager) {
     }
 
     public void reset() {
-        mItemCount = 0;
+        mCurrentItemCount = 0;
     }
 
     @Override
@@ -51,14 +30,14 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
         int itemCount = mLayoutManager.getItemCount();
         int itemPosition = mLayoutManager.findLastVisibleItemPosition();
 
-        if (mAwaitingItems && itemCount > mItemCount) {
-            mItemCount = itemCount;
+        if (mAwaitingItems && itemCount > mCurrentItemCount) {
+            mCurrentItemCount = itemCount;
             mAwaitingItems = false;
         }
 
-        Log.d(TAG, String.format("loading %s, item count: %s/%s, itemPosition %s", mAwaitingItems, mItemCount, itemCount, itemPosition));
+        Log.d(TAG, String.format("loading %s, item count: %s/%s, itemPosition %s", mAwaitingItems, mCurrentItemCount, itemCount, itemPosition));
 
-        if (!mAwaitingItems && (itemCount <= itemPosition + 1)) {
+        if (!mAwaitingItems && itemPosition + 1 >= itemCount - SCROLL_BUFFER) {
             mAwaitingItems = true;
             onLoadMore();
         }

app/src/main/java/com/spotify/sdk/android/SearchPresenter.java

@@ -76,7 +76,7 @@ public void onComplete(List<Track> items) {
 
                 @Override
                 public void onError(Throwable error) {
-                    Log.e(TAG, error.getMessage());
+                    logError(error.getMessage());
                 }
             };
             mSearchPager.getFirstPage(searchQuery, PAGE_SIZE, mSearchListener);