Skip to content

Commit 6bd29f2

Browse files
committed
refactor the code.
1 parent 352000c commit 6bd29f2

File tree

10 files changed

+22
-333
lines changed

10 files changed

+22
-333
lines changed

library/src/main/java/com/lcodecore/tkrefreshlayout/OverScrollProcessor.java

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

library/src/main/java/com/lcodecore/tkrefreshlayout/RefreshProcessor.java

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

library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
import com.lcodecore.tkrefreshlayout.Footer.BottomProgressView;
1616
import com.lcodecore.tkrefreshlayout.header.GoogleDotView;
17+
import com.lcodecore.tkrefreshlayout.processor.AnimProcessor;
18+
import com.lcodecore.tkrefreshlayout.processor.IDecorator;
19+
import com.lcodecore.tkrefreshlayout.processor.OverScrollDecorator;
20+
import com.lcodecore.tkrefreshlayout.processor.RefreshProcessor;
1721
import com.lcodecore.tkrefreshlayout.utils.DensityUtil;
1822
import com.lcodecore.tkrefreshlayout.utils.ScrollingUtil;
1923

@@ -163,7 +167,7 @@ protected void onFinishInflate() {
163167
mChildView = getChildAt(3);
164168

165169
cp.init();
166-
decorator = new OverScrollDecorator(cp, new RefreshDecorator(cp));
170+
decorator = new OverScrollDecorator(cp, new RefreshProcessor(cp));
167171
initGestureDetector();
168172
}
169173

@@ -580,8 +584,6 @@ public void onLoadmoreCanceled() {
580584
}
581585

582586
public class CoProcessor {
583-
private RefreshProcessor refreshProcessor;
584-
private OverScrollProcessor overScrollProcessor;
585587
private AnimProcessor animProcessor;
586588

587589
private final static int PULLING_TOP_DOWN = 0;
@@ -595,8 +597,6 @@ public class CoProcessor {
595597

596598
public CoProcessor() {
597599
animProcessor = new AnimProcessor(this);
598-
overScrollProcessor = new OverScrollProcessor(this);
599-
refreshProcessor = new RefreshProcessor(this);
600600
}
601601

602602
public void init() {
@@ -659,14 +659,6 @@ public int getTouchSlop() {
659659
return ViewConfiguration.get(getContext()).getScaledTouchSlop();
660660
}
661661

662-
public boolean interceptTouchEvent(MotionEvent ev) {
663-
return refreshProcessor.interceptTouchEvent(ev);
664-
}
665-
666-
public boolean consumeTouchEvent(MotionEvent ev) {
667-
return refreshProcessor.consumeTouchEvent(ev);
668-
}
669-
670662
/**
671663
* 在越界时阻止再次进入这个状态而导致动画闪烁。 Prevent entering the overscroll-mode again on animating.
672664
*/

library/src/main/java/com/lcodecore/tkrefreshlayout/AnimProcessor.java renamed to library/src/main/java/com/lcodecore/tkrefreshlayout/processor/AnimProcessor.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.lcodecore.tkrefreshlayout;
1+
package com.lcodecore.tkrefreshlayout.processor;
22

33
import android.animation.Animator;
44
import android.animation.Animator.AnimatorListener;
@@ -7,21 +7,23 @@
77
import android.animation.ValueAnimator.AnimatorUpdateListener;
88
import android.view.animation.DecelerateInterpolator;
99

10+
import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
11+
1012
import static android.view.View.GONE;
1113
import static android.view.View.VISIBLE;
1214

1315
/**
1416
* Created by lcodecore on 2016/11/26.
1517
*/
1618

17-
class AnimProcessor implements IAnimRefresh, IAnimOverScroll {
19+
public class AnimProcessor implements IAnimRefresh, IAnimOverScroll {
1820

1921
private TwinklingRefreshLayout.CoProcessor cp;
2022
private static final float animFraction = 1f;
2123
//动画的变化率
2224
private DecelerateInterpolator decelerateInterpolator;
2325

24-
AnimProcessor(TwinklingRefreshLayout.CoProcessor coProcessor) {
26+
public AnimProcessor(TwinklingRefreshLayout.CoProcessor coProcessor) {
2527
this.cp = coProcessor;
2628
decelerateInterpolator = new DecelerateInterpolator(8);
2729
}

0 commit comments

Comments
 (0)