update:targetView is clickable when showing guideView

lemon · lemon · commit 677dcf77a9f7 · 2018-05-10T18:03:34.000+08:00
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/src/main/java/easily/tech/guideview/MainActivity.kt b/app/src/main/java/easily/tech/guideview/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.RelativeLayout
+import android.widget.Toast
 import easily.tech.guideview.lib.GuideViewBundle
 import easily.tech.guideview.lib.GuideViewBundle.Direction.*
 import easily.tech.guideview.lib.GuideViewBundle.TransparentOutline.TYPE_OVAL
@@ -31,6 +32,10 @@ class MainActivity : AppCompatActivity() {
         val hintViewRight: View = View.inflate(this, R.layout.guideview_right, null)
         val hintViewBottom: View = View.inflate(this, R.layout.guideview_bottom, null)
 
+        tvContent.setOnClickListener {
+            Toast.makeText(this, "target view is clicked", Toast.LENGTH_SHORT).show()
+        }
+
         hintViewLeft.tvLeftNext.setOnClickListener {
             guideViewFragment.onNext()
         }
@@ -54,6 +59,7 @@ class MainActivity : AppCompatActivity() {
                             .setHintViewMargin(0, -160, 0, 0)
                             .setTransparentSpace(space, space, space, space)
                             .setOutlineType(TYPE_RECT)
+                            .setTargetViewClickable(true)
                             .setHintViewParams(params)
                             .setHintViewDirection(LEFT).build())
                     .addGuidViewBundle(GuideViewBundle.Builder()
diff --git a/lib/src/main/java/easily/tech/guideview/lib/GuideView.java b/lib/src/main/java/easily/tech/guideview/lib/GuideView.java
@@ -13,6 +13,7 @@
 import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -37,6 +38,11 @@
 @SuppressLint("ViewConstructor")
 final class GuideView extends RelativeLayout {
 
+    interface TargetViewClickListener {
+        void onGuideViewClicked();
+    }
+
+
     private boolean hasAddHintView = false;
     public boolean isShowing = false;
     private int[] targetViewLocation = new int[2];
@@ -50,6 +56,7 @@ final class GuideView extends RelativeLayout {
     private Paint transparentPaint;
     private GuideViewBundle bundle;
     private FrameLayout decorView;
+    private TargetViewClickListener targetViewClickListener;
 
     GuideView(Context context, GuideViewBundle bundle) {
         super(context);
@@ -63,6 +70,24 @@ final class GuideView extends RelativeLayout {
         decorView = (FrameLayout) ((Activity) getContext()).getWindow().getDecorView();
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (bundle.isTargetViewClickAble() && isTouchOnTargetView(ev)) {
+            // dispatch touch event the the root activity
+            // make the targetView receive the touch event
+            if (getContext() instanceof Activity) {
+                ((Activity) getContext()).dispatchTouchEvent(ev);
+            }
+            if (ev.getAction() == MotionEvent.ACTION_UP) {
+                if (targetViewClickListener != null) {
+                    targetViewClickListener.onGuideViewClicked();
+                }
+            }
+            return true;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         if (bundle == null) {
@@ -105,6 +130,25 @@ private void drawBackGround(Canvas canvas) {
         canvas.drawBitmap(bitmap, 0, 0, backgroundPaint);
     }
 
+    private boolean isTouchOnTargetView(MotionEvent ev) {
+        if (bundle == null || bundle.getTargetView() == null) {
+            return false;
+        }
+        int yAxis = (int) ev.getRawY();
+        int xAxis = (int) ev.getRawX();
+        View targetView = bundle.getTargetView();
+        int[] location = new int[2];
+        targetView.getLocationOnScreen(location);
+        int left = location[0];
+        int top = location[1];
+        int right = left + targetView.getMeasuredWidth();
+        int bottom = top + targetView.getMeasuredHeight();
+        if (yAxis >= top && yAxis <= bottom && xAxis >= left && xAxis <= right) {
+            return true;
+        }
+        return false;
+    }
+
 
     private void addHintView() {
         if (hasAddHintView || bundle.getHintView() == null) {
@@ -163,6 +207,10 @@ private boolean getTargetViewPosition() {
         return false;
     }
 
+    public void setTargetViewClickListener(TargetViewClickListener targetViewClickListener) {
+        this.targetViewClickListener = targetViewClickListener;
+    }
+
     public void show() {
         if (bundle.getTargetView() == null) {
             return;
diff --git a/lib/src/main/java/easily/tech/guideview/lib/GuideViewBundle.java b/lib/src/main/java/easily/tech/guideview/lib/GuideViewBundle.java
@@ -115,6 +115,14 @@ public boolean isDismissOnClicked() {
         return config.isDismissOnClicked;
     }
 
+    public boolean isTargetViewClickAble() {
+        return config.isTargetViewClickable;
+    }
+
+    public boolean isDismissOnTouchInTargetView() {
+        return config.isDismissOnClickTargetView;
+    }
+
     public static class Builder {
 
         private static int MASK_LAYER_COLOR = 0xd9000000;
@@ -138,6 +146,13 @@ public static class Builder {
         private boolean hasTransparentLayer = true;
         // whether click the whole screen can dismissed the guideView.If false,you need to handle the click and dismiss event yourself
         private boolean isDismissOnClicked = true;
+
+
+        private boolean isDismissOnClickTargetView=true;
+
+        private boolean isTargetViewClickable;
+
+
         private int hintViewDirection;
 
         private int outlineType = TYPE_OVAL;
@@ -199,6 +214,17 @@ public Builder setMaskColor(int maskColor) {
             return this;
         }
 
+        public Builder setTargetViewClickable(boolean targetViewClickAble) {
+            isTargetViewClickable = targetViewClickAble;
+            return this;
+        }
+
+        public Builder setDismissOnTouchInTargetView(boolean dismissOnTouchInTargetView) {
+            isDismissOnClickTargetView = dismissOnTouchInTargetView;
+            return this;
+        }
+
+
         public GuideViewBundle build() {
             return new GuideViewBundle(this);
         }
diff --git a/lib/src/main/java/easily/tech/guideview/lib/GuideViewFragment.java b/lib/src/main/java/easily/tech/guideview/lib/GuideViewFragment.java
@@ -103,6 +103,14 @@ private void showGuideView() {
         }
         GuideView guideView = new GuideView(getContext(), currentBundle);
         wrapClickListener(guideView);
+        guideView.setTargetViewClickListener(new GuideView.TargetViewClickListener() {
+            @Override
+            public void onGuideViewClicked() {
+                if (currentBundle != null && currentBundle.isDismissOnTouchInTargetView()) {
+                    dismiss();
+                }
+            }
+        });
         flContainer.addView(guideView);
         guideView.show();
         currentGuideView = guideView;
