diff --git a/build.gradle b/build.gradle
index 90756af..c2eea8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
+ classpath 'com.android.tools.build:gradle:2.3.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/demo/build.gradle b/demo/build.gradle
index 415124b..fd5c5af 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ buildToolsVersion '25.0.0'
defaultConfig {
applicationId "cn.bleu.slidedetailsdemo"
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 3558e42..f85e0af 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -10,9 +10,21 @@
android:layout_height="match_parent">
+ android:layout_height="match_parent">
+
+
+
+
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 122a0dc..06e04c9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Jul 18 22:54:45 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 01ad1b2..4a180ad 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ buildToolsVersion '25.0.0'
defaultConfig {
minSdkVersion 14
diff --git a/library/src/main/java/cn/bleu/widget/slidedetails/SlideDetailsLayout.java b/library/src/main/java/cn/bleu/widget/slidedetails/SlideDetailsLayout.java
index b586857..debcabd 100644
--- a/library/src/main/java/cn/bleu/widget/slidedetails/SlideDetailsLayout.java
+++ b/library/src/main/java/cn/bleu/widget/slidedetails/SlideDetailsLayout.java
@@ -534,10 +534,10 @@ private boolean innerCanChildScrollVertically(View view, int direction) {
boolean result;
for (int i = 0; i < vGroup.getChildCount(); i++) {
child = vGroup.getChildAt(i);
- if (child instanceof View) {
- result = ViewCompat.canScrollVertically(child, direction);
- } else {
+ if (child instanceof ViewGroup) {
result = innerCanChildScrollVertically(child, direction);
+ } else {
+ result = ViewCompat.canScrollVertically(child, direction);
}
if (result) {