增加ScrollState定义，消除框架对ViewPager的依赖

Author: hackware1993

magicindicator/build.gradle

@@ -13,13 +13,11 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.4.0'
 }

magicindicator/proguard-rules.pro

@@ -1,6 +1,5 @@
 package net.lucode.hackware.magicindicator;
 
-import android.support.v4.view.ViewPager;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 
@@ -13,7 +12,7 @@
 public class NavigatorHelper {
     private int mCurrentIndex;
     private int mTotalCount;
-    private int mScrollState = ViewPager.SCROLL_STATE_IDLE;
+    private int mScrollState = ScrollState.SCROLL_STATE_IDLE;
 
     // 转换后的回调
     private OnNavigatorScrollListener mNavigatorScrollListener;
@@ -38,7 +37,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
             float currentPositionOffsetSum = position + positionOffset;
             boolean leftToRight = currentPositionOffsetSum >= mLastPositionOffsetSum;
             int safePosition = getSafeIndex(position);
-            if (mScrollState != ViewPager.SCROLL_STATE_IDLE) {
+            if (mScrollState != ScrollState.SCROLL_STATE_IDLE) {
                 int enterIndex;
                 int leaveIndex;
                 float enterPercent;
@@ -66,7 +65,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
                 }
                 if (enterIndex == leaveIndex) {
                     if (enterIndex == mTotalCount - 1 && mLeavedPercents.get(enterIndex, 0.0f) != 0.0f && enterPercent == 0.0f && leftToRight) {
-                        boolean dispatchEnterEvent = mSkimOver || mScrollState == ViewPager.SCROLL_STATE_DRAGGING || enterIndex == mCurrentIndex;
+                        boolean dispatchEnterEvent = mSkimOver || mScrollState == ScrollState.SCROLL_STATE_DRAGGING || enterIndex == mCurrentIndex;
                         if (dispatchEnterEvent) {
                             mNavigatorScrollListener.onEnter(enterIndex, mTotalCount, 1.0f, true);
                             mLeavedPercents.put(enterIndex, 0.0f);
@@ -75,22 +74,22 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
                     return;
                 }
                 if (1.0f - mLeavedPercents.get(enterIndex, 0.0f) != enterPercent) {
-                    boolean dispatchEnterEvent = mSkimOver || mScrollState == ViewPager.SCROLL_STATE_DRAGGING || enterIndex == mCurrentIndex;
+                    boolean dispatchEnterEvent = mSkimOver || mScrollState == ScrollState.SCROLL_STATE_DRAGGING || enterIndex == mCurrentIndex;
                     if (dispatchEnterEvent) {
                         mNavigatorScrollListener.onEnter(enterIndex, mTotalCount, enterPercent, leftToRight);
                         mLeavedPercents.put(enterIndex, 1.0f - enterPercent);
                     }
                 }
                 if (mLeavedPercents.get(leaveIndex, 0.0f) != leavePercent) {
                     if (leftToRight && leaveIndex == getCurrentIndex() && leavePercent == 0.0f) {
-                        boolean dispatchEnterEvent = mSkimOver || mScrollState == ViewPager.SCROLL_STATE_DRAGGING || leaveIndex == mCurrentIndex;
+                        boolean dispatchEnterEvent = mSkimOver || mScrollState == ScrollState.SCROLL_STATE_DRAGGING || leaveIndex == mCurrentIndex;
                         if (dispatchEnterEvent) {
                             mNavigatorScrollListener.onEnter(leaveIndex, mTotalCount, 1.0f, true);
                             mLeavedPercents.put(leaveIndex, 0.0f);
                         }
                     } else {
                         boolean dispatchLeaveEvent = mSkimOver
-                                || mScrollState == ViewPager.SCROLL_STATE_DRAGGING
+                                || mScrollState == ScrollState.SCROLL_STATE_DRAGGING
                                 || leaveIndex == mLastIndex
                                 || (leaveIndex == mCurrentIndex - 1 && mLeavedPercents.get(leaveIndex, 0.0f) != 1.0f)
                                 || (leaveIndex == mCurrentIndex + 1 && mLeavedPercents.get(leaveIndex, 0.0f) != 1.0f);
@@ -192,7 +191,7 @@ public void clear() {
         mCurrentIndex = 0;
         mLastIndex = 0;
         mLastPositionOffsetSum = 0.0f;
-        mScrollState = ViewPager.SCROLL_STATE_IDLE;
+        mScrollState = ScrollState.SCROLL_STATE_IDLE;
         mDeselectedItems.clear();
         mLeavedPercents.clear();
     }

magicindicator/src/main/java/net/lucode/hackware/magicindicator/NavigatorHelper.java

@@ -0,0 +1,12 @@
+package net.lucode.hackware.magicindicator;
+
+/**
+ * 自定义滚动状态，消除对ViewPager的依赖
+ * Created by hackware on 2016/8/27.
+ */
+
+public interface ScrollState {
+    int SCROLL_STATE_IDLE = 0;
+    int SCROLL_STATE_DRAGGING = 1;
+    int SCROLL_STATE_SETTLING = 2;
+}

magicindicator/src/main/java/net/lucode/hackware/magicindicator/ScrollState.java

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.database.DataSetObserver;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +11,7 @@
 
 import net.lucode.hackware.magicindicator.NavigatorHelper;
 import net.lucode.hackware.magicindicator.R;
+import net.lucode.hackware.magicindicator.ScrollState;
 import net.lucode.hackware.magicindicator.abs.IPagerNavigator;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IMeasurablePagerTitleView;
@@ -169,7 +169,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
             if (mIndicator != null) {
                 mIndicator.onPositionDataProvide(mPositionDataList);
             }
-            if (mReselectWhenLayout && mNavigatorHelper.getScrollState() == ViewPager.SCROLL_STATE_IDLE) {
+            if (mReselectWhenLayout && mNavigatorHelper.getScrollState() == ScrollState.SCROLL_STATE_IDLE) {
                 onPageSelected(mNavigatorHelper.getCurrentIndex());
                 onPageScrolled(mNavigatorHelper.getCurrentIndex(), 0.0f, 0);
             }