From ae890a8c9a77a3febc31d567a318a9140e7590d9 Mon Sep 17 00:00:00 2001
From: daimajia <daimajia@gmail.com>
Date: Sun, 31 Aug 2014 09:26:04 +0800
Subject: [PATCH] complicated nested support, listview, gridview open item
 close item support

---
 demo/src/main/AndroidManifest.xml             |  1 +
 .../daimajia/swipedemo/GridViewExample.java   | 24 ---------
 .../daimajia/swipedemo/ListViewExample.java   | 25 ---------
 .../com/daimajia/swipedemo/MyActivity.java    |  3 ++
 .../com/daimajia/swipedemo/NestedExample.java | 20 +++++++
 demo/src/main/res/layout/nested.xml           | 54 +++++++++++++++++++
 demo/src/main/res/menu/my.xml                 |  2 +
 gradle.properties                             |  4 +-
 .../java/com/daimajia/swipe/SwipeLayout.java  | 10 +++-
 9 files changed, 91 insertions(+), 52 deletions(-)
 create mode 100644 demo/src/main/java/com/daimajia/swipedemo/NestedExample.java
 create mode 100644 demo/src/main/res/layout/nested.xml

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index c518607..3415667 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
         </activity>
         <activity android:name="com.daimajia.swipedemo.ListViewExample"/>
         <activity android:name="com.daimajia.swipedemo.GridViewExample"/>
+        <activity android:name=".NestedExample"/>
     </application>
 
 </manifest>
diff --git a/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java
index a43d431..2a41d98 100644
--- a/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java
+++ b/demo/src/main/java/com/daimajia/swipedemo/GridViewExample.java
@@ -2,7 +2,6 @@ package com.daimajia.swipedemo;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -49,28 +48,5 @@ public class GridViewExample extends Activity{
             }
         });
 
-        Handler handler = (new Handler());
-        // Open up some items in the list
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                adapter.openItem(1);
-                adapter.openItem(2);
-                adapter.openItem(3);
-                adapter.openItem(1);
-            }
-        }, 1000);
-
-
-        // Close some items in the list
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                adapter.closeItem(1);
-                adapter.closeItem(1);
-                adapter.closeItem(3);
-            }
-        }, 3000);
-
     }
 }
diff --git a/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java
index ee6f75e..4f88863 100644
--- a/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java
+++ b/demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java
@@ -3,7 +3,6 @@ package com.daimajia.swipedemo;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -74,30 +73,6 @@ public class ListViewExample extends Activity {
             }
         });
 
-        final Handler handler = (new Handler());
-        mPositionToTest = 0;
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                mAdapter.openItem(mPositionToTest++);
-                if(mPositionToTest < 5)
-                    handler.postDelayed(this, 1000);
-            }
-        };
-        // Open up some items in the list
-        handler.postDelayed(runnable, 1000);
-
-
-        // Close some items in the list
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mAdapter.closeItem(1);
-                mAdapter.closeItem(4);
-                mAdapter.closeItem(4);
-            }
-        }, 8000);
-
     }
 
 
diff --git a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java
index f5c22a2..78cd2d3 100644
--- a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java
+++ b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java
@@ -120,6 +120,9 @@ public class MyActivity extends Activity {
         } else if (id == R.id.action_gridview) {
             startActivity(new Intent(this, GridViewExample.class));
             return true;
+        } else if(id == R.id.action_nexted){
+            startActivity(new Intent(this, NestedExample.class));
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/demo/src/main/java/com/daimajia/swipedemo/NestedExample.java b/demo/src/main/java/com/daimajia/swipedemo/NestedExample.java
new file mode 100644
index 0000000..70a6e9d
--- /dev/null
+++ b/demo/src/main/java/com/daimajia/swipedemo/NestedExample.java
@@ -0,0 +1,20 @@
+package com.daimajia.swipedemo;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+public class NestedExample extends Activity{
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.nested);
+        findViewById(R.id.hhhhh).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Log.e("Tag","got");
+            }
+        });
+    }
+}
diff --git a/demo/src/main/res/layout/nested.xml b/demo/src/main/res/layout/nested.xml
new file mode 100644
index 0000000..2d86184
--- /dev/null
+++ b/demo/src/main/res/layout/nested.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="80dp">
+
+    <LinearLayout
+        android:tag="Bottom3"
+        android:layout_width="80dp"
+        android:layout_height="match_parent">
+        <ScrollView
+            android:layout_width="match_parent"
+            android:scrollbars="vertical"
+            android:layout_height="wrap_content">
+            <TextView
+                android:tag="Hover"
+                android:text="None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew. "
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </ScrollView>
+    </LinearLayout>
+
+    <LinearLayout
+        android:padding="10dp"
+        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TextView
+            android:text="Test ScrollView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <ScrollView
+            android:layout_marginLeft="80dp"
+            android:layout_width="match_parent"
+            android:scrollbars="horizontal"
+            android:layout_height="match_parent">
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:tag="Hover"
+                    android:text="None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew.None is of freedom or of life deserving unless he daily conquers it anew. "
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+                <Button
+                    android:id="@+id/hhhhh"
+                    android:text="HelloWorld"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                </LinearLayout>
+
+        </ScrollView>
+    </LinearLayout>
+</com.daimajia.swipe.SwipeLayout>
\ No newline at end of file
diff --git a/demo/src/main/res/menu/my.xml b/demo/src/main/res/menu/my.xml
index e8a6b50..05d9b6a 100644
--- a/demo/src/main/res/menu/my.xml
+++ b/demo/src/main/res/menu/my.xml
@@ -9,4 +9,6 @@
         android:title="GridView"
         android:orderInCategory="100"
         />
+    <item android:id="@+id/action_nexted"
+        android:title="Nested"/>
 </menu>
diff --git a/gradle.properties b/gradle.properties
index 902f4a9..11e1ef3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 
-VERSION_NAME=1.0.4
-VERSION_CODE=4
+VERSION_NAME=1.0.5
+VERSION_CODE=6
 GROUP=com.daimajia.swipelayout
 
 ANDROID_BUILD_MIN_SDK_VERSION=14
diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java
index 9bc7871..959ca6d 100644
--- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java
+++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java
@@ -653,9 +653,17 @@ public class SwipeLayout extends FrameLayout {
         //then let it do it.
         //
         int action = ev.getActionMasked();
+        Status status = getOpenStatus();
         switch (action){
             case MotionEvent.ACTION_DOWN:
-                View child = childNeed(getSurfaceView(), ev);
+                View child;
+                if(status == Status.Close){
+                    child = childNeed(getSurfaceView(), ev);
+                }else if(status == Status.Open){
+                    child = childNeed(getBottomView(), ev);
+                }else{
+                    break;
+                }
                 if(child != null){
                     childNeeded = child;
                     return false;