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 @@
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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"
/>
+
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;