more accurate and more efficient way of calculating touched area

Author: mohappsdev

README.md

@@ -3,6 +3,10 @@
 SwipeDismissLayout
 ===================
 
+v1.3.5 by mohapps:
+
+more accurate and more efficient way of calculating touched area
+
 v1.3.0 by mohapps:
 
 whether to swipe for dismiss or not will be determined based on touch area rather than a single child view's scrollability
@@ -51,7 +55,7 @@ Add it in your root build.gradle at the end of repositories:
 Add the dependency
 
         dependencies  {
-	     implementation 'com.github.mohappsdev:SwipeDismissLayout:v1.3.0'
+	     implementation 'com.github.mohappsdev:SwipeDismissLayout:v1.3.5'
         }
 
 Set translucent theme for that activity in AndroidManifest:
@@ -96,7 +100,7 @@ If translucent theme causes your dismissable activity layout background to be tr
 ----------
 Version
 -------------
-1.3.0
+1.3.5
 
  ----------
 

swipedismisslayout/src/main/java/com/viewgroup/SwipeDismissLayout.java

@@ -2,11 +2,14 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewTreeObserver;
+import android.view.Window;
 import android.webkit.WebView;
 import android.widget.AbsListView;
 import android.widget.ScrollView;
@@ -215,7 +218,9 @@ private boolean isSwipeIndirect(MotionEvent ev) {
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         boolean handled = false;
         ensureTarget();
-        findTouchedFamily(ev);
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            findTouchedFamily(ev);
+        }
         if (isEnabled() && isSwipeEnabled && !isSwipeIndirect(ev)) {
             handled = viewDragHelper.shouldInterceptTouchEvent(ev);
         } else {
@@ -265,11 +270,58 @@ private void findScrollableChildren(ViewGroup viewGroup){
 
     private void findTouchedFamily(MotionEvent ev){
         touchedFamily = new ArrayList<>();
+
+        Rect rectangle = new Rect();
+        Window window = ((Activity)getContext()).getWindow();
+        window.getDecorView().getWindowVisibleDisplayFrame(rectangle);
+        int statusBarHeight = rectangle.top;
+
         int x = Math.round(ev.getX());
-        int y = Math.round(ev.getY());
+        int y = Math.round(ev.getY() + statusBarHeight);
         for (View scrollable: scrollableChildren) {
-            if (x > scrollable.getLeft() && x < scrollable.getRight() && y > scrollable.getTop() && y < scrollable.getBottom()) {
-                touchedFamily.add(scrollable);
+
+            Rect scrollableRect = new Rect();
+            scrollable.getGlobalVisibleRect(scrollableRect);
+
+            if (x > scrollableRect.left && x < scrollableRect.right && y > scrollableRect.top && y < scrollableRect.bottom) {
+                if(!touchedFamily.contains(scrollable)) {
+                    touchedFamily.add(scrollable);
+                }
+                addFamily(scrollable);
+            }
+        }
+    }
+
+    private void addFamily(View view){
+        addParents(view);
+        if(view instanceof CoordinatorLayout) {
+            addChildren((ViewGroup) view);
+        }
+    }
+
+    private void addParents(View view){
+        ViewParent parent = view.getParent();
+        if(parent instanceof View){
+            if(!touchedFamily.contains((View)parent) && scrollableChildren.contains((View)parent)){
+                touchedFamily.add((View) parent);
+            }
+            addParents((View) parent);
+        }
+    }
+
+    private void addChildren(ViewGroup viewGroup){
+        if (viewGroup.getChildCount() > 0) {
+            int count = viewGroup.getChildCount();
+            for (int i = 0; i < count; i++) {
+                View child = viewGroup.getChildAt(i);
+                if (child instanceof AbsListView || child instanceof RecyclerView || child instanceof ScrollView || child instanceof NestedScrollView) {
+                    if(!touchedFamily.contains((View)child) && scrollableChildren.contains((View)child)) {
+                        touchedFamily.add(child);
+                    }
+                }
+                if (child instanceof ViewGroup) {
+                    addChildren((ViewGroup) child);
+                }
             }
         }
     }