diff --git a/app/build.gradle b/app/build.gradle index 6823ba0..cf2fb9f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion '24.0.1' + compileSdkVersion 25 + buildToolsVersion '25.0.2' defaultConfig { applicationId "com.aspsine.swipetoloadlayout" minSdkVersion 10 - targetSdkVersion 24 - versionCode 3 - versionName "1.0.3" + targetSdkVersion 25 + versionCode 4 + versionName "1.0.4" } buildTypes { release { @@ -27,10 +27,9 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile project(':library') - compile 'com.android.support:appcompat-v7:24.1.1' - compile 'com.android.support:recyclerview-v7:24.1.1' - compile 'com.android.support:support-v4:24.1.1' - compile 'com.android.support:design:24.1.1' + compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:recyclerview-v7:25.1.0' + compile 'com.android.support:design:25.1.0' compile 'com.google.code.gson:gson:2.4' compile 'com.mcxiaoke.volley:library-aar:1.0.1' compile 'com.squareup.picasso:picasso:2.5.2' diff --git a/build.gradle b/build.gradle index 03bced9..74b2ab0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c8c90b9..3e1c843 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 02 10:00:37 CST 2015 +#Wed Jan 04 00:31:07 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-2.14.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 11b9e50..62bd761 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion '24.0.1' + compileSdkVersion 25 + buildToolsVersion '25.0.2' defaultConfig { - minSdkVersion 8 - targetSdkVersion 24 - versionCode 3 - versionName "1.0.3" + minSdkVersion 9 + targetSdkVersion 25 + versionCode 4 + versionName "1.0.4" } buildTypes { release { @@ -21,5 +21,5 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v4:24.1.1' + compile 'com.android.support:support-compat:25.1.0' } diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 253f5ae..a3dd5a6 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,10 +1,6 @@ - + - - + diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java index 9233ab0..6802d40 100644 --- a/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java @@ -502,7 +502,8 @@ public boolean onInterceptTouchEvent(MotionEvent event) { final float xInitDiff = x - mInitDownX; mLastY = y; mLastX = x; - boolean moved = Math.abs(yInitDiff) > Math.abs(xInitDiff); + boolean moved = Math.abs(yInitDiff) > Math.abs(xInitDiff) + && Math.abs(yInitDiff) > mTouchSlop; boolean triggerCondition = // refresh trigger condition (yInitDiff > 0 && moved && onCheckCanRefresh()) || diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml deleted file mode 100644 index 47c8224..0000000 --- a/library/src/main/res/values/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 16dp - 16dp - diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml deleted file mode 100644 index cde1f0b..0000000 --- a/library/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - SwipeToLoadLayout -