Merge pull request #151 from Omega-R/feature/119_sticky_click

anton-knyazev · web-flow · commit b09cbc732cc7 · 2020-08-20T11:45:05.000+03:00
Feature/119 sticky click
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
@@ -44,6 +44,11 @@ public void onBindStickyViewHolder(StickyViewHolder viewHolder, int position) {
         viewHolder.bind(getItem(position).getGroup().getYear());
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        // nothing
+    }
+
     class ExGroupViewHolder extends GroupViewHolder {
 
         private TextView textView;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java
@@ -5,6 +5,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
@@ -14,9 +15,11 @@ public class StickyHeaderAdapter extends OmegaRecyclerView.Adapter<StickyHeaderA
         implements StickyAdapter<StickyHeaderAdapter.HeaderHolder> {
 
     private LayoutInflater mInflater;
+    private final Context mContext;
 
     public StickyHeaderAdapter(Context context) {
         mInflater = LayoutInflater.from(context);
+        mContext = context;
     }
 
     @Override
@@ -51,12 +54,23 @@ public void onBindStickyViewHolder(HeaderHolder viewHolder, int position) {
         viewHolder.header.setText("Header " + getStickyId(position));
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        Toast.makeText(mContext, "onClickStickyViewHolder " + id, Toast.LENGTH_SHORT).show();
+    }
+
     static class ViewHolder extends OmegaRecyclerView.ViewHolder {
         public TextView item;
 
         public ViewHolder(View itemView) {
             super(itemView);
             item = (TextView) itemView;
+            item.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(v.getContext(), "Clicked", Toast.LENGTH_SHORT).show();
+                }
+            });
         }
     }
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -56,6 +56,7 @@ public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenu
     private View mEmptyView;
     private int mEmptyViewId;
 
+    @Nullable
     private BaseStickyDecoration mBaseStickyDecoration;
     private BaseSpaceItemDecoration mBaseSpaceItemDecoration;
     private int mStickyMode = StickyAdapter.Mode.HEADER;
