Skip to content

Commit 11ca70e

Browse files
committed
fix no onNestedFling method earlier than Android 5.0 Lollipop && gradle update
1 parent e73e8ae commit 11ca70e

File tree

7 files changed

+17
-89
lines changed

7 files changed

+17
-89
lines changed

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
dexOptions{
21+
dexInProcess false
22+
}
2023
}
2124

2225
dependencies {

build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:2.0.0-alpha9'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
10-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
11-
129
// NOTE: Do not place your application dependencies here; they belong
1310
// in the individual module build.gradle files
1411
}
@@ -17,7 +14,7 @@ buildscript {
1714
allprojects {
1815
repositories {
1916
jcenter()
20-
maven{ url 'https://dl.bintray.com/ashqal/maven/' }
17+
maven { url "https://jitpack.io" }
2118
}
2219
}
2320

chromelikeswipelayout/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
apply plugin: 'com.android.library'
2-
apply from :'upload.gradle'
32

43
android {
54
compileSdkVersion 23
65
buildToolsVersion '23.0.2'
76
defaultConfig {
87
minSdkVersion 7
98
targetSdkVersion 23
10-
versionCode 1
11-
versionName releaseVersion
9+
versionCode 4
10+
versionName "0.4"
1211
}
1312
buildTypes {
1413
release {

chromelikeswipelayout/src/main/java/com/asha/ChromeLikeSwipeLayout.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,11 @@ public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
570570

571571
@Override
572572
public boolean onNestedFling(View target, float velocityX, float velocityY, boolean consumed) {
573-
return super.onNestedFling(target, velocityX, velocityY, consumed);
573+
return false;
574574
}
575575

576576
@Override
577577
public boolean onNestedPreFling(View target, float velocityX, float velocityY) {
578-
return super.onNestedPreFling(target, velocityX, velocityY);
578+
return false;
579579
}
580580
}

chromelikeswipelayout/src/main/java/com/asha/TouchManager.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class TouchManager {
1919
private int mActivePointerId = INVALID_POINTER;
2020
private PointF mTmpPoint = new PointF();
2121
private ITouchCallback mTouchCallback;
22-
private int sThreshold = dp2px(120);
22+
private int mThreshold = dp2px(120);
2323
private static final int sThreshold2 = dp2px(400);
2424
private int mMotionX;
2525
private boolean mInterceptEnabled = true;
@@ -69,7 +69,7 @@ public void endDrag(){
6969
}
7070

7171
public float calExpandProgress(int currentTop){
72-
return currentTop * 1.0f / sThreshold;
72+
return currentTop * 1.0f / mThreshold;
7373
}
7474

7575
public int calTargetTopOffset(int currentTop){
@@ -113,8 +113,8 @@ private float motionY2TouchDown(float y){
113113
float diff;
114114
if ( mTopOffset < 0 ){
115115
diff = 0;
116-
} else if( mTopOffset > sThreshold ){
117-
diff = (mTopOffset - sThreshold ) / 0.3f / 0.6f + sThreshold / 0.6f;
116+
} else if( mTopOffset > mThreshold){
117+
diff = (mTopOffset - mThreshold) / 0.3f / 0.6f + mThreshold / 0.6f;
118118
} else {
119119
diff = mTopOffset / 0.6f;
120120
}
@@ -124,8 +124,8 @@ private float motionY2TouchDown(float y){
124124
private int motionY2TopOffset(float y){
125125
float original = y - mTouchDownActor;
126126
float basic = original * 0.6f;
127-
if ( basic > sThreshold ){
128-
basic = sThreshold + (basic - sThreshold) * 0.3f;
127+
if ( basic > mThreshold){
128+
basic = mThreshold + (basic - mThreshold) * 0.3f;
129129
}
130130
return (int) basic;
131131
}
@@ -183,7 +183,7 @@ public boolean onFeedTouchEvent(MotionEvent event){
183183
final float y = MotionEventCompat.getY(event, pointerIndex);
184184
setTopOffset(y);
185185

186-
boolean isExpanded = mTopOffset >= sThreshold && mBeginDragging;
186+
boolean isExpanded = mTopOffset >= mThreshold && mBeginDragging;
187187
//first point
188188

189189
switch ( action ) {
@@ -225,7 +225,7 @@ public void setInterceptEnabled(boolean interceptEnabled) {
225225
}
226226

227227
public void setMaxHeight(int maxHeight) {
228-
this.sThreshold = maxHeight;
228+
this.mThreshold = maxHeight;
229229
}
230230

231231
public interface ITouchCallback {

chromelikeswipelayout/upload.gradle

Lines changed: 0 additions & 70 deletions
This file was deleted.

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
19-
releaseVersion=0.3
18+
# org.gradle.parallel=true

0 commit comments

Comments
 (0)