Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #124 & Possible fix #130 #131

Merged
merged 3 commits into from
Sep 11, 2016
Merged

Fix #124 & Possible fix #130 #131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0278822
Fix #124
daniel-stoneuk Sep 10, 2016
a141dbc
Possible fix #130
daniel-stoneuk Sep 10, 2016
bf8115c
Fix #132
daniel-stoneuk Sep 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,15 @@ private void smoothScrollPagerTo(final int position) {
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
pager.endFakeDrag();
if (pager.isFakeDragging())
pager.endFakeDrag();
pager.setCurrentItem(position);
}

@Override
public void onAnimationCancel(Animator animation) {
pager.endFakeDrag();
if (pager.isFakeDragging())
pager.endFakeDrag();
}
});
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
Expand Down Expand Up @@ -1059,7 +1061,7 @@ public boolean isButtonBackVisible() {

@SuppressWarnings("unused")
public void setButtonBackVisible(boolean visible) {
buttonBack.setVisibility(visible ? View.VISIBLE : View.GONE);
buttonBack.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
}

@SuppressWarnings("unused")
Expand All @@ -1069,7 +1071,7 @@ public boolean isButtonNextVisible() {

@SuppressWarnings("unused")
public void setButtonNextVisible(boolean visible) {
buttonNext.setVisibility(visible ? View.VISIBLE : View.GONE);
buttonNext.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
}

@SuppressWarnings("unused")
Expand Down