Merge pull request #136 from Omega-R/develop

Fixed itemStace and dividers

Author: anton-knyazev

omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java

@@ -610,7 +610,8 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
 
     public abstract static class Adapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> {
 
-        private RecyclerView recyclerView;
+        @Nullable
+        protected RecyclerView recyclerView;
 
         public boolean isDividerAllowedAbove(int position) {
             return true;

omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java

@@ -1,11 +1,13 @@
 package com.omega_r.libs.omegarecyclerview.item_decoration;
 
 import android.graphics.Rect;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.omega_r.libs.omegarecyclerview.item_decoration.decoration_helpers.DividerDecorationHelper;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class SpaceItemDecoration extends BaseItemDecoration {
 
     private final int space;
@@ -18,8 +20,21 @@ public SpaceItemDecoration(int showDivider, int space) {
     @Override
     void getItemOffset(@NonNull Rect outRect, @NonNull RecyclerView parent,
                        @NonNull DividerDecorationHelper helper, int position, int itemCount) {
-        if (isShowBeginDivider() && position < 1 || position >= 1) helper.setStart(outRect, space);
-        if (isShowEndDivider() && position == itemCount - 1) helper.setEnd(outRect, space);
+        int countBeginEndPositions = getCountBeginEndPositions(parent);
+        if (isShowBeginDivider() || countBeginEndPositions <= position) helper.setStart(outRect, space);
+        if (isShowEndDivider() && position == itemCount - countBeginEndPositions) helper.setEnd(outRect, space);
+
+        if (countBeginEndPositions > 1) {
+            if (position % countBeginEndPositions != 0 || isShowBeginDivider()) helper.setOtherStart(outRect, space);
+            if (position / (countBeginEndPositions - 1) > 0 && isShowEndDivider()) helper.setOtherEnd(outRect, space);
+        }
+    }
+
+    private int getCountBeginEndPositions(RecyclerView recyclerView) {
+        RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+        if (layoutManager instanceof GridLayoutManager) {
+            return ((GridLayoutManager) layoutManager).getSpanCount();
+        } else return 1;
     }
 
 }

omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java

@@ -46,6 +46,14 @@ public static DividerDecorationHelper getHelper(int orientation, RecyclerView pa
 
     public abstract int getEnd(Rect rect);
 
+    public abstract void setOtherStart(Rect rect, int start);
+
+    public abstract void setOtherEnd(Rect rect, int end);
+
+    public abstract int getOtherStart(Rect rect);
+
+    public abstract int getOtherEnd(Rect rect);
+
     public int getOffset(int offset) {
         return offset;
     }
@@ -78,6 +86,26 @@ public int getEnd(Rect rect) {
         return rect.bottom;
     }
 
+    @Override
+    public void setOtherStart(Rect rect, int start) {
+        rect.left = start;
+    }
+
+    @Override
+    public void setOtherEnd(Rect rect, int end) {
+        rect.right = end;
+    }
+
+    @Override
+    public int getOtherStart(Rect rect) {
+        return rect.left;
+    }
+
+    @Override
+    public int getOtherEnd(Rect rect) {
+        return rect.right;
+    }
+
 }
 
 class ReverseVerticalDividerDecorationHelper extends DividerDecorationHelper {
@@ -106,6 +134,26 @@ public int getEnd(Rect rect) {
         return rect.top;
     }
 
+    @Override
+    public void setOtherStart(Rect rect, int start) {
+        rect.right = start;
+    }
+
+    @Override
+    public void setOtherEnd(Rect rect, int end) {
+        rect.left = end;
+    }
+
+    @Override
+    public int getOtherStart(Rect rect) {
+        return rect.right;
+    }
+
+    @Override
+    public int getOtherEnd(Rect rect) {
+        return rect.left;
+    }
+
     @Override
     public int getOffset(int offset) {
         return -offset;
@@ -139,6 +187,26 @@ public int getEnd(Rect rect) {
         return rect.right;
     }
 
+    @Override
+    public void setOtherStart(Rect rect, int start) {
+        rect.top = start;
+    }
+
+    @Override
+    public void setOtherEnd(Rect rect, int end) {
+        rect.bottom = end;
+    }
+
+    @Override
+    public int getOtherStart(Rect rect) {
+        return rect.top;
+    }
+
+    @Override
+    public int getOtherEnd(Rect rect) {
+        return rect.bottom;
+    }
+
 }
 
 class ReverseHorizontalDividerDecorationHelper extends DividerDecorationHelper {
@@ -167,6 +235,26 @@ public int getEnd(Rect rect) {
         return rect.left;
     }
 
+    @Override
+    public void setOtherStart(Rect rect, int start) {
+        rect.bottom = start;
+    }
+
+    @Override
+    public void setOtherEnd(Rect rect, int end) {
+        rect.top = end;
+    }
+
+    @Override
+    public int getOtherStart(Rect rect) {
+        return rect.bottom;
+    }
+
+    @Override
+    public int getOtherEnd(Rect rect) {
+        return rect.top;
+    }
+
     @Override
     public int getOffset(int offset) {
         return -offset;