@@ -430,7 +431,15 @@ private void findEmptyView() {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return mSwipeMenuHelper.handleInterceptTouchEvent(ev, super.onInterceptTouchEvent(ev));
+        boolean result = mSwipeMenuHelper.handleInterceptTouchEvent(ev, super.onInterceptTouchEvent(ev));
+        if (mBaseStickyDecoration != null && !result) return mBaseStickyDecoration.onTouchEvent(this, ev, result);
+        return result;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent e) {
+        boolean result = super.onTouchEvent(e);
+        return mBaseStickyDecoration == null ? result : mBaseStickyDecoration.onTouchEvent(this, e, result);
     }
 
     @Override
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
@@ -270,6 +270,12 @@ public void onBindStickyViewHolder(RecyclerView.ViewHolder viewHolder, int posit
         stickyAdapter.onBindStickyViewHolder(viewHolder, position);
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        StickyAdapter stickyAdapter = getStickyAdapter();
+        if (stickyAdapter != null) stickyAdapter.onClickStickyViewHolder(id);
+    }
+
     @Override
     protected void tryNotifyItemRangeChanged(int positionStart, int itemCount, Object payload) {
         super.tryNotifyItemRangeChanged(positionStart + mHeaderArray.size(), itemCount, payload);
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java
@@ -1,9 +1,13 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
+import android.view.MotionEvent;
+
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+@SuppressWarnings("rawtypes")
 public abstract class BaseStickyDecoration extends RecyclerView.ItemDecoration {
 
     public static final long NO_STICKY_ID = -1L;
@@ -16,6 +20,10 @@ public BaseStickyDecoration(@Nullable StickyAdapter adapter) {
         mStickyAdapter = adapter;
     }
 
+    public boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
+        return defaultResult;
+    }
+
     @CallSuper
     public final void setStickyAdapter(@Nullable StickyAdapter adapter) {
         mStickyAdapter = adapter;
@@ -26,8 +34,7 @@ public final void setItemSpace(int itemSpace) {
     }
 
     protected final boolean hasSticker(int position) {
-        if (mStickyAdapter == null) return false;
-        return mStickyAdapter.getStickyId(position) != NO_STICKY_ID;
+        return mStickyAdapter != null && mStickyAdapter.getStickyId(position) != NO_STICKY_ID;
     }
 
 }
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
@@ -4,14 +4,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.omega_r.libs.omegarecyclerview.utils.ViewUtils;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
 
+@SuppressWarnings("rawtypes")
 public class HeaderStickyDecoration extends StickyDecoration {
 
     public HeaderStickyDecoration(StickyAdapter adapter) {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java
@@ -11,6 +11,7 @@ public interface StickyAdapter<T extends RecyclerView.ViewHolder> {
 
     void onBindStickyViewHolder(T viewHolder, int position);
 
+    void onClickStickyViewHolder(long id);
 
     interface Mode {
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
@@ -1,24 +1,80 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
 import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
+import static java.lang.Math.abs;
 
+@SuppressWarnings("rawtypes")
 abstract class StickyDecoration extends BaseStickyDecoration {
 
+    private static final float CLICK_MOVE_BIAS = 150;
+
+    private final Map<Long, Rect> mStickyRectMap = new HashMap<>();
+    private long mClickedStickyId = NO_STICKY_ID;
+    private float mActionDownX;
+    private float mActionDownY;
+
     public StickyDecoration(@Nullable StickyAdapter adapter) {
         super(adapter);
     }
 
+    @Override
+    public final boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
+        if (mStickyAdapter == null) return defaultResult;
+
+        RecyclerView.Adapter adapter = parent.getAdapter();
+        if (adapter == null || adapter.getItemCount() == 0) return defaultResult;
+
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                mActionDownX = ev.getX();
+                mActionDownY = ev.getY();
+                mClickedStickyId = NO_STICKY_ID;
+                return handleActionDown(parent, ev, defaultResult);
+            case MotionEvent.ACTION_UP:
+                if (mStickyAdapter != null && mClickedStickyId != NO_STICKY_ID) {
+                    float eventX = ev.getX();
+                    float eventY = ev.getY();
+                    if (abs(mActionDownX - eventX) <= CLICK_MOVE_BIAS && abs(mActionDownY - eventY) <= CLICK_MOVE_BIAS) {
+                        mStickyAdapter.onClickStickyViewHolder(mClickedStickyId);
+                    }
+                }
+                break;
+        }
+        return super.onTouchEvent(parent, ev, defaultResult);
+    }
+
+    private boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final MotionEvent ev, boolean defaultResult) {
+        int eventX = (int) ev.getX();
+        int eventY = (int) ev.getY();
+        for (Long stickyId : mStickyRectMap.keySet()) {
+            Rect rect = mStickyRectMap.get(stickyId);
+            if (stickyId != NO_STICKY_ID && rect != null && !rect.isEmpty() && rect.contains(eventX, eventY)) {
+                mClickedStickyId = stickyId;
+                return true;
+            }
+        }
+        return defaultResult;
+    }
+
     @Override
     public final void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
         super.onDrawOver(canvas, parent, state);
+        invalidateRectMap();
+
         int count = parent.getChildCount();
         long previousStickerId = -1;
         if (isReverseLayout(parent)) {
@@ -32,6 +88,12 @@ public final void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView paren
         }
     }
 
+    private void invalidateRectMap() {
+        for (Rect rect : mStickyRectMap.values()) {
+            rect.setEmpty();
+        }
+    }
+
     private long calculateStickerIdAndDrawIt(Canvas canvas, RecyclerView parent, boolean isReverseLayout,
                                              int layoutPos, long previousStickerId) {
         long previousId = previousStickerId;
@@ -66,13 +128,23 @@ && hasSticker(adapterPosition - 1)
                     } else {
                         top = getStickerTop(parent, isReverseLayout, childView, stickerView, adapterPosition, layoutPos);
                         drawSticky(canvas, childView, stickyHolder, top);
+                        updateStickerRect(previousId, top, stickerView);
                     }
                 }
             }
         }
         return previousId;
     }
 
+    private void updateStickerRect(long stickyId, int stickerTop, View stickerView) {
+        Rect rect = mStickyRectMap.get(stickyId);
+        if (rect == null) {
+            rect = new Rect();
+            mStickyRectMap.put(stickyId, rect);
+        }
+        rect.set(stickerView.getLeft(), stickerTop, stickerView.getRight(), stickerTop + stickerView.getHeight());
+    }
+
     private void drawSticky(Canvas canvas, View childView, RecyclerView.ViewHolder stickyHolder, int top) {
         if (stickyHolder == null) return;
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public interface StickyAdapter<T extends RecyclerView.ViewHolder> {`
`11`	`11`
`12`	`12`	`void onBindStickyViewHolder(T viewHolder, int position);`
`13`	`13`
	`14`	`+ void onClickStickyViewHolder(long id);`
`14`	`15`
`15`	`16`	`interface Mode {`
`16`	`17`