Skip to content

Commit e22fa4c

Browse files
baoyongzhangbaoyongzhang
committed
Revert b590d7e..57005ac
This rolls back to commit b590d7e.
1 parent 57005ac commit e22fa4c

File tree

5 files changed

+28
-98
lines changed

5 files changed

+28
-98
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.13.0'
8+
classpath 'com.android.tools.build:gradle:1.0.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎library/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ android {
55
buildToolsVersion "21.0.2"
66

77
defaultConfig {
8-
applicationId "com.baoyz.widget"
98
minSdkVersion 8
109
targetSdkVersion 21
1110
versionCode 1
1211
versionName "1.0"
1312
}
1413
buildTypes {
1514
release {
16-
runProguard false
15+
minifyEnabled false
1716
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1817
}
1918
}

‎library/src/main/java/com/baoyz/widget/MaterialDrawable.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,6 @@
1616

1717
package com.baoyz.widget;
1818

19-
import android.graphics.RadialGradient;
20-
import android.graphics.Shader;
21-
import android.graphics.drawable.ShapeDrawable;
22-
import android.graphics.drawable.shapes.OvalShape;
23-
import android.util.Log;
24-
import android.util.TypedValue;
25-
import android.view.animation.AccelerateDecelerateInterpolator;
26-
import android.view.animation.Interpolator;
27-
import android.view.animation.Animation;
28-
import android.view.animation.LinearInterpolator;
29-
import android.view.animation.Transformation;
3019
import android.content.Context;
3120
import android.content.res.Resources;
3221
import android.graphics.Canvas;
@@ -36,14 +25,24 @@
3625
import android.graphics.Paint.Style;
3726
import android.graphics.Path;
3827
import android.graphics.PixelFormat;
28+
import android.graphics.RadialGradient;
3929
import android.graphics.Rect;
4030
import android.graphics.RectF;
41-
import android.graphics.drawable.Drawable;
31+
import android.graphics.Shader;
4232
import android.graphics.drawable.Animatable;
33+
import android.graphics.drawable.Drawable;
34+
import android.graphics.drawable.ShapeDrawable;
35+
import android.graphics.drawable.shapes.OvalShape;
4336
import android.support.annotation.IntDef;
4437
import android.support.annotation.NonNull;
4538
import android.util.DisplayMetrics;
39+
import android.util.TypedValue;
4640
import android.view.View;
41+
import android.view.animation.AccelerateDecelerateInterpolator;
42+
import android.view.animation.Animation;
43+
import android.view.animation.Interpolator;
44+
import android.view.animation.LinearInterpolator;
45+
import android.view.animation.Transformation;
4746

4847
import java.lang.annotation.Retention;
4948
import java.lang.annotation.RetentionPolicy;

‎library/src/main/java/com/baoyz/widget/PullRefreshLayout.java

Lines changed: 14 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.support.v4.view.MotionEventCompat;
66
import android.support.v4.view.ViewCompat;
77
import android.util.AttributeSet;
8-
import android.util.Log;
98
import android.util.TypedValue;
109
import android.view.MotionEvent;
1110
import android.view.View;
@@ -84,14 +83,14 @@ public PullRefreshLayout(Context context, AttributeSet attrs) {
8483
ViewCompat.setChildrenDrawingOrderEnabled(this, true);
8584
}
8685

87-
public void setColorSchemeColors(int[] colorSchemeColors) {
86+
public void setColorSchemeColors(int[] colorSchemeColors){
8887
mColorSchemeColors = colorSchemeColors;
8988
mRefreshDrawable.setColorSchemeColors(colorSchemeColors);
9089
}
9190

92-
public void setRefreshStyle(int type) {
91+
public void setRefreshStyle(int type){
9392
setRefreshing(false);
94-
switch (type) {
93+
switch (type){
9594
case STYLE_MATERIAL:
9695
mRefreshDrawable = new MaterialDrawable(getContext(), this);
9796
break;
@@ -111,7 +110,7 @@ public void setRefreshStyle(int type) {
111110
mRefreshView.setImageDrawable(mRefreshDrawable);
112111
}
113112

114-
public int getFinalOffset() {
113+
public int getFinalOffset(){
115114
return mSpinnerFinalOffset;
116115
}
117116

@@ -145,9 +144,6 @@ private void ensureTarget() {
145144
@Override
146145
public boolean onInterceptTouchEvent(MotionEvent ev) {
147146

148-
if (mRefreshing)
149-
return onInterceptRefreshingTouchEvent(ev);
150-
151147
if (!isEnabled() || canChildScrollUp() || mRefreshing) {
152148
return false;
153149
}
@@ -195,72 +191,8 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
195191
return mIsBeingDragged;
196192
}
197193

198-
private boolean onInterceptRefreshingTouchEvent(MotionEvent ev) {
199-
final int action = MotionEventCompat.getActionMasked(ev);
200-
201-
switch (action) {
202-
case MotionEvent.ACTION_DOWN:
203-
mIsBeingDragged = false;
204-
mInitialMotionY = ev.getY();
205-
break;
206-
case MotionEvent.ACTION_MOVE:
207-
if (canChildScrollDown()) {
208-
return true;
209-
}
210-
break;
211-
case MotionEvent.ACTION_UP:
212-
case MotionEvent.ACTION_CANCEL:
213-
mIsBeingDragged = false;
214-
mActivePointerId = INVALID_POINTER;
215-
break;
216-
case MotionEventCompat.ACTION_POINTER_UP:
217-
onSecondaryPointerUp(ev);
218-
break;
219-
}
220-
return true;
221-
}
222-
223-
private boolean onRefreshingTouchEvent(MotionEvent ev) {
224-
225-
226-
final int action = MotionEventCompat.getActionMasked(ev);
227-
228-
switch (action) {
229-
case MotionEvent.ACTION_DOWN:
230-
mTarget.dispatchTouchEvent(ev);
231-
break;
232-
case MotionEvent.ACTION_MOVE: {
233-
int offsetY = (int) (ev.getY() - mInitialMotionY);
234-
mInitialMotionY = ev.getY();
235-
if (mCurrentOffsetTop > mTotalDragDistance && offsetY > 0) {
236-
break;
237-
}
238-
if (mCurrentOffsetTop <= 0 && offsetY < 0) {
239-
ev.offsetLocation(0, mTotalDragDistance);
240-
mTarget.dispatchTouchEvent(ev);
241-
break;
242-
}
243-
Log.i("byz", "scrollY = " + mTarget.getScrollY() + ", paddingTop = " + mTarget.getPaddingTop());
244-
if (mTarget.getScrollY() == 0){
245-
setTargetOffsetTop(offsetY, true);
246-
}else{
247-
248-
mTarget.dispatchTouchEvent(ev);
249-
}
250-
break;
251-
}
252-
case MotionEvent.ACTION_CANCEL:
253-
case MotionEvent.ACTION_UP:
254-
mTarget.dispatchTouchEvent(ev);
255-
break;
256-
}
257-
return true;
258-
}
259-
260194
@Override
261195
public boolean onTouchEvent(MotionEvent ev) {
262-
if (mRefreshing)
263-
return onRefreshingTouchEvent(ev);
264196

265197
if (!mIsBeingDragged) {
266198
return super.onTouchEvent(ev);
@@ -487,18 +419,18 @@ private boolean canChildScrollUp() {
487419
}
488420

489421
private boolean canChildScrollDown() {
490-
// if (android.os.Build.VERSION.SDK_INT < 14) {
491-
if (mTarget instanceof AbsListView) {
492-
final AbsListView absListView = (AbsListView) mTarget;
493-
return absListView.getChildCount() > 0
494-
&& (absListView.getFirstVisiblePosition() > 0 || absListView.getChildAt(0)
495-
.getTop() >= absListView.getPaddingTop());
422+
if (android.os.Build.VERSION.SDK_INT < 14) {
423+
if (mTarget instanceof AbsListView) {
424+
final AbsListView absListView = (AbsListView) mTarget;
425+
return absListView.getChildCount() > 0
426+
&& (absListView.getFirstVisiblePosition() > 0 || absListView.getChildAt(0)
427+
.getTop() < absListView.getPaddingTop());
428+
} else {
429+
return mTarget.getScrollY() > 0;
430+
}
496431
} else {
497-
return mTarget.getScrollY() <= 0;
432+
return ViewCompat.canScrollVertically(mTarget, -1);
498433
}
499-
// } else {
500-
// return ViewCompat.canScrollVertically(mTarget, -1);
501-
// }
502434
}
503435

504436
@Override

‎sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
}
1414
buildTypes {
1515
release {
16-
runProguard false
16+
minifyEnabled false
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}

0 commit comments

Comments
 (0)