Fix issues with recyclerview items with margins

Author: Rafael Baboni Dominiquini

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,9 +20,9 @@ allprojects {
 
 ext {
     compileSdkVersion = 22
-    buildToolsVersion = '22.0.1'
+    buildToolsVersion = '23.0.1'
     targetSdkVersion = 22
     minSdkVersion = 14
-    versionCode = 13
-    versionName = "0.5.1"
+    versionCode = 14
+    versionName = "0.5.2"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

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

@@ -4,6 +4,7 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import com.timehop.stickyheadersrecyclerview.caching.HeaderProvider;
@@ -126,16 +127,26 @@ public void initHeaderBounds(Rect bounds, RecyclerView recyclerView, View header
     private void initDefaultHeaderOffset(Rect headerMargins, RecyclerView recyclerView, View header, View firstView, int orientation, boolean enableStickyHeader) {
         int translationX, translationY;
         mDimensionCalculator.initMargins(mTempRect1, header);
+
+        ViewGroup.LayoutParams layoutParams = firstView.getLayoutParams();
+        int leftMargin = 0;
+        int topMargin = 0;
+        if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
+            ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams;
+            leftMargin = marginLayoutParams.leftMargin;
+            topMargin = marginLayoutParams.topMargin;
+        }
+
         if (orientation == LinearLayoutManager.VERTICAL) {
-            translationX = firstView.getLeft() + mTempRect1.left;
+            translationX = firstView.getLeft() - leftMargin + mTempRect1.left;
             translationY = enableStickyHeader ?
-                    Math.max(firstView.getTop() - header.getHeight() - mTempRect1.bottom, getListTop(recyclerView) + mTempRect1.top) :
-                    firstView.getTop() - header.getHeight() - mTempRect1.bottom;
+                    Math.max(firstView.getTop() - topMargin - header.getHeight() - mTempRect1.bottom, getListTop(recyclerView) + mTempRect1.top) :
+                    firstView.getTop() - topMargin - header.getHeight() - mTempRect1.bottom;
         } else {
-            translationY = firstView.getTop() + mTempRect1.top;
+            translationY = firstView.getTop() - topMargin + mTempRect1.top;
             translationX = enableStickyHeader ?
-                    Math.max(firstView.getLeft() - header.getWidth() - mTempRect1.right, getListLeft(recyclerView) + mTempRect1.left) :
-                    firstView.getLeft() - header.getWidth() - mTempRect1.right;
+                    Math.max(firstView.getLeft() - leftMargin - header.getWidth() - mTempRect1.right, getListLeft(recyclerView) + mTempRect1.left) :
+                    firstView.getLeft() - leftMargin - header.getWidth() - mTempRect1.right;
         }
 
         headerMargins.set(translationX, translationY, translationX + header.getWidth(),