() {
@Override
public SavedState createFromParcel(Parcel in) {
@@ -599,7 +721,12 @@ public void writeToParcel(Parcel dest, int flags) {
}
}
+
+ /**
+ * A {@link ValueAnimator} that starts once a given predicate returns true.
+ */
public abstract class PendingStartAnimator extends ValueAnimator {
+
boolean hasStarted;
StartPredicate predicate;
@@ -617,7 +744,13 @@ void startIfNecessary(float currentValue) {
}
}
+ /**
+ * An Animator that shows and then shrinks a retreating join between the previous and newly
+ * selected pages. This also sets up some pending dot reveals – to be started when the retreat
+ * has passed the dot to be revealed.
+ */
public class PendingRetreatAnimator extends PendingStartAnimator {
+
PendingRetreatAnimator(int was, int now, int steps, StartPredicate predicate) {
super(predicate);
setDuration(animHalfDuration);
@@ -701,7 +834,11 @@ public void onAnimationEnd(Animator animation) {
}
}
+ /**
+ * An Animator that animates a given dot's revealFraction i.e. scales it up
+ */
public class PendingRevealAnimator extends PendingStartAnimator {
+
private int dot;
PendingRevealAnimator(int dot, StartPredicate predicate) {
@@ -727,7 +864,11 @@ public void onAnimationEnd(Animator animation) {
}
}
+ /**
+ * A predicate used to start an animation when a test passes
+ */
public abstract class StartPredicate {
+
float thresholdValue;
StartPredicate(float thresholdValue) {
@@ -737,7 +878,11 @@ public abstract class StartPredicate {
abstract boolean shouldStart(float currentValue);
}
+ /**
+ * A predicate used to start an animation when a given value is greater than a threshold
+ */
public class RightwardStartPredicate extends StartPredicate {
+
RightwardStartPredicate(float thresholdValue) {
super(thresholdValue);
}
@@ -747,7 +892,11 @@ boolean shouldStart(float currentValue) {
}
}
+ /**
+ * A predicate used to start an animation then a given value is less than a threshold
+ */
public class LeftwardStartPredicate extends StartPredicate {
+
LeftwardStartPredicate(float thresholdValue) {
super(thresholdValue);
}
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java
index 186d532..0bceb18 100644
--- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java
+++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/OverScrollViewPager.java
@@ -14,6 +14,7 @@
import agency.tango.materialintroscreen.listeners.IFinishListener;
public class OverScrollViewPager extends RelativeLayout {
+
private SwipeableViewPager swipeableViewPager = null;
private boolean mIsBeingDragged = false;
private float mMotionBeginX = 0;
@@ -41,6 +42,7 @@ public OverScrollViewPager(Context context, AttributeSet attrs, int defStyle) {
mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
}
+ @SuppressWarnings({"PMD.CollapsibleIfStatements"})
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
int action = event.getAction();
@@ -95,10 +97,11 @@ private void moveOverScrollView(float currentX) {
scrollTo((int) -currentX, 0);
positionOffset = calculateOffset();
- swipeableViewPager.onPageScrolled(swipeableViewPager.getAdapter().getLastItemPosition(), positionOffset, 0);
+ swipeableViewPager.onPageScrolled(swipeableViewPager.getAdapter().getLastItemPosition(),
+ positionOffset, 0);
if (shouldFinish()) {
- finishListener.doOnFinish();
+ finishListener.onFinish();
}
}
}
@@ -120,14 +123,17 @@ private void resetOverScrollViewWithAnimation(final float currentX) {
}
private void finishOverScrollViewWithAnimation(float currentX) {
- post(new SmoothScrollRunnable((int) currentX, -getWidth(), 300, new AccelerateInterpolator()));
+ post(new SmoothScrollRunnable((int) currentX, -getWidth(), 300,
+ new AccelerateInterpolator()));
}
+ @SuppressWarnings({"PMD.SimplifyBooleanReturns", "RedundantIfStatement", "PMD.CollapsibleIfStatements"})
private boolean canOverScrollAtEnd() {
SwipeableViewPager viewPager = getOverScrollView();
PagerAdapter adapter = viewPager.getAdapter();
if (null != adapter && adapter.getCount() > 0) {
- if (viewPager.alphaExitTransitionEnabled() && viewPager.getCurrentItem() == adapter.getCount() - 1) {
+ if (viewPager.alphaExitTransitionEnabled()
+ && viewPager.getCurrentItem() == adapter.getCount() - 1) {
return true;
}
return false;
@@ -138,11 +144,12 @@ private boolean canOverScrollAtEnd() {
private SwipeableViewPager createOverScrollView() {
SwipeableViewPager swipeableViewPager = new SwipeableViewPager(getContext(), null);
- swipeableViewPager.setId(R.id.swipeable_view_pager);
+ swipeableViewPager.setId(R.id.mis_swipeable_view_pager);
return swipeableViewPager;
}
final class SmoothScrollRunnable implements Runnable {
+
private final Interpolator interpolator;
private final int scrollToPosition;
private final int scrollFromPosition;
@@ -151,7 +158,8 @@ final class SmoothScrollRunnable implements Runnable {
private long startTime = -1;
private int currentPosition = -1;
- SmoothScrollRunnable(int fromPosition, int toPosition, long duration, Interpolator scrollAnimationInterpolator) {
+ SmoothScrollRunnable(int fromPosition, int toPosition, long duration,
+ Interpolator scrollAnimationInterpolator) {
scrollFromPosition = fromPosition;
scrollToPosition = toPosition;
interpolator = scrollAnimationInterpolator;
diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java
index dc1d9c1..13fa04d 100644
--- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java
+++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/widgets/SwipeableViewPager.java
@@ -7,13 +7,17 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
+import agency.tango.materialintroscreen.ISlideErrorHandler;
import agency.tango.materialintroscreen.adapter.SlidesAdapter;
+@SuppressWarnings("PMD.SingularField")
public class SwipeableViewPager extends CustomViewPager {
+
private float startPos = 0;
private int currentIt;
private boolean swipingAllowed;
private boolean alphaExitTransitionEnabled = false;
+ private ISlideErrorHandler errorHandler;
public SwipeableViewPager(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -53,13 +57,15 @@ public boolean onTouchEvent(final MotionEvent event) {
resolveSwipingRightAllowed();
return super.onTouchEvent(event);
case (MotionEvent.ACTION_MOVE):
- if (!swipingAllowed && startPos - event.getX() > 16) {
+ if (isSwipingNotAllowed(event)) {
+ errorHandler.handleError();
return true;
}
return super.onTouchEvent(event);
case (MotionEvent.ACTION_UP):
- if (!swipingAllowed && startPos - event.getX() > 16) {
+ if (isSwipingNotAllowed(event)) {
smoothScrollTo(getWidth() * currentIt, 0);
+ errorHandler.handleError();
return true;
}
startPos = 0;
@@ -79,8 +85,11 @@ public boolean executeKeyEvent(KeyEvent event) {
return false;
}
- public void moveToNextPage()
- {
+ public void registerSlideErrorHandler(ISlideErrorHandler handler) {
+ errorHandler = handler;
+ }
+
+ public void moveToNextPage() {
setCurrentItem(getCurrentItem() + 1, true);
}
@@ -104,6 +113,10 @@ public boolean alphaExitTransitionEnabled() {
return alphaExitTransitionEnabled && swipingAllowed;
}
+ private boolean isSwipingNotAllowed(MotionEvent event) {
+ return !swipingAllowed && startPos - event.getX() > 16;
+ }
+
private void resolveSwipingRightAllowed() {
if (getAdapter().shouldLockSlide(getCurrentItem())) {
setSwipingRightAllowed(false);
diff --git a/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java b/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java
index 5164dad..6ad12d9 100644
--- a/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java
+++ b/material-intro-screen/src/main/java/android/support/v4/view/CustomViewPager.java
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2011 The Android Open Source Project
+ * Modifications Copyright 2017 Tango Agency
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,9 +71,9 @@
* through pages of data. You supply an implementation of a
* {@link PagerAdapter} to generate the pages that the view shows.
*
- * ViewPager is most often used in conjunction with {@link android.app.Fragment},
+ *
CustomViewPager is most often used in conjunction with {@link android.app.Fragment},
* which is a convenient way to supply and manage the lifecycle of each page.
- * There are standard adapters implemented for using fragments with the ViewPager,
+ * There are standard adapters implemented for using fragments with the CustomViewPager,
* which cover the most common use cases. These are
* {@link android.support.v4.app.FragmentPagerAdapter} and
* {@link android.support.v4.app.FragmentStatePagerAdapter}; each of these
@@ -84,7 +85,7 @@
* its {@code android:layout_gravity} attribute. For example:
*
*
- * <android.support.v4.view.ViewPager
+ * <android.support.v4.view.CustomViewPager
* android:layout_width="match_parent"
* android:layout_height="match_parent">
*
@@ -93,21 +94,24 @@
* android:layout_height="wrap_content"
* android:layout_gravity="top" />
*
- * </android.support.v4.view.ViewPager>
+ * </android.support.v4.view.CustomViewPager>
*
*
- * For more information about how to use ViewPager, read For more information about how to use CustomViewPager, read Creating Swipe Views with
* Tabs.
*
- * Below is a more complicated example of ViewPager, using it in conjunction
+ *
Below is a more complicated example of CustomViewPager, using it in conjunction
* with {@link android.app.ActionBar} tabs. You can find other examples of using
- * ViewPager in the API 4+ Support Demos and API 13+ Support Demos sample code.
+ * CustomViewPager in the API 4+ Support Demos and API 13+ Support Demos sample code.
*
* {@sample frameworks/support/samples/Support13Demos/src/com/example/android/supportv13/app/ActionBarTabsPager.java
- * complete}
+ * complete}
*/
+
+@SuppressWarnings("PMD")
public class CustomViewPager extends ViewGroup {
+
private static final String TAG = "CustomViewPager";
private static final boolean DEBUG = false;
@@ -121,7 +125,7 @@ public class CustomViewPager extends ViewGroup {
private static final int MIN_FLING_VELOCITY = 400; // dips
- private static final int[] LAYOUT_ATTRS = new int[] {
+ private static final int[] LAYOUT_ATTRS = new int[]{
android.R.attr.layout_gravity
};
@@ -131,21 +135,14 @@ public class CustomViewPager extends ViewGroup {
*/
private int mExpectedAdapterCount;
- static class ItemInfo {
- Object object;
- int position;
- boolean scrolling;
- float widthFactor;
- float offset;
- }
-
- private static final Comparator COMPARATOR = new Comparator(){
+ private static final Comparator COMPARATOR = new Comparator() {
@Override
public int compare(ItemInfo lhs, ItemInfo rhs) {
return lhs.position - rhs.position;
}
};
+ @SuppressWarnings("PMD.AvoidReassigningParameters")
private static final Interpolator sInterpolator = new Interpolator() {
@Override
public float getInterpolation(float t) {
@@ -181,8 +178,6 @@ public float getInterpolation(float t) {
private float mFirstOffset = -Float.MAX_VALUE;
private float mLastOffset = Float.MAX_VALUE;
- private int mChildWidthMeasureSpec;
- private int mChildHeightMeasureSpec;
private boolean mInLayout;
private boolean mScrollingCacheEnabled;
@@ -234,7 +229,6 @@ public float getInterpolation(float t) {
private EdgeEffectCompat mRightEdge;
private boolean mFirstLayout = true;
- private boolean mNeedCalculatePageOffsets = false;
private boolean mCalledSuper;
private int mDecorChildCount;
@@ -287,9 +281,11 @@ public interface OnPageChangeListener {
* This method will be invoked when the current page is scrolled, either as part
* of a programmatically initiated smooth scroll or a user initiated touch scroll.
*
- * @param position Position index of the first page currently being displayed.
- * Page position+1 will be visible if positionOffset is nonzero.
- * @param positionOffset Value from [0, 1) indicating the offset from the page at position.
+ * @param position Position index of the first page currently being displayed.
+ * Page position+1 will be visible if positionOffset is
+ * nonzero.
+ * @param positionOffset Value from [0, 1) indicating the offset from the page at
+ * position.
* @param positionOffsetPixels Value in pixels indicating the offset from position.
*/
void onPageScrolled(int position, float positionOffset, int positionOffsetPixels);
@@ -321,6 +317,7 @@ public interface OnPageChangeListener {
* every method of {@link OnPageChangeListener}.
*/
public static class SimpleOnPageChangeListener implements OnPageChangeListener {
+
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
// This space for rent
@@ -347,10 +344,11 @@ public void onPageScrollStateChanged(int state) {
* be ignored.
*/
public interface PageTransformer {
+
/**
* Apply a property transformation to the given page.
*
- * @param page Apply the transformation to this page
+ * @param page Apply the transformation to this page
* @param position Position of page relative to the current front-and-center
* position of the pager. 0 is front and center. 1 is one full
* page position to the right, and -1 is one page position to the left.
@@ -362,6 +360,7 @@ public interface PageTransformer {
* Callback interface for responding to adapter changes.
*/
public interface OnAdapterChangeListener {
+
/**
* Called when the adapter for the given view pager has changed.
*
@@ -370,7 +369,7 @@ public interface OnAdapterChangeListener {
* @param newAdapter the newly set adapter
*/
void onAdapterChanged(@NonNull CustomViewPager viewPager,
- @Nullable PagerAdapter oldAdapter, @Nullable PagerAdapter newAdapter);
+ @Nullable PagerAdapter oldAdapter, @Nullable PagerAdapter newAdapter);
}
/**
@@ -387,6 +386,7 @@ void onAdapterChanged(@NonNull CustomViewPager viewPager,
@Target(ElementType.TYPE)
@Inherited
public @interface DecorView {
+
}
public CustomViewPager(Context context) {
@@ -432,7 +432,7 @@ void initViewPager() {
@Override
public WindowInsetsCompat onApplyWindowInsets(final View v,
- final WindowInsetsCompat originalInsets) {
+ final WindowInsetsCompat originalInsets) {
// First let the ViewPager itself try and consume them...
final WindowInsetsCompat applied =
ViewCompat.onApplyWindowInsets(v, originalInsets);
@@ -616,7 +616,7 @@ public void setCurrentItem(int item) {
/**
* Set the currently selected page.
*
- * @param item Item index to select
+ * @param item Item index to select
* @param smoothScroll True to smoothly scroll to the new item, false to transition immediately
*/
public void setCurrentItem(int item, boolean smoothScroll) {
@@ -673,7 +673,7 @@ void setCurrentItemInternal(int item, boolean smoothScroll, boolean always, int
}
private void scrollToItem(int item, boolean smoothScroll, int velocity,
- boolean dispatchSelected) {
+ boolean dispatchSelected) {
final ItemInfo curInfo = infoForPosition(item);
int destX = 0;
if (curInfo != null) {
@@ -701,7 +701,6 @@ private void scrollToItem(int item, boolean smoothScroll, int velocity,
* scrolled. See {@link OnPageChangeListener}.
*
* @param listener Listener to set
- *
* @deprecated Use {@link #addOnPageChangeListener(OnPageChangeListener)}
* and {@link #removeOnPageChangeListener(OnPageChangeListener)} instead.
*/
@@ -754,11 +753,12 @@ public void clearOnPageChangeListeners() {
* transformations to each page, overriding the default sliding look and feel.
*
* Note: Prior to Android 3.0 the property animation APIs did not exist.
- * As a result, setting a PageTransformer prior to Android 3.0 (API 11) will have no effect.
+ * As a result, setting a PageTransformer prior to Android 3.0 (API 11) will have no
+ * effect.
*
* @param reverseDrawingOrder true if the supplied PageTransformer requires page views
* to be drawn from last to first instead of first to last.
- * @param transformer PageTransformer that will modify each page's animation properties
+ * @param transformer PageTransformer that will modify each page's animation properties
*/
public void setPageTransformer(boolean reverseDrawingOrder, PageTransformer transformer) {
if (Build.VERSION.SDK_INT >= 11) {
@@ -771,7 +771,9 @@ public void setPageTransformer(boolean reverseDrawingOrder, PageTransformer tran
} else {
mDrawingOrder = DRAW_ORDER_DEFAULT;
}
- if (needsPopulate) populate();
+ if (needsPopulate) {
+ populate();
+ }
}
}
@@ -780,7 +782,7 @@ void setChildrenDrawingOrderEnabledCompat(boolean enable) {
if (mSetChildrenDrawingOrderEnabled == null) {
try {
mSetChildrenDrawingOrderEnabled = ViewGroup.class.getDeclaredMethod(
- "setChildrenDrawingOrderEnabled", new Class[] { Boolean.TYPE });
+ "setChildrenDrawingOrderEnabled", new Class[]{Boolean.TYPE});
} catch (NoSuchMethodException e) {
Log.e(TAG, "Can't find setChildrenDrawingOrderEnabled", e);
}
@@ -887,7 +889,9 @@ public int getPageMargin() {
*/
public void setPageMarginDrawable(Drawable d) {
mMarginDrawable = d;
- if (d != null) refreshDrawableState();
+ if (d != null) {
+ refreshDrawableState();
+ }
setWillNotDraw(d == null);
invalidate();
}
@@ -938,8 +942,8 @@ public void smoothScrollTo(int x, int y) {
/**
* Like {@link View#scrollBy}, but scroll smoothly instead of immediately.
*
- * @param x the number of pixels to scroll by on the X axis
- * @param y the number of pixels to scroll by on the Y axis
+ * @param x the number of pixels to scroll by on the X axis
+ * @param y the number of pixels to scroll by on the Y axis
* @param velocity the velocity associated with a fling, if applicable. (0 otherwise)
*/
void smoothScrollTo(int x, int y, int velocity) {
@@ -1105,7 +1109,9 @@ void populate(int newCurrentItem) {
// fling to a new position until we have finished the scroll to
// that position, avoiding glitches from happening at that point.
if (mPopulatePending) {
- if (DEBUG) Log.i(TAG, "populate is pending, skipping for now...");
+ if (DEBUG) {
+ Log.i(TAG, "populate is pending, skipping for now...");
+ }
sortChildDrawingOrder();
return;
}
@@ -1145,7 +1151,9 @@ void populate(int newCurrentItem) {
for (curIndex = 0; curIndex < mItems.size(); curIndex++) {
final ItemInfo ii = mItems.get(curIndex);
if (ii.position >= mCurItem) {
- if (ii.position == mCurItem) curItem = ii;
+ if (ii.position == mCurItem) {
+ curItem = ii;
+ }
break;
}
}
@@ -1303,7 +1311,7 @@ private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCu
ItemInfo ii = null;
float offset = oldCurInfo.offset + oldCurInfo.widthFactor + marginOffset;
for (int pos = oldCurPosition + 1;
- pos <= curItem.position && itemIndex < mItems.size(); pos++) {
+ pos <= curItem.position && itemIndex < mItems.size(); pos++) {
ii = mItems.get(itemIndex);
while (pos > ii.position && itemIndex < mItems.size() - 1) {
itemIndex++;
@@ -1323,7 +1331,7 @@ private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCu
ItemInfo ii = null;
float offset = oldCurInfo.offset;
for (int pos = oldCurPosition - 1;
- pos >= curItem.position && itemIndex >= 0; pos--) {
+ pos >= curItem.position && itemIndex >= 0; pos--) {
ii = mItems.get(itemIndex);
while (pos < ii.position && itemIndex > 0) {
itemIndex--;
@@ -1356,7 +1364,9 @@ private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCu
}
offset -= ii.widthFactor + marginOffset;
ii.offset = offset;
- if (ii.position == 0) mFirstOffset = offset;
+ if (ii.position == 0) {
+ mFirstOffset = offset;
+ }
}
offset = curItem.offset + curItem.widthFactor + marginOffset;
pos = curItem.position + 1;
@@ -1373,7 +1383,6 @@ private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCu
offset += ii.widthFactor + marginOffset;
}
- mNeedCalculatePageOffsets = false;
}
/**
@@ -1383,6 +1392,7 @@ private void calculatePageOffsets(ItemInfo curItem, int curIndex, ItemInfo oldCu
* contains that state.
*/
public static class SavedState extends AbsSavedState {
+
int position;
Parcelable adapterState;
ClassLoader loader;
@@ -1411,6 +1421,7 @@ public String toString() {
public SavedState createFromParcel(Parcel in, ClassLoader loader) {
return new SavedState(in, loader);
}
+
@Override
public SavedState[] newArray(int size) {
return new SavedState[size];
@@ -1606,8 +1617,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
}
}
- mChildWidthMeasureSpec = MeasureSpec.makeMeasureSpec(childWidthSize, MeasureSpec.EXACTLY);
- mChildHeightMeasureSpec = MeasureSpec.makeMeasureSpec(childHeightSize, MeasureSpec.EXACTLY);
+ int childWidthMeasureSpec = MeasureSpec
+ .makeMeasureSpec(childWidthSize, MeasureSpec.EXACTLY);
+ int childHeightMeasureSpec = MeasureSpec
+ .makeMeasureSpec(childHeightSize, MeasureSpec.EXACTLY);
// Make sure we have created all fragments that we need to have shown.
mInLayout = true;
@@ -1620,14 +1633,14 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final View child = getChildAt(i);
if (child.getVisibility() != GONE) {
if (DEBUG) {
- Log.v(TAG, "Measuring #" + i + " " + child + ": " + mChildWidthMeasureSpec);
+ Log.v(TAG, "Measuring #" + i + " " + child + ": " + childWidthMeasureSpec);
}
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
if (lp == null || !lp.isDecor) {
final int widthSpec = MeasureSpec.makeMeasureSpec(
(int) (childWidthSize * lp.widthFactor), MeasureSpec.EXACTLY);
- child.measure(widthSpec, mChildHeightMeasureSpec);
+ child.measure(widthSpec, childHeightMeasureSpec);
}
}
}
@@ -1846,9 +1859,9 @@ private boolean pageScrolled(int xpos) {
* (e.g. super.onPageScrolled(position, offset, offsetPixels)) before onPageScrolled
* returns.
*
- * @param position Position index of the first page currently being displayed.
- * Page position+1 will be visible if positionOffset is nonzero.
- * @param offset Value from [0, 1) indicating the offset from the page at position.
+ * @param position Position index of the first page currently being displayed.
+ * Page position+1 will be visible if positionOffset is nonzero.
+ * @param offset Value from [0, 1) indicating the offset from the page at position.
* @param offsetPixels Value in pixels indicating the offset from position.
*/
@CallSuper
@@ -1863,7 +1876,9 @@ protected void onPageScrolled(int position, float offset, int offsetPixels) {
for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i);
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (!lp.isDecor) continue;
+ if (!lp.isDecor) {
+ continue;
+ }
final int hgrav = lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK;
int childLeft = 0;
@@ -1902,7 +1917,9 @@ protected void onPageScrolled(int position, float offset, int offsetPixels) {
final View child = getChildAt(i);
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
- if (lp.isDecor) continue;
+ if (lp.isDecor) {
+ continue;
+ }
final float transformPos = (float) (child.getLeft() - scrollX) / getClientWidth();
mPageTransformer.transformPage(child, transformPos);
}
@@ -2025,7 +2042,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
// Always take care of the touch gesture being complete.
if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
// Release the drag.
- if (DEBUG) Log.v(TAG, "Intercept done!");
+ if (DEBUG) {
+ Log.v(TAG, "Intercept done!");
+ }
resetTouch();
return false;
}
@@ -2034,11 +2053,15 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
// are dragging.
if (action != MotionEvent.ACTION_DOWN) {
if (mIsBeingDragged) {
- if (DEBUG) Log.v(TAG, "Intercept returning true!");
+ if (DEBUG) {
+ Log.v(TAG, "Intercept returning true!");
+ }
return true;
}
if (mIsUnableToDrag) {
- if (DEBUG) Log.v(TAG, "Intercept returning false!");
+ if (DEBUG) {
+ Log.v(TAG, "Intercept returning false!");
+ }
return false;
}
}
@@ -2066,7 +2089,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
final float xDiff = Math.abs(dx);
final float y = ev.getY(pointerIndex);
final float yDiff = Math.abs(y - mInitialMotionY);
- if (DEBUG) Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
+ if (DEBUG) {
+ Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
+ }
if (dx != 0 && !isGutterDrag(mLastMotionX, dx)
&& canScroll(this, false, (int) dx, (int) x, (int) y)) {
@@ -2077,7 +2102,9 @@ && canScroll(this, false, (int) dx, (int) x, (int) y)) {
return false;
}
if (xDiff > mTouchSlop && xDiff * 0.5f > yDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
+ if (DEBUG) {
+ Log.v(TAG, "Starting drag!");
+ }
mIsBeingDragged = true;
requestParentDisallowInterceptTouchEvent(true);
setScrollState(SCROLL_STATE_DRAGGING);
@@ -2090,7 +2117,9 @@ && canScroll(this, false, (int) dx, (int) x, (int) y)) {
// direction to be counted as a drag... abort
// any attempt to drag horizontally, to work correctly
// with children that have scrolling containers.
- if (DEBUG) Log.v(TAG, "Starting unable to drag!");
+ if (DEBUG) {
+ Log.v(TAG, "Starting unable to drag!");
+ }
mIsUnableToDrag = true;
}
if (mIsBeingDragged) {
@@ -2210,7 +2239,9 @@ public boolean onTouchEvent(MotionEvent ev) {
Log.v(TAG, "Moved x to " + x + "," + y + " diff=" + xDiff + "," + yDiff);
}
if (xDiff > mTouchSlop && xDiff > yDiff) {
- if (DEBUG) Log.v(TAG, "Starting drag!");
+ if (DEBUG) {
+ Log.v(TAG, "Starting drag!");
+ }
mIsBeingDragged = true;
requestParentDisallowInterceptTouchEvent(true);
mLastMotionX = x - mInitialMotionX > 0 ? mInitialMotionX + mTouchSlop :
@@ -2346,7 +2377,7 @@ private boolean performDrag(float x) {
/**
* @return Info about the page at the current scroll position.
- * This can be synthetic for a missing middle page; the 'object' field can be null.
+ * This can be synthetic for a missing middle page; the 'object' field can be null.
*/
private ItemInfo infoForCurrentScrollPosition() {
final int width = getClientWidth();
@@ -2509,7 +2540,6 @@ protected void onDraw(Canvas canvas) {
* is already in progress, this method will return false.
*
* @return true if the fake drag began successfully, false if it could not be started.
- *
* @see #fakeDragBy(float)
* @see #endFakeDrag()
*/
@@ -2621,7 +2651,6 @@ public void fakeDragBy(float xOffset) {
* Returns true if a fake drag is in progress.
*
* @return true if currently in a fake drag, false otherwise.
- *
* @see #beginFakeDrag()
* @see #fakeDragBy(float)
* @see #endFakeDrag()
@@ -2675,7 +2704,7 @@ private void setScrollingCacheEnabled(boolean enabled) {
*
* @param direction Negative to check scrolling left, positive to check scrolling right.
* @return Whether this ViewPager can be scrolled in the specified direction. It will always
- * return false if the specified direction is 0.
+ * return false if the specified direction is 0.
*/
public boolean canScrollHorizontally(int direction) {
if (mAdapter == null) {
@@ -2696,12 +2725,12 @@ public boolean canScrollHorizontally(int direction) {
/**
* Tests scrollability within child views of v given a delta of dx.
*
- * @param v View to test for horizontal scrollability
+ * @param v View to test for horizontal scrollability
* @param checkV Whether the view v passed should itself be checked for scrollability (true),
* or just its children (false).
- * @param dx Delta scrolled in pixels
- * @param x X coordinate of the active touch point
- * @param y Y coordinate of the active touch point
+ * @param dx Delta scrolled in pixels
+ * @param x X coordinate of the active touch point
+ * @param y Y coordinate of the active touch point
* @return true if child views of v can be scrolled by delta of dx.
*/
protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
@@ -2781,7 +2810,7 @@ public boolean arrowScroll(int direction) {
} else if (currentFocused != null) {
boolean isChild = false;
for (ViewParent parent = currentFocused.getParent(); parent instanceof ViewGroup;
- parent = parent.getParent()) {
+ parent = parent.getParent()) {
if (parent == this) {
isChild = true;
break;
@@ -2792,7 +2821,7 @@ public boolean arrowScroll(int direction) {
final StringBuilder sb = new StringBuilder();
sb.append(currentFocused.getClass().getSimpleName());
for (ViewParent parent = currentFocused.getParent(); parent instanceof ViewGroup;
- parent = parent.getParent()) {
+ parent = parent.getParent()) {
sb.append(" => ").append(parent.getClass().getSimpleName());
}
Log.e(TAG, "arrowScroll tried to find focus based on non-child "
@@ -2948,7 +2977,7 @@ public void addTouchables(ArrayList views) {
*/
@Override
protected boolean onRequestFocusInDescendants(int direction,
- Rect previouslyFocusedRect) {
+ Rect previouslyFocusedRect) {
int index;
int increment;
int end;
@@ -3060,13 +3089,15 @@ public boolean performAccessibilityAction(View host, int action, Bundle args) {
setCurrentItem(mCurItem + 1);
return true;
}
- } return false;
+ }
+ return false;
case AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD: {
if (canScrollHorizontally(-1)) {
setCurrentItem(mCurItem - 1);
return true;
}
- } return false;
+ }
+ return false;
}
return false;
}
@@ -3077,10 +3108,12 @@ private boolean canScroll() {
}
private class PagerObserver extends DataSetObserver {
+
@Override
public void onChanged() {
dataSetChanged();
}
+
@Override
public void onInvalidated() {
dataSetChanged();
@@ -3092,6 +3125,7 @@ public void onInvalidated() {
* ViewPager.
*/
public static class LayoutParams extends ViewGroup.LayoutParams {
+
/**
* true if this view is a decoration on the pager itself and not
* a view supplied by the adapter.
@@ -3140,6 +3174,7 @@ public LayoutParams(Context context, AttributeSet attrs) {
}
static class ViewPositionComparator implements Comparator {
+
@Override
public int compare(View lhs, View rhs) {
final LayoutParams llp = (LayoutParams) lhs.getLayoutParams();
@@ -3150,4 +3185,13 @@ public int compare(View lhs, View rhs) {
return llp.position - rlp.position;
}
}
+
+ static class ItemInfo {
+
+ Object object;
+ int position;
+ boolean scrolling;
+ float widthFactor;
+ float offset;
+ }
}
\ No newline at end of file
diff --git a/material-intro-screen/src/main/res/anim/cycle_2.xml b/material-intro-screen/src/main/res/anim/mis_cycle_2.xml
similarity index 100%
rename from material-intro-screen/src/main/res/anim/cycle_2.xml
rename to material-intro-screen/src/main/res/anim/mis_cycle_2.xml
diff --git a/material-intro-screen/src/main/res/anim/fade_in.xml b/material-intro-screen/src/main/res/anim/mis_fade_in.xml
similarity index 100%
rename from material-intro-screen/src/main/res/anim/fade_in.xml
rename to material-intro-screen/src/main/res/anim/mis_fade_in.xml
diff --git a/material-intro-screen/src/main/res/anim/fade_out.xml b/material-intro-screen/src/main/res/anim/mis_fade_out.xml
similarity index 100%
rename from material-intro-screen/src/main/res/anim/fade_out.xml
rename to material-intro-screen/src/main/res/anim/mis_fade_out.xml
diff --git a/material-intro-screen/src/main/res/anim/shake_it.xml b/material-intro-screen/src/main/res/anim/mis_shake_it.xml
similarity index 80%
rename from material-intro-screen/src/main/res/anim/shake_it.xml
rename to material-intro-screen/src/main/res/anim/mis_shake_it.xml
index 12fc9f9..c4a07f5 100644
--- a/material-intro-screen/src/main/res/anim/shake_it.xml
+++ b/material-intro-screen/src/main/res/anim/mis_shake_it.xml
@@ -2,5 +2,5 @@
\ No newline at end of file
diff --git a/material-intro-screen/src/main/res/drawable-v21/button_background.xml b/material-intro-screen/src/main/res/drawable-v21/mis_button_background.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable-v21/button_background.xml
rename to material-intro-screen/src/main/res/drawable-v21/mis_button_background.xml
diff --git a/material-intro-screen/src/main/res/drawable/button_background.xml b/material-intro-screen/src/main/res/drawable/mis_button_background.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable/button_background.xml
rename to material-intro-screen/src/main/res/drawable/mis_button_background.xml
diff --git a/material-intro-screen/src/main/res/drawable/ic_finish.xml b/material-intro-screen/src/main/res/drawable/mis_ic_finish.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable/ic_finish.xml
rename to material-intro-screen/src/main/res/drawable/mis_ic_finish.xml
diff --git a/material-intro-screen/src/main/res/drawable/ic_next.xml b/material-intro-screen/src/main/res/drawable/mis_ic_next.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable/ic_next.xml
rename to material-intro-screen/src/main/res/drawable/mis_ic_next.xml
diff --git a/material-intro-screen/src/main/res/drawable/ic_previous.xml b/material-intro-screen/src/main/res/drawable/mis_ic_previous.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable/ic_previous.xml
rename to material-intro-screen/src/main/res/drawable/mis_ic_previous.xml
diff --git a/material-intro-screen/src/main/res/drawable/ic_skip.xml b/material-intro-screen/src/main/res/drawable/mis_ic_skip.xml
similarity index 100%
rename from material-intro-screen/src/main/res/drawable/ic_skip.xml
rename to material-intro-screen/src/main/res/drawable/mis_ic_skip.xml
diff --git a/material-intro-screen/src/main/res/layout-land/fragment_slide.xml b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml
similarity index 94%
rename from material-intro-screen/src/main/res/layout-land/fragment_slide.xml
rename to material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml
index 98ee8d2..4e66dc0 100644
--- a/material-intro-screen/src/main/res/layout-land/fragment_slide.xml
+++ b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml
@@ -16,13 +16,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_marginRight="16dp"
android:layout_marginBottom="128dp"
- android:paddingTop="32dp"
+ android:layout_marginRight="16dp"
android:layout_weight="1"
android:adjustViewBounds="true"
+ android:paddingTop="32dp"
android:visibility="gone"
- app:layout_parallaxFactor="0.6"
+ app:mis_layout_parallaxFactor="0.6"
tools:src="@android:drawable/arrow_down_float"
tools:visibility="visible" />
@@ -39,7 +39,6 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
- app:layout_parallaxFactor="0.5"
tools:text="Lorem ipsum" />