Merge pull request #47 from Omega-R/develop

Wrong position when use header

Author: anton-knyazev

omegarecyclerviewlibs/src/main/java/android/support/v7/widget/ExpandedRecyclerView.java

@@ -0,0 +1,26 @@
+package android.support.v7.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+
+public class ExpandedRecyclerView extends RecyclerView {
+
+    public ExpandedRecyclerView(Context context) {
+        super(context);
+    }
+
+    public ExpandedRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ExpandedRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected int getAdapterPositionFor(ViewHolder viewHolder) {
+        return super.getAdapterPositionFor(viewHolder);
+    }
+
+}

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

@@ -9,6 +9,7 @@
 import android.support.annotation.IdRes;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.ExpandedRecyclerView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -30,7 +31,7 @@
 import java.util.List;
 import java.util.WeakHashMap;
 
-public class OmegaRecyclerView extends RecyclerView implements SwipeMenuHelper.Callback {
+public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenuHelper.Callback {
 
     private static final int[] DEFAULT_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
 
@@ -369,6 +370,18 @@ public void setPaginationCallback(OnPageRequestListener callback) {
         mPageRequester.setPaginationCallback(callback);
     }
 
+    @Override
+    protected int getAdapterPositionFor(RecyclerView.ViewHolder viewHolder) {
+        RecyclerView.Adapter adapter = getAdapter();
+        int realPosition = super.getAdapterPositionFor(viewHolder);
+
+        if (adapter == null) return realPosition;
+        if (adapter instanceof HeaderFooterWrapperAdapter) {
+            return ((HeaderFooterWrapperAdapter) adapter).applyRealPositionToChildPosition(realPosition);
+        }
+        return realPosition;
+    }
+
     public void showProgressPagination() {
         RecyclerView.Adapter adapter = getAdapter();
         if (adapter instanceof HeaderFooterWrapperAdapter) {

omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java

@@ -8,7 +8,6 @@
 import android.view.ViewGroup;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
-import com.omega_r.libs.omegarecyclerview.pagination.WrapperAdapter;
 import com.omega_r.libs.omegarecyclerview.sticky_header.StickyHeaderAdapter;
 import com.omega_r.libs.omegarecyclerview.sticky_header.StickyHeaderDecoration;
 
@@ -36,10 +35,10 @@ public HeaderFooterWrapperAdapter(T adapter) {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         if (isHeader(viewType)) {
-            return new ViewHolder(mHeaderArray.get(viewType));
+            return new SectionViewHolder(mHeaderArray.get(viewType));
         }
         if (isFooter(viewType)) {
-            return new ViewHolder(mFooterArray.get(viewType));
+            return new SectionViewHolder(mFooterArray.get(viewType));
         }
         return mRealAdapter.onCreateViewHolder(parent, viewType);
     }
@@ -164,6 +163,10 @@ public long getHeaderId(int position) {
         return stickyHeaderAdapter.getHeaderId(position - mHeaderArray.size());
     }
 
+    public int applyRealPositionToChildPosition(int realPosition) {
+        return realPosition - mHeaderArray.size();
+    }
+
     @Nullable
     public StickyHeaderAdapter getStickyHeaderAdapter() {
         if (mRealAdapter instanceof StickyHeaderAdapter) {
@@ -212,9 +215,9 @@ protected void tryNotifyItemRangeRemoved(int positionStart, int itemCount) {
         super.tryNotifyItemRangeRemoved(positionStart + mHeaderArray.size(), itemCount);
     }
 
-    class ViewHolder extends RecyclerView.ViewHolder {
+    public class SectionViewHolder extends RecyclerView.ViewHolder {
 
-        public ViewHolder(View itemView) {
+        public SectionViewHolder(View itemView) {
             super(itemView);
         }
     }