diff --git a/library/src/com/viewpagerindicator/CirclePageIndicator.java b/library/src/com/viewpagerindicator/CirclePageIndicator.java index f441e89fd..aadb2fd62 100644 --- a/library/src/com/viewpagerindicator/CirclePageIndicator.java +++ b/library/src/com/viewpagerindicator/CirclePageIndicator.java @@ -25,8 +25,6 @@ import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewConfigurationCompat; import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; @@ -104,13 +102,13 @@ public CirclePageIndicator(Context context, AttributeSet attrs, int defStyle) { Drawable background = a.getDrawable(R.styleable.CirclePageIndicator_android_background); if (background != null) { - setBackgroundDrawable(background); + setBackgroundDrawable(background); } a.recycle(); final ViewConfiguration configuration = ViewConfiguration.get(context); - mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration); + mTouchSlop = configuration.getScaledPagingTouchSlop(); } @@ -286,16 +284,16 @@ public boolean onTouchEvent(android.view.MotionEvent ev) { return false; } - final int action = ev.getAction() & MotionEventCompat.ACTION_MASK; + final int action = ev.getAction() & MotionEvent.ACTION_MASK; switch (action) { case MotionEvent.ACTION_DOWN: - mActivePointerId = MotionEventCompat.getPointerId(ev, 0); + mActivePointerId = ev.getPointerId(0); mLastMotionX = ev.getX(); break; case MotionEvent.ACTION_MOVE: { - final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId); - final float x = MotionEventCompat.getX(ev, activePointerIndex); + final int activePointerIndex = ev.findPointerIndex(mActivePointerId); + final float x = ev.getX(activePointerIndex); final float deltaX = x - mLastMotionX; if (!mIsDragging) { @@ -340,21 +338,21 @@ public boolean onTouchEvent(android.view.MotionEvent ev) { if (mViewPager.isFakeDragging()) mViewPager.endFakeDrag(); break; - case MotionEventCompat.ACTION_POINTER_DOWN: { - final int index = MotionEventCompat.getActionIndex(ev); - mLastMotionX = MotionEventCompat.getX(ev, index); - mActivePointerId = MotionEventCompat.getPointerId(ev, index); + case MotionEvent.ACTION_POINTER_DOWN: { + final int index = ev.getActionIndex(); + mLastMotionX = ev.getX(index); + mActivePointerId = ev.getPointerId(index); break; } - case MotionEventCompat.ACTION_POINTER_UP: - final int pointerIndex = MotionEventCompat.getActionIndex(ev); - final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex); + case MotionEvent.ACTION_POINTER_UP: + final int pointerIndex = ev.getActionIndex(); + final int pointerId = ev.getPointerId(pointerIndex); if (pointerId == mActivePointerId) { final int newPointerIndex = pointerIndex == 0 ? 1 : 0; - mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex); + mActivePointerId = ev.getPointerId(newPointerIndex); } - mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId)); + mLastMotionX = ev.getX(ev.findPointerIndex(mActivePointerId)); break; } @@ -367,13 +365,13 @@ public void setViewPager(ViewPager view) { return; } if (mViewPager != null) { - mViewPager.setOnPageChangeListener(null); + mViewPager.addOnPageChangeListener(null); } if (view.getAdapter() == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = view; - mViewPager.setOnPageChangeListener(this); + mViewPager.addOnPageChangeListener(this); invalidate(); } @@ -453,8 +451,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { /** * Determines the width of this view * - * @param measureSpec - * A measureSpec packed into an int + * @param measureSpec A measureSpec packed into an int * @return The width of the view, honoring constraints from measureSpec */ private int measureLong(int measureSpec) { @@ -468,7 +465,7 @@ private int measureLong(int measureSpec) { } else { //Calculate the width according the views count final int count = mViewPager.getAdapter().getCount(); - result = (int)(getPaddingLeft() + getPaddingRight() + result = (int) (getPaddingLeft() + getPaddingRight() + (count * 2 * mRadius) + (count - 1) * mRadius + 1); //Respect AT_MOST value if that was what is called for by measureSpec if (specMode == MeasureSpec.AT_MOST) { @@ -481,8 +478,7 @@ private int measureLong(int measureSpec) { /** * Determines the height of this view * - * @param measureSpec - * A measureSpec packed into an int + * @param measureSpec A measureSpec packed into an int * @return The height of the view, honoring constraints from measureSpec */ private int measureShort(int measureSpec) { @@ -495,7 +491,7 @@ private int measureShort(int measureSpec) { result = specSize; } else { //Measure the height - result = (int)(2 * mRadius + getPaddingTop() + getPaddingBottom() + 1); + result = (int) (2 * mRadius + getPaddingTop() + getPaddingBottom() + 1); //Respect AT_MOST value if that was what is called for by measureSpec if (specMode == MeasureSpec.AT_MOST) { result = Math.min(result, specSize); @@ -506,7 +502,7 @@ private int measureShort(int measureSpec) { @Override public void onRestoreInstanceState(Parcelable state) { - SavedState savedState = (SavedState)state; + SavedState savedState = (SavedState) state; super.onRestoreInstanceState(savedState.getSuperState()); mCurrentPage = savedState.currentPage; mSnapPage = savedState.currentPage; diff --git a/library/src/com/viewpagerindicator/IconPageIndicator.java b/library/src/com/viewpagerindicator/IconPageIndicator.java index 2e7d24673..89e5dd970 100644 --- a/library/src/com/viewpagerindicator/IconPageIndicator.java +++ b/library/src/com/viewpagerindicator/IconPageIndicator.java @@ -113,14 +113,14 @@ public void setViewPager(ViewPager view) { return; } if (mViewPager != null) { - mViewPager.setOnPageChangeListener(null); + mViewPager.addOnPageChangeListener(null); } PagerAdapter adapter = view.getAdapter(); if (adapter == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = view; - view.setOnPageChangeListener(this); + view.addOnPageChangeListener(this); notifyDataSetChanged(); } diff --git a/library/src/com/viewpagerindicator/LinePageIndicator.java b/library/src/com/viewpagerindicator/LinePageIndicator.java index a009cbfbb..c5b290822 100644 --- a/library/src/com/viewpagerindicator/LinePageIndicator.java +++ b/library/src/com/viewpagerindicator/LinePageIndicator.java @@ -23,11 +23,8 @@ import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewConfigurationCompat; import android.support.v4.view.ViewPager; import android.util.AttributeSet; -import android.util.FloatMath; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; @@ -88,13 +85,13 @@ public LinePageIndicator(Context context, AttributeSet attrs, int defStyle) { Drawable background = a.getDrawable(R.styleable.LinePageIndicator_android_background); if (background != null) { - setBackgroundDrawable(background); + setBackgroundDrawable(background); } a.recycle(); final ViewConfiguration configuration = ViewConfiguration.get(context); - mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration); + mTouchSlop = configuration.getScaledPagingTouchSlop(); } @@ -198,16 +195,16 @@ public boolean onTouchEvent(android.view.MotionEvent ev) { return false; } - final int action = ev.getAction() & MotionEventCompat.ACTION_MASK; + final int action = ev.getAction() & MotionEvent.ACTION_MASK; switch (action) { case MotionEvent.ACTION_DOWN: - mActivePointerId = MotionEventCompat.getPointerId(ev, 0); + mActivePointerId = ev.getPointerId(0); mLastMotionX = ev.getX(); break; case MotionEvent.ACTION_MOVE: { - final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId); - final float x = MotionEventCompat.getX(ev, activePointerIndex); + final int activePointerIndex = ev.findPointerIndex(mActivePointerId); + final float x = ev.getX(activePointerIndex); final float deltaX = x - mLastMotionX; if (!mIsDragging) { @@ -252,21 +249,21 @@ public boolean onTouchEvent(android.view.MotionEvent ev) { if (mViewPager.isFakeDragging()) mViewPager.endFakeDrag(); break; - case MotionEventCompat.ACTION_POINTER_DOWN: { - final int index = MotionEventCompat.getActionIndex(ev); - mLastMotionX = MotionEventCompat.getX(ev, index); - mActivePointerId = MotionEventCompat.getPointerId(ev, index); + case MotionEvent.ACTION_POINTER_DOWN: { + final int index = ev.getActionIndex(); + mLastMotionX = ev.getX(index); + mActivePointerId = ev.getPointerId(index); break; } - case MotionEventCompat.ACTION_POINTER_UP: - final int pointerIndex = MotionEventCompat.getActionIndex(ev); - final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex); + case MotionEvent.ACTION_POINTER_UP: + final int pointerIndex = ev.getActionIndex(); + final int pointerId = ev.getPointerId(pointerIndex); if (pointerId == mActivePointerId) { final int newPointerIndex = pointerIndex == 0 ? 1 : 0; - mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex); + mActivePointerId = ev.getPointerId(newPointerIndex); } - mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId)); + mLastMotionX = ev.getX(ev.findPointerIndex(mActivePointerId)); break; } @@ -280,13 +277,13 @@ public void setViewPager(ViewPager viewPager) { } if (mViewPager != null) { //Clear us from the old pager. - mViewPager.setOnPageChangeListener(null); + mViewPager.addOnPageChangeListener(null); } if (viewPager.getAdapter() == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = viewPager; - mViewPager.setOnPageChangeListener(this); + mViewPager.addOnPageChangeListener(this); invalidate(); } @@ -369,7 +366,7 @@ private int measureWidth(int measureSpec) { result = Math.min(result, specSize); } } - return (int)FloatMath.ceil(result); + return (int)Math.ceil(result); } /** @@ -395,7 +392,7 @@ private int measureHeight(int measureSpec) { result = Math.min(result, specSize); } } - return (int)FloatMath.ceil(result); + return (int)Math.ceil(result); } @Override diff --git a/library/src/com/viewpagerindicator/TabPageIndicator.java b/library/src/com/viewpagerindicator/TabPageIndicator.java index 1fceda3e0..a95096320 100644 --- a/library/src/com/viewpagerindicator/TabPageIndicator.java +++ b/library/src/com/viewpagerindicator/TabPageIndicator.java @@ -191,14 +191,14 @@ public void setViewPager(ViewPager view) { return; } if (mViewPager != null) { - mViewPager.setOnPageChangeListener(null); + mViewPager.addOnPageChangeListener(null); } final PagerAdapter adapter = view.getAdapter(); if (adapter == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = view; - view.setOnPageChangeListener(this); + view.addOnPageChangeListener(this); notifyDataSetChanged(); } diff --git a/library/src/com/viewpagerindicator/UnderlinePageIndicator.java b/library/src/com/viewpagerindicator/UnderlinePageIndicator.java index dc6f82abc..3045e8593 100644 --- a/library/src/com/viewpagerindicator/UnderlinePageIndicator.java +++ b/library/src/com/viewpagerindicator/UnderlinePageIndicator.java @@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewConfigurationCompat; import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; @@ -58,16 +56,16 @@ public class UnderlinePageIndicator extends View implements PageIndicator { private boolean mIsDragging; private final Runnable mFadeRunnable = new Runnable() { - @Override public void run() { - if (!mFades) return; + @Override public void run() { + if (!mFades) return; - final int alpha = Math.max(mPaint.getAlpha() - mFadeBy, 0); - mPaint.setAlpha(alpha); - invalidate(); - if (alpha > 0) { - postDelayed(this, FADE_FRAME_MS); + final int alpha = Math.max(mPaint.getAlpha() - mFadeBy, 0); + mPaint.setAlpha(alpha); + invalidate(); + if (alpha > 0) { + postDelayed(this, FADE_FRAME_MS); + } } - } }; public UnderlinePageIndicator(Context context) { @@ -100,13 +98,13 @@ public UnderlinePageIndicator(Context context, AttributeSet attrs, int defStyle) Drawable background = a.getDrawable(R.styleable.UnderlinePageIndicator_android_background); if (background != null) { - setBackgroundDrawable(background); + setBackgroundDrawable(background); } a.recycle(); final ViewConfiguration configuration = ViewConfiguration.get(context); - mTouchSlop = ViewConfigurationCompat.getScaledPagingTouchSlop(configuration); + mTouchSlop = configuration.getScaledPagingTouchSlop(); } public boolean getFades() { @@ -186,16 +184,16 @@ public boolean onTouchEvent(MotionEvent ev) { return false; } - final int action = ev.getAction() & MotionEventCompat.ACTION_MASK; + final int action = ev.getAction() & MotionEvent.ACTION_MASK; switch (action) { case MotionEvent.ACTION_DOWN: - mActivePointerId = MotionEventCompat.getPointerId(ev, 0); + mActivePointerId = ev.getPointerId(0); mLastMotionX = ev.getX(); break; case MotionEvent.ACTION_MOVE: { - final int activePointerIndex = MotionEventCompat.findPointerIndex(ev, mActivePointerId); - final float x = MotionEventCompat.getX(ev, activePointerIndex); + final int activePointerIndex = ev.findPointerIndex(mActivePointerId); + final float x = ev.getX(activePointerIndex); final float deltaX = x - mLastMotionX; if (!mIsDragging) { @@ -240,21 +238,21 @@ public boolean onTouchEvent(MotionEvent ev) { if (mViewPager.isFakeDragging()) mViewPager.endFakeDrag(); break; - case MotionEventCompat.ACTION_POINTER_DOWN: { - final int index = MotionEventCompat.getActionIndex(ev); - mLastMotionX = MotionEventCompat.getX(ev, index); - mActivePointerId = MotionEventCompat.getPointerId(ev, index); + case MotionEvent.ACTION_POINTER_DOWN: { + final int index = ev.getActionIndex(); + mLastMotionX = ev.getX(index); + mActivePointerId = ev.getPointerId(index); break; } - case MotionEventCompat.ACTION_POINTER_UP: - final int pointerIndex = MotionEventCompat.getActionIndex(ev); - final int pointerId = MotionEventCompat.getPointerId(ev, pointerIndex); + case MotionEvent.ACTION_POINTER_UP: + final int pointerIndex = ev.getActionIndex(); + final int pointerId = ev.getPointerId(pointerIndex); if (pointerId == mActivePointerId) { final int newPointerIndex = pointerIndex == 0 ? 1 : 0; - mActivePointerId = MotionEventCompat.getPointerId(ev, newPointerIndex); + mActivePointerId = ev.getPointerId(newPointerIndex); } - mLastMotionX = MotionEventCompat.getX(ev, MotionEventCompat.findPointerIndex(ev, mActivePointerId)); + mLastMotionX = ev.getX(ev.findPointerIndex(mActivePointerId)); break; } @@ -268,13 +266,13 @@ public void setViewPager(ViewPager viewPager) { } if (mViewPager != null) { //Clear us from the old pager. - mViewPager.setOnPageChangeListener(null); + mViewPager.addOnPageChangeListener(null); } if (viewPager.getAdapter() == null) { throw new IllegalStateException("ViewPager does not have adapter instance."); } mViewPager = viewPager; - mViewPager.setOnPageChangeListener(this); + mViewPager.addOnPageChangeListener(this); invalidate(); post(new Runnable() { @Override public void run() {