Skip to content

Non-visible views and OnScreenSwitchListener #15

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

Open
RedHatter wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Non-visible views and OnScreenSwitchListener #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb1e8d6
Correctly handle non-visible views.
Jul 16, 2014
6af96bb
Modified OnScreenSwitchListener to notify used before as well as afte…
Jul 16, 2014
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
34 changes: 28 additions & 6 deletions src/com/github/ysamlan/horizontalpager/HorizontalPager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ private void init() {
mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
}

public int getVisibleCount () {
int count = 0;
for (int i = 0; i < super.getChildCount(); i++)
if (getChildAt(i).getVisibility() != View.GONE)
count++;

return count;
}

@Override
protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
Expand Down Expand Up @@ -175,7 +184,7 @@ else if (width != mLastSeenLayoutWidth) { // Width has changed
.getDefaultDisplay();
int displayWidth = display.getWidth();

mNextScreen = Math.max(0, Math.min(getCurrentScreen(), getChildCount() - 1));
mNextScreen = Math.max(0, Math.min(getCurrentScreen(), getVisibleCount() - 1));
final int newX = mNextScreen * displayWidth;
final int delta = newX - getScrollX();

Expand Down Expand Up @@ -351,7 +360,7 @@ public boolean onTouchEvent(final MotionEvent ev) {
// Fling hard enough to move left
snapToScreen(mCurrentScreen - 1);
} else if (velocityX < -mDensityAdjustedSnapVelocity
&& mCurrentScreen < getChildCount() - 1) {
&& mCurrentScreen < getVisibleCount() - 1) {
// Fling hard enough to move right
snapToScreen(mCurrentScreen + 1);
} else {
Expand Down Expand Up @@ -382,8 +391,14 @@ public void computeScroll() {
if (mScroller.computeScrollOffset()) {
scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
postInvalidate();

// Notify observer about screen change
if (mOnScreenSwitchListener != null) {
int switchingScreen = Math.max(0, Math.min(mNextScreen, getVisibleCount() - 1));
mOnScreenSwitchListener.onScreenSelected(switchingScreen);
}
} else if (mNextScreen != INVALID_SCREEN) {
mCurrentScreen = Math.max(0, Math.min(mNextScreen, getChildCount() - 1));
mCurrentScreen = Math.max(0, Math.min(mNextScreen, getVisibleCount() - 1));

// Notify observer about screen change
if (mOnScreenSwitchListener != null) {
Expand All @@ -410,7 +425,7 @@ public int getCurrentScreen() {
* @param animate True to smoothly scroll to the screen, false to snap instantly
*/
public void setCurrentScreen(final int currentScreen, final boolean animate) {
mCurrentScreen = Math.max(0, Math.min(currentScreen, getChildCount() - 1));
mCurrentScreen = Math.max(0, Math.min(currentScreen, getVisibleCount() - 1));
if (animate) {
snapToScreen(currentScreen, ANIMATION_SCREEN_SET_DURATION_MILLIS);
} else {
Expand Down Expand Up @@ -443,7 +458,7 @@ private void snapToDestination() {
&& ((screenWidth / FRACTION_OF_SCREEN_WIDTH_FOR_SWIPE) < -deltaX)) {
whichScreen--;
// Check if they want to go to the next screen
} else if ((deltaX > 0) && (mCurrentScreen + 1 != getChildCount())
} else if ((deltaX > 0) && (mCurrentScreen + 1 != getVisibleCount())
&& ((screenWidth / FRACTION_OF_SCREEN_WIDTH_FOR_SWIPE) < deltaX)) {
whichScreen++;
}
Expand Down Expand Up @@ -475,7 +490,7 @@ private void snapToScreen(final int whichScreen, final int duration) {
* RadioGroup used as "tabbed" controls. Also, make the animation take a percentage of our
* normal animation time, depending how far they've already scrolled.
*/
mNextScreen = Math.max(0, Math.min(whichScreen, getChildCount() - 1));
mNextScreen = Math.max(0, Math.min(whichScreen, getVisibleCount() - 1));
final int newX = mNextScreen * getWidth();
final int delta = newX - getScrollX();

Expand All @@ -494,6 +509,13 @@ private void snapToScreen(final int whichScreen, final int duration) {
* Listener for the event that the HorizontalPager switches to a new view.
*/
public static interface OnScreenSwitchListener {
/**
* Notifies listeners about the new screen. Runs before the animation completed.
*
* @param screen The new screen index.
*/
void onScreenSelected(int screen);

/**
* Notifies listeners about the new screen. Runs after the animation completed.
*
Expand Down