Improve staggered grid check for recycler view

pranavpandey · Jun 4, 2023 · 3a0ec6a · 3a0ec6a
1 parent 60bc78a
commit 3a0ec6a
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/.../java/com/pranavpandey/android/dynamic/support/recyclerview/DynamicRecyclerViewFrame.java b/.../java/com/pranavpandey/android/dynamic/support/recyclerview/DynamicRecyclerViewFrame.java
@@ -549,19 +549,22 @@ public void run() {
     protected final Runnable mStaggeredGridRunnable = new Runnable() {
         @Override
         public void run() {
-            if (mRecyclerView != null && mRecyclerViewLayoutManager != null
-                    && mRecyclerView.getLayoutManager() instanceof StaggeredGridLayoutManager) {
-                ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager).setGapStrategy(
-                        ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager)
-                                .getGapStrategy() | GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS);
-                ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager)
-                        .invalidateSpanAssignments();
+            if (mRecyclerView == null || mRecyclerViewLayoutManager == null
+                    || !(mRecyclerView.getLayoutManager() instanceof StaggeredGridLayoutManager)
+                    || mRecyclerViewLayoutManager.getChildCount() <= 0) {
+                return;
+            }
 
-                if (((StaggeredGridLayoutManager)
-                        mRecyclerViewLayoutManager).getSpanCount() > 1) {
+            ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager).setGapStrategy(
                     ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager)
-                            .scrollToPositionWithOffset(0, 0);
-                }
+                            .getGapStrategy() | GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS);
+            ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager)
+                    .invalidateSpanAssignments();
+
+            if (((StaggeredGridLayoutManager)
+                    mRecyclerViewLayoutManager).getSpanCount() > 1) {
+                ((StaggeredGridLayoutManager) mRecyclerViewLayoutManager)
+                        .scrollToPositionWithOffset(0, 0);
             }
         }
     };