diff --git a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/CanteenIntroActivity.java b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/CanteenIntroActivity.java index 3a90ae1..6ef48f9 100644 --- a/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/CanteenIntroActivity.java +++ b/app/src/main/java/com/heinrichreimersoftware/materialintro/demo/CanteenIntroActivity.java @@ -24,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) { label.setSpan(labelSpan, 0, label.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); setButtonCtaLabel(label); - setPageScrollDuration(800); + setPageScrollDuration(500); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { setPagerInterpolator(android.R.interpolator.fast_out_slow_in); } diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java index 44295eb..c8f7172 100644 --- a/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java +++ b/library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java @@ -287,6 +287,9 @@ public void onClick(View v) { } private void smoothScrollPagerTo(final int position) { + if (pager.isFakeDragging()) + return; + ValueAnimator animator = ValueAnimator.ofFloat(pager.getCurrentItem(), position); animator.addListener(new AnimatorListenerAdapter() { @Override @@ -329,11 +332,17 @@ else if (position < currentPosition && Math.ceil(position) != currentPosition && } }); + int distance = Math.abs(position - pager.getCurrentItem()); + animator.setInterpolator(pageScrollInterpolator); - animator.setDuration(pageScrollDuration); + animator.setDuration(calculateScrollDuration(distance)); animator.start(); } + private long calculateScrollDuration(int distance) { + return Math.round(pageScrollDuration * (distance + Math.sqrt(distance)) / 2); + } + public void nextSlide() { int currentItem = pager.getCurrentItem(); if (currentItem > adapter.getCount() - 1) finishIfNeeded(); @@ -343,16 +352,15 @@ public void nextSlide() { } else { AnimUtils.applyShakeAnimation(this, buttonNext); - } } - private boolean nextSlideAuto() { + private int nextSlideAuto() { int endPosition = pager.getCurrentItem(); int count = getCount(); if (count == 1) { - return false; + return 0; } else if (pager.getCurrentItem() >= count - 1) { while (endPosition >= 0 && canGoBackward(endPosition, true)) { @@ -365,12 +373,16 @@ else if (canGoForward(endPosition, true)) { endPosition++; } + int distance = Math.abs(endPosition - pager.getCurrentItem()); + if (endPosition == pager.getCurrentItem()) - return false; + return 0; smoothScrollPagerTo(endPosition); - return autoplayCounter != 0; + if (autoplayCounter == 0) + return 0; + return distance; } @@ -793,8 +805,9 @@ public void run() { cancelAutoplay(); return; } - if (nextSlideAuto()) - autoplayHandler.postDelayed(autoplayCallback, autoplayDelay); + int distance = nextSlideAuto(); + if (distance != 0) + autoplayHandler.postDelayed(autoplayCallback, autoplayDelay + calculateScrollDuration(distance)); } }; autoplayHandler.postDelayed(autoplayCallback, autoplayDelay);