Refactor

Author: Rafael Dominiquini

library/src/androidTest/java/com/timehop/stickyheadersrecyclerview/ApplicationTest.java

@@ -48,7 +48,9 @@ public HeaderPositionCalculator(StickyRecyclerHeadersAdapter adapter, HeaderProv
    */
   public boolean hasStickyHeader(View itemView, int orientation, int position) {
     int offset, margin;
+
     mDimensionCalculator.initMargins(mTempRect1, itemView);
+
     if (orientation == LinearLayout.VERTICAL) {
       offset = itemView.getTop();
       margin = mTempRect1.top;
@@ -77,6 +79,7 @@ public boolean hasNewHeader(int position, boolean isReverseLayout) {
     int columnOfItem = position % numColumns;
     if (columnOfItem > 0) {
       int firstItemOnRowPosition = position - columnOfItem;
+
       return hasNewHeader(firstItemOnRowPosition, isReverseLayout);
     }
 

library/src/main/java/com/timehop/stickyheadersrecyclerview/HeaderPositionCalculator.java

@@ -68,12 +68,14 @@ private StickyRecyclerHeadersDecoration(StickyRecyclerHeadersAdapter adapter, He
   public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
     super.getItemOffsets(outRect, view, parent, state);
     int itemPosition = parent.getChildAdapterPosition(view);
-    if (itemPosition == RecyclerView.NO_POSITION) {
-      return;
-    }
-    if (mHeaderPositionCalculator.hasNewHeader(itemPosition, mOrientationProvider.isReverseLayout(parent))) {
-      View header = getHeaderView(parent, itemPosition);
-      setItemOffsetsForHeader(outRect, header, mOrientationProvider.getOrientation(parent));
+
+    if (itemPosition != RecyclerView.NO_POSITION) {
+      boolean hasNewHeader = mHeaderPositionCalculator.hasNewHeader(itemPosition, mOrientationProvider.isReverseLayout(parent));
+
+      if (hasNewHeader) {
+        View header = getHeaderView(parent, itemPosition);
+        setItemOffsetsForHeader(outRect, header, mOrientationProvider.getOrientation(parent));
+      }
     }
   }
 
@@ -112,14 +114,14 @@ public void onDrawOver(Canvas canvas, RecyclerView parent, RecyclerView.State st
       }
 
       boolean hasStickyHeader = mHeaderPositionCalculator.hasStickyHeader(itemView, mOrientationProvider.getOrientation(parent), position);
-      if (hasStickyHeader || mHeaderPositionCalculator.hasNewHeader(position, mOrientationProvider.isReverseLayout(parent))) {
+      boolean hasNewHeader = mHeaderPositionCalculator.hasNewHeader(position, mOrientationProvider.isReverseLayout(parent));
+      if (hasStickyHeader || hasNewHeader) {
         View header = mHeaderProvider.getHeader(parent, position);
 
         //re-use existing Rect, if any.
         Rect headerOffset = mHeaderRects.get(position);
         if (headerOffset == null) {
-          headerOffset = new Rect();
-          mHeaderRects.put(position, headerOffset);
+          mHeaderRects.put(position, headerOffset = new Rect());
         }
 
         mHeaderPositionCalculator.initHeaderBounds(headerOffset, parent, header, itemView, hasStickyHeader, mEnableStickyHeader);

library/src/main/java/com/timehop/stickyheadersrecyclerview/decorators/StickyRecyclerHeadersDecoration.java

@@ -3,6 +3,7 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -54,6 +55,7 @@ public void drawHeader(RecyclerView recyclerView, Canvas canvas, View header, Re
     canvas.translate(offset.left, offset.top);
 
     header.draw(canvas);
+
     canvas.restore();
   }
 

library/src/main/java/com/timehop/stickyheadersrecyclerview/rendering/HeaderRenderer.java

@@ -56,6 +56,7 @@ public void drawVertical(Canvas c, RecyclerView parent) {
       final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
       final int top = Math.max(recyclerViewTop, child.getBottom() + params.bottomMargin);
       final int bottom = Math.min(recyclerViewBottom, top + mDivider.getIntrinsicHeight());
+
       mDivider.setBounds(left, top, right, bottom);
       mDivider.draw(c);
     }
@@ -69,10 +70,10 @@ public void drawHorizontal(Canvas c, RecyclerView parent) {
     final int childCount = parent.getChildCount();
     for (int i = 0; i < childCount; i++) {
       final View child = parent.getChildAt(i);
-      final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
-          .getLayoutParams();
+      final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
       final int left = Math.max(recyclerViewLeft, child.getRight() + params.rightMargin);
       final int right = Math.min(recyclerViewRight, left + mDivider.getIntrinsicHeight());
+
       mDivider.setBounds(left, top, right, bottom);
       mDivider.draw(c);
     }