FragmentContainerHelper支持duration和插值器

hackware1993 · Sep 4, 2016 · ceacf87 · ceacf87
1 parent 9433d9c
commit ceacf87
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Simple steps, you can integrate **MagicIndicator**:
   }
   ```
 
-3. add **magicindicator** to your layout xml:
+3. add **MagicIndicator** to your layout xml:
 
   ```
   <?xml version="1.0" encoding="utf-8"?>
@@ -60,7 +60,7 @@ Simple steps, you can integrate **MagicIndicator**:
   </LinearLayout>
   ```
 
-4. find **magicindicator** through code, initialize it:
+4. find **MagicIndicator** through code, initialize it:
 
   ```
   MagicIndicator magicIndicator = (MagicIndicator) findViewById(R.id.magic_indicator);

diff --git a/magicindicator/src/main/java/net/lucode/hackware/magicindicator/FragmentContainerHelper.java b/magicindicator/src/main/java/net/lucode/hackware/magicindicator/FragmentContainerHelper.java
@@ -1,7 +1,9 @@
 package net.lucode.hackware.magicindicator;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
+import android.view.animation.Interpolator;
 
 
 /**
@@ -10,19 +12,21 @@
  * Created by hackware on 2016/9/4.
  */
 
-public class FragmentContainerHelper implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener {
+public class FragmentContainerHelper extends AnimatorListenerAdapter implements ValueAnimator.AnimatorUpdateListener {
     private MagicIndicator mMagicIndicator;
     private ValueAnimator mScrollAnimator;
+    private int mDuration = 200;
+    private Interpolator mInterpolator;
 
     public FragmentContainerHelper(MagicIndicator magicIndicator) {
         mMagicIndicator = magicIndicator;
     }
 
     public void handlePageSelected(int selectedIndex) {
         if (mScrollAnimator == null || !mScrollAnimator.isRunning()) {
-            mMagicIndicator.onPageScrollStateChanged(ScrollState.SCROLL_STATE_SETTLING);
+            dispatchPageScrollStateChanged(ScrollState.SCROLL_STATE_SETTLING);
         }
-        mMagicIndicator.onPageSelected(selectedIndex);
+        dispatchPageSelected(selectedIndex);
         float currentPositionOffsetSum = 0.0f; // position = 0, positionOffset = 0.0f
         if (mScrollAnimator != null) {
             currentPositionOffsetSum = (Float) mScrollAnimator.getAnimatedValue();
@@ -33,39 +37,41 @@ public void handlePageSelected(int selectedIndex) {
         mScrollAnimator.setFloatValues(currentPositionOffsetSum, selectedIndex);    // position = selectedIndex, positionOffset = 0.0f
         mScrollAnimator.addUpdateListener(this);
         mScrollAnimator.addListener(this);
+        mScrollAnimator.setInterpolator(mInterpolator);
+        mScrollAnimator.setDuration(mDuration);
         mScrollAnimator.start();
     }
 
-    public MagicIndicator getMagicIndicator() {
-        return mMagicIndicator;
+    public void setDuration(int duration) {
+        mDuration = duration;
     }
 
-    public void setMagicIndicator(MagicIndicator magicIndicator) {
-        mMagicIndicator = magicIndicator;
+    public void setInterpolator(Interpolator interpolator) {
+        mInterpolator = interpolator;
     }
 
-    @Override
-    public void onAnimationUpdate(ValueAnimator animation) {
-        float positionOffsetSum = (Float) animation.getAnimatedValue();
-        int position = (int) positionOffsetSum;
-        float positionOffset = positionOffsetSum - position;
-        mMagicIndicator.onPageScrolled(position, positionOffset, 0);
+    private void dispatchPageSelected(int pageIndex) {
+        mMagicIndicator.onPageSelected(pageIndex);
     }
 
-    @Override
-    public void onAnimationStart(Animator animation) {
+    private void dispatchPageScrollStateChanged(int state) {
+        mMagicIndicator.onPageScrollStateChanged(state);
     }
 
-    @Override
-    public void onAnimationEnd(Animator animation) {
-        mMagicIndicator.onPageScrollStateChanged(ScrollState.SCROLL_STATE_IDLE);
+    private void dispatchPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        mMagicIndicator.onPageScrolled(position, positionOffset, positionOffsetPixels);
     }
 
     @Override
-    public void onAnimationCancel(Animator animation) {
+    public void onAnimationUpdate(ValueAnimator animation) {
+        float positionOffsetSum = (Float) animation.getAnimatedValue();
+        int position = (int) positionOffsetSum;
+        float positionOffset = positionOffsetSum - position;
+        dispatchPageScrolled(position, positionOffset, 0);
     }
 
     @Override
-    public void onAnimationRepeat(Animator animation) {
+    public void onAnimationEnd(Animator animation) {
+        mMagicIndicator.onPageScrollStateChanged(ScrollState.SCROLL_STATE_IDLE);
     }
 }