Remove DataLoadingSubject from InfiniteScrolling class

Aroniez · Mar 14, 2019 · 35010fb · 35010fb
1 parent 77b05af
commit 35010fb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.java b/app/src/main/java/io/plaidapp/ui/HomeActivity.java
@@ -71,6 +71,7 @@
 import io.plaidapp.core.designernews.data.stories.model.Story;
 import io.plaidapp.core.dribbble.data.api.model.Shot;
 import io.plaidapp.core.feed.FeedAdapter;
+import io.plaidapp.core.feed.FeedProgressUiModel;
 import io.plaidapp.core.ui.ConnectivityChecker;
 import io.plaidapp.core.ui.HomeGridItemAnimator;
 import io.plaidapp.core.ui.PlaidItemsList;
@@ -233,11 +234,20 @@ public int getSpanSize(int position) {
         grid.setLayoutManager(layoutManager);
         grid.addOnScrollListener(toolbarElevation);
         grid.addOnScrollListener(
-                new InfiniteScrollListener(layoutManager, viewModel.getDataManager()) {
+                new InfiniteScrollListener(layoutManager) {
                     @Override
                     public void onLoadMore() {
                         viewModel.loadData();
                     }
+
+                    @Override
+                    public boolean isDataLoading() {
+                        FeedProgressUiModel uiModel = viewModel.getFeedProgress().getValue();
+                        if(uiModel !=  null){
+                            return uiModel.isLoading();
+                        }
+                        return false;
+                    }
                 });
         grid.setHasFixedSize(true);
         grid.addItemDecoration(new GridItemDividerDecoration(this, R.dimen.divider_height,

diff --git a/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt b/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt
@@ -19,22 +19,19 @@ package io.plaidapp.core.ui.recyclerview
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
-import io.plaidapp.core.data.DataLoadingSubject
-
 /**
  * A scroll listener for RecyclerView to load more items as you approach the end.
  *
  * Adapted from https://gist.github.com/ssinss/e06f12ef66c51252563e
  */
 abstract class InfiniteScrollListener(
-    private val layoutManager: LinearLayoutManager,
-    private val dataLoading: DataLoadingSubject
+    private val layoutManager: LinearLayoutManager
 ) : RecyclerView.OnScrollListener() {
     private val loadMoreRunnable = Runnable { onLoadMore() }
 
     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
         // bail out if scrolling upward or already loading data
-        if (dy < 0 || dataLoading.isDataLoading) return
+        if (dy < 0 || isDataLoading()) return
 
         val visibleItemCount = recyclerView.childCount
         val totalItemCount = layoutManager.itemCount
@@ -47,6 +44,8 @@ abstract class InfiniteScrollListener(
 
     abstract fun onLoadMore()
 
+    abstract fun isDataLoading(): Boolean
+
     companion object {
         // The minimum number of items remaining before we should loading more.
         private const val VISIBLE_THRESHOLD = 5

diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt b/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
@@ -154,10 +154,13 @@ class SearchActivity : AppCompatActivity() {
             itemAnimator = SlideInItemAnimator()
             this.layoutManager = layoutManager
             addOnScrollListener(object :
-                InfiniteScrollListener(layoutManager, viewModel.getDataLoadingSubject()) {
+                InfiniteScrollListener(layoutManager) {
                 override fun onLoadMore() {
                     viewModel.loadMore()
                 }
+                override fun isDataLoading(): Boolean {
+                    return viewModel.searchProgress.value?.isLoading ?: false
+                }
             })
             setHasFixedSize(true)