support bottomSheet

yangyufei · yangyufei · commit ab0346d49562 · 2018-11-29T01:47:58.000+08:00
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>NestedTouchScrollingLayout</name>
+	<comment>Project NestedTouchScrollingLayout created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ mNestedTouchScrollingLayout.registerNestScrollChildCallback(new NestedTouchScrol
 ### Next
 - [x] hold all touch event, and dispath touch event to child view.
 - [x] fix ACTION_UP dispatch child click event.
-- [ ] support bottomsheet.
+- [x] support bottomsheet.
 - [ ] support CoordinatorLayout (AppbarLayout).
 - [ ] add damping draging.
 
diff --git a/app/.classpath b/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/app/.project b/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 
     implementation 'com.android.support:recyclerview-v7:28.0.0'
 
-//    api project(':library')
+    api project(':library')
 //    implementation 'com.github.JarvisGG:NestedTouchScrollingLayout:v1.0.2'
-    implementation 'com.jarvis.library.NestedTouchScrollingLayout:library:1.0.2'
+//    implementation 'com.jarvis.library.NestedTouchScrollingLayout:library:1.0.2'
 }
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/RecyclerViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/RecyclerViewActivity.java
@@ -77,6 +77,11 @@ public void run() {
                 });
             }
 
+            @Override
+            public void onFingerUp(float velocityY) {
+
+            }
+
             @Override
             public void onNestChildHorizationScroll(boolean show) {
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewActivity.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/WebViewActivity.java
@@ -48,6 +48,11 @@ public void onNestChildScrollRelease(float deltaY, int velocityY) {
                 mContainer.recover(0);
             }
 
+            @Override
+            public void onFingerUp(float velocityY) {
+
+            }
+
             @Override
             public void onNestChildHorizationScroll(boolean show) {
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/BaseChildFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/BaseChildFragment.java
@@ -45,6 +45,11 @@ public void onNestChildScrollRelease(float deltaY, int velocityY) {
                 mPager.setCurrentItem(targetPos);
             }
 
+            @Override
+            public void onFingerUp(float velocityY) {
+
+            }
+
             @Override
             public void onNestChildHorizationScroll(boolean show) {
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/RecyclerViewFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/RecyclerViewFragment.java
@@ -66,6 +66,11 @@ public void onNestChildScrollRelease(float deltaY, int velocityY) {
                 mNestedTouchScrollingLayout.recover(0, null, 300);
             }
 
+            @Override
+            public void onFingerUp(float velocityY) {
+
+            }
+
             @Override
             public void onNestChildHorizationScroll(boolean show) {
 
diff --git a/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/WebViewFragment.java b/app/src/main/java/jarvis/com/nestedtouchscrollinglayout/fragment/WebViewFragment.java
@@ -64,6 +64,11 @@ public void onNestChildScrollRelease(float deltaY, int velocityY) {
                 mNestedTouchScrollingLayout.recover(0);
             }
 
+            @Override
+            public void onFingerUp(float velocityY) {
+
+            }
+
             @Override
             public void onNestChildHorizationScroll(boolean show) {
 
diff --git a/library/.classpath b/library/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/library/.project b/library/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>library</name>
+	<comment>Project library created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/library/.settings/org.eclipse.buildship.core.prefs b/library/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/library/build.gradle b/library/build.gradle
@@ -43,7 +43,7 @@ def gitUrl = 'https://github.com/JarvisGG/NestedTouchScrollingLayout.git'
 def libName = "NestedTouchScrollingLayout"
 
 group = "com.jarvis.library.NestedTouchScrollingLayout"
-version = "1.0.2"
+version = "1.1.0"
 
 
 task sourcesJar(type: Jar) {
diff --git a/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java b/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=..`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ dependencies {`
`28`	`28`
`29`	`29`	`implementation 'com.android.support:recyclerview-v7:28.0.0'`
`30`	`30`
`31`		`-// api project(':library')`
	`31`	`+ api project(':library')`
`32`	`32`	`// implementation 'com.github.JarvisGG:NestedTouchScrollingLayout:v1.0.2'`
`33`		`- implementation 'com.jarvis.library.NestedTouchScrollingLayout:library:1.0.2'`
	`33`	`+// implementation 'com.jarvis.library.NestedTouchScrollingLayout:library:1.0.2'`
`34`	`34`	`}`