Skip to content

Commit 08bc690

Browse files
author
涂冰冰
committedNov 15, 2017
add reset menu state method
1 parent 3f39d29 commit 08bc690

9 files changed

+37
-38
lines changed
 

‎SwipeMenu.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="SwipeMenu" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="SwipeMenu" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎SwipeMenuRecyclerView.iml

-19
This file was deleted.

‎app/app.iml

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SwipeMenu" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -34,14 +34,14 @@
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4243
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -79,31 +79,22 @@
7979
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
10292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
10393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
10494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
10595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
10696
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
10798
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10899
</content>
109100
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />

‎library/library.iml

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SwipeMenu" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -35,14 +35,14 @@
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -79,27 +79,25 @@
7979
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8080
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8584
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8685
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
9289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9692
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9894
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9995
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
10096
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
10197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
10299
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
103101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
104102
</content>
105103
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />

‎library/src/main/java/com/tubb/smrv/SwipeMenuGridView.java

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.view.MotionEvent;
66
import android.view.View;
77
import android.widget.GridView;
8+
import android.widget.ListAdapter;
89

910
public class SwipeMenuGridView extends GridView implements SwipeMenuHelper.Callback{
1011

@@ -60,4 +61,10 @@ public View getRealChildAt(int index) {
6061
public View transformTouchingView(int touchingPosition, View touchingView) {
6162
return touchingView;
6263
}
64+
65+
@Override
66+
public void setAdapter(ListAdapter adapter) {
67+
mHelper.reset();
68+
super.setAdapter(adapter);
69+
}
6370
}

‎library/src/main/java/com/tubb/smrv/SwipeMenuHelper.java

+5
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ public View findChildViewUnder(float x, float y) {
123123
return null;
124124
}
125125

126+
public void reset() {
127+
mOldTouchedPosition = INVALID_POSITION;
128+
if (mOldSwipedView != null) mOldSwipedView.smoothCloseMenu();
129+
}
130+
126131
public interface Callback {
127132
int getPositionForView(View view);
128133
int getRealChildCount();

‎library/src/main/java/com/tubb/smrv/SwipeMenuListView.java

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.util.AttributeSet;
55
import android.view.MotionEvent;
66
import android.view.View;
7+
import android.widget.ListAdapter;
78
import android.widget.ListView;
89

910
public class SwipeMenuListView extends ListView implements SwipeMenuHelper.Callback{
@@ -60,4 +61,10 @@ public View getRealChildAt(int index) {
6061
public View transformTouchingView(int touchingPosition, View touchingView) {
6162
return touchingView;
6263
}
64+
65+
@Override
66+
public void setAdapter(ListAdapter adapter) {
67+
mHelper.reset();
68+
super.setAdapter(adapter);
69+
}
6370
}

‎library/src/main/java/com/tubb/smrv/SwipeMenuRecyclerView.java

+6
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,10 @@ public View transformTouchingView(int touchingPosition, View touchingView) {
6868
}
6969
return touchingView;
7070
}
71+
72+
@Override
73+
public void setAdapter(Adapter adapter) {
74+
mHelper.reset();
75+
super.setAdapter(adapter);
76+
}
7177
}

‎library/src/main/java/com/tubb/smrv/SwipeMenuScrollView.java

+4
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ public View getRealChildAt(int index) {
105105
}
106106
}
107107

108+
public void reset() {
109+
mHelper.reset();
110+
}
111+
108112
protected class Helper extends SwipeMenuHelper {
109113

110114
protected Helper(Context context, Callback callback) {

0 commit comments

Comments
 (0)
Please sign in to comment.