Minor bug fixes and refactor

Author: Rafael Dominiquini

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

@@ -123,6 +123,14 @@ public void initHeaderBounds(Rect bounds, RecyclerView recyclerView, View header
     }
   }
 
+  public Rect getHeaderBounds(RecyclerView recyclerView, View header, View firstView, boolean firstHeader, boolean enableStickyHeader) {
+    Rect rect = new Rect();
+
+    initHeaderBounds(rect, recyclerView, header, firstView, firstHeader, enableStickyHeader);
+
+    return rect;
+  }
+
   private void initDefaultHeaderOffset(Rect headerMargins, RecyclerView recyclerView, View header, View firstView, int orientation, boolean enableStickyHeader) {
     int translationX, translationY;
     mDimensionCalculator.initMargins(mTempRect1, header);

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

@@ -1,15 +1,15 @@
 package com.timehop.stickyheadersrecyclerview;
 
 /**
- * ItemVisibilityAdapter provides a way for StickyRecyclerHeadersDecoration
+ * ItemVisibilityAdapter provides a way for StickyRecyclerLinearHeadersDecoration
  * to know if a row is visible or not.  This comes into play if the
  * recyclerview's layout manager  is set up to provide extra layout space (by
  * overriding getExtraLayoutSpace). In this case rows that aren't visible (yet)
- * will be bound and StickyRecyclerHeadersDecoration will need to know which
+ * will be bound and StickyRecyclerLinearHeadersDecoration will need to know which
  * are visible to correctly calculate the row to base the sticky header on
  *
  * To use it you must pass an instance of a class that implements this
- * interface as a second argment StickyRecyclerHeadersDecoration's constructor.
+ * interface as a second argment StickyRecyclerLinearHeadersDecoration's constructor.
  *
  */
 public interface ItemVisibilityAdapter {

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

@@ -3,6 +3,8 @@
 import android.graphics.Rect;
 import android.view.View;
 
+import com.timehop.stickyheadersrecyclerview.decorators.StickyRecyclerHeadersDecoration;
+
 /**
  * Created by Rafael Baboni Dominiquini on 13/04/16.
  */

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

@@ -6,9 +6,13 @@
 import android.view.SoundEffectConstants;
 import android.view.View;
 
+import com.timehop.stickyheadersrecyclerview.decorators.StickyRecyclerHeadersDecoration;
+
 public class StickyRecyclerHeadersTouchListener implements RecyclerView.OnItemTouchListener {
+
   private final GestureDetector mTapDetector;
   private final RecyclerView mRecyclerView;
+  private final StickyRecyclerHeadersAdapter mAdapter;
   private final StickyRecyclerHeadersDecoration mDecor;
   private OnHeaderClickListener mOnHeaderClickListener;
 
@@ -18,22 +22,22 @@ public interface OnHeaderClickListener {
 
   public StickyRecyclerHeadersTouchListener(final RecyclerView recyclerView,
                                             final StickyRecyclerHeadersDecoration decor) {
+    this(recyclerView, (StickyRecyclerHeadersAdapter) recyclerView.getAdapter(), decor);
+  }
+
+  public StickyRecyclerHeadersTouchListener(final RecyclerView recyclerView,
+                                            final StickyRecyclerHeadersAdapter adapter,
+                                            final StickyRecyclerHeadersDecoration decor) {
     mTapDetector = new GestureDetector(recyclerView.getContext(), new SingleTapDetector());
     mRecyclerView = recyclerView;
+    mAdapter = adapter;
     mDecor = decor;
   }
 
   public StickyRecyclerHeadersAdapter getAdapter() {
-    if (mRecyclerView.getAdapter() instanceof StickyRecyclerHeadersAdapter) {
-      return (StickyRecyclerHeadersAdapter) mRecyclerView.getAdapter();
-    } else {
-      throw new IllegalStateException("A RecyclerView with " +
-          StickyRecyclerHeadersTouchListener.class.getSimpleName() +
-          " requires a " + StickyRecyclerHeadersAdapter.class.getSimpleName());
-    }
+    return mAdapter;
   }
 
-
   public void setOnHeaderClickListener(OnHeaderClickListener listener) {
     mOnHeaderClickListener = listener;
   }

library/src/main/java/com/timehop/stickyheadersrecyclerview/caching/HeaderViewCache.java

@@ -35,8 +35,7 @@ public View getHeader(RecyclerView parent, int position) {
       mAdapter.onBindHeaderViewHolder(viewHolder, position);
       header = viewHolder.itemView;
       if (header.getLayoutParams() == null) {
-        header.setLayoutParams(new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        header.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
       }
 
       int widthSpec;

library/src/main/java/com/timehop/stickyheadersrecyclerview/calculation/DimensionCalculator.java

@@ -25,7 +25,7 @@ public void initMargins(Rect margins, View view) {
       MarginLayoutParams marginLayoutParams = (MarginLayoutParams) layoutParams;
       initMarginRect(margins, marginLayoutParams);
     } else {
-        margins.set(0, 0, 0, 0);
+      margins.set(0, 0, 0, 0);
     }
   }
 
@@ -45,4 +45,15 @@ private void initMarginRect(Rect marginRect, MarginLayoutParams marginLayoutPara
     );
   }
 
+  public Rect getMarginRect(View header) {
+    Rect rect = new Rect();
+
+    if (header.getLayoutParams() instanceof MarginLayoutParams) {
+      initMarginRect(rect, (MarginLayoutParams) header.getLayoutParams());
+    } else {
+      rect.set(0, 0, 0, 0);
+    }
+
+    return rect;
+  }
 }

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

@@ -1,4 +1,4 @@
-package com.timehop.stickyheadersrecyclerview;
+package com.timehop.stickyheadersrecyclerview.decorators;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -7,6 +7,10 @@
 import android.util.SparseArray;
 import android.view.View;
 
+import com.timehop.stickyheadersrecyclerview.HeaderPositionCalculator;
+import com.timehop.stickyheadersrecyclerview.ItemVisibilityAdapter;
+import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter;
+import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersPositionChangeListener;
 import com.timehop.stickyheadersrecyclerview.caching.HeaderProvider;
 import com.timehop.stickyheadersrecyclerview.caching.HeaderViewCache;
 import com.timehop.stickyheadersrecyclerview.calculation.DimensionCalculator;
@@ -24,8 +28,9 @@ public class StickyRecyclerHeadersDecoration extends RecyclerView.ItemDecoration
   private final HeaderPositionCalculator mHeaderPositionCalculator;
   private final HeaderRenderer mRenderer;
   private final DimensionCalculator mDimensionCalculator;
+  private final boolean mEnableStickyHeader;
+
   private StickyRecyclerHeadersPositionChangeListener mHeaderListener;
-  private boolean mEnableStickyHeader = true;
 
   /**
    * The following field is used as a buffer for internal calculations. Its sole purpose is to avoid
@@ -46,21 +51,21 @@ public StickyRecyclerHeadersDecoration(StickyRecyclerHeadersAdapter adapter, Ite
   }
 
   private StickyRecyclerHeadersDecoration(StickyRecyclerHeadersAdapter adapter, OrientationProvider orientationProvider,
-      DimensionCalculator dimensionCalculator, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
+                                                DimensionCalculator dimensionCalculator, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
     this(adapter, orientationProvider, dimensionCalculator, new HeaderRenderer(orientationProvider),
-        new HeaderViewCache(adapter, orientationProvider), visibilityAdapter, enableStickyHeader);
+            new HeaderViewCache(adapter, orientationProvider), visibilityAdapter, enableStickyHeader);
   }
 
   private StickyRecyclerHeadersDecoration(StickyRecyclerHeadersAdapter adapter, OrientationProvider orientationProvider,
-      DimensionCalculator dimensionCalculator, HeaderRenderer headerRenderer, HeaderProvider headerProvider, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
+                                                DimensionCalculator dimensionCalculator, HeaderRenderer headerRenderer, HeaderProvider headerProvider, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
     this(adapter, headerRenderer, orientationProvider, dimensionCalculator, headerProvider,
-        new HeaderPositionCalculator(adapter, headerProvider, orientationProvider,
-            dimensionCalculator), visibilityAdapter, enableStickyHeader);
+            new HeaderPositionCalculator(adapter, headerProvider, orientationProvider,
+                    dimensionCalculator), visibilityAdapter, enableStickyHeader);
   }
 
   private StickyRecyclerHeadersDecoration(StickyRecyclerHeadersAdapter adapter, HeaderRenderer headerRenderer,
-      OrientationProvider orientationProvider, DimensionCalculator dimensionCalculator, HeaderProvider headerProvider,
-      HeaderPositionCalculator headerPositionCalculator, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
+                                                OrientationProvider orientationProvider, DimensionCalculator dimensionCalculator, HeaderProvider headerProvider,
+                                                HeaderPositionCalculator headerPositionCalculator, ItemVisibilityAdapter visibilityAdapter, boolean enableStickyHeader) {
     mAdapter = adapter;
     mHeaderProvider = headerProvider;
     mOrientationProvider = orientationProvider;
@@ -76,7 +81,7 @@ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, Recycle
     super.getItemOffsets(outRect, view, parent, state);
     int itemPosition = parent.getChildAdapterPosition(view);
     if (itemPosition == RecyclerView.NO_POSITION) {
-        return;
+      return;
     }
     if (mHeaderPositionCalculator.hasNewHeader(itemPosition, mOrientationProvider.isReverseLayout(parent))) {
       View header = getHeaderView(parent, itemPosition);
@@ -113,7 +118,7 @@ public void onDrawOver(Canvas canvas, RecyclerView parent, RecyclerView.State st
       View itemView = parent.getChildAt(i);
       int position = parent.getChildAdapterPosition(itemView);
       if (position == RecyclerView.NO_POSITION) {
-          continue;
+        continue;
       }
 
       boolean hasStickyHeader = mHeaderPositionCalculator.hasStickyHeader(itemView, mOrientationProvider.getOrientation(parent), position);
@@ -190,10 +195,6 @@ public void setHeaderPositionListener(StickyRecyclerHeadersPositionChangeListene
     this.mHeaderListener = headerListener;
   }
 
-  public void enableStickyHeaders(boolean enableStickyHeaders) {
-    this.mEnableStickyHeader = enableStickyHeaders;
-  }
-
   public boolean isStickyHeadersEnabled() {
     return this.mEnableStickyHeader;
   }

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

@@ -84,5 +84,4 @@ private void initClipRectForHeader(Rect clipRect, RecyclerView recyclerView, Vie
           recyclerView.getHeight() - recyclerView.getPaddingBottom() - clipRect.bottom);
     }
   }
-
 }

sample/src/main/java/com/timehop/stickyheadersrecyclerview/sample/MainActivity.java

@@ -8,6 +8,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -20,14 +21,16 @@
 import android.widget.ToggleButton;
 
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter;
-import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersPositionChangeListener;
 import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersTouchListener;
+import com.timehop.stickyheadersrecyclerview.decorators.StickyRecyclerHeadersDecoration;
 
 import java.security.SecureRandom;
 
 public class MainActivity extends AppCompatActivity {
 
+  public static final int NUM_COLUMNS = 1;
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -39,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     // Set adapter populated with example dummy data
     final AnimalsHeadersAdapter adapter = new AnimalsHeadersAdapter();
-    adapter.add("Animals below!");
+    adapter.add("List of Animals");
     adapter.addAll(getDummyDataSet());
     recyclerView.setAdapter(adapter);
 
@@ -62,7 +65,7 @@ public void run() {
 
     // Set layout manager
     int orientation = getLayoutManagerOrientation(getResources().getConfiguration().orientation);
-    final LinearLayoutManager layoutManager = new LinearLayoutManager(this, orientation, isReverseButton.isChecked());
+    final GridLayoutManager layoutManager = new GridLayoutManager(this, NUM_COLUMNS, orientation, isReverseButton.isChecked());
     recyclerView.setLayoutManager(layoutManager);
 
     // Add the sticky headers decoration
@@ -136,8 +139,7 @@ private class AnimalsHeadersAdapter extends AnimalsAdapter<RecyclerView.ViewHold
       implements StickyRecyclerHeadersAdapter<RecyclerView.ViewHolder> {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-      View view = LayoutInflater.from(parent.getContext())
-          .inflate(R.layout.view_item, parent, false);
+      View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_item, parent, false);
       return new RecyclerView.ViewHolder(view) {
       };
     }
@@ -159,8 +161,7 @@ public long getHeaderId(int position) {
 
     @Override
     public RecyclerView.ViewHolder onCreateHeaderViewHolder(ViewGroup parent, int position) {
-      View view = LayoutInflater.from(parent.getContext())
-          .inflate(R.layout.view_header, parent, false);
+      View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_header, parent, false);
       return new RecyclerView.ViewHolder(view) {
       };
     }