Skip to content

Fix the rebound when swipe down slowly #68

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
cashow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the rebound when swipe down slowly #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion pulltorefresh/res/layout/pull_to_refresh_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="30dip"
android:layout_marginRight="20dip"
android:visibility="gone"
android:layout_gravity="center"
android:gravity="center"
android:src="@drawable/ic_pulltorefresh_arrow"
Expand Down
25 changes: 9 additions & 16 deletions pulltorefresh/src/com/markupartist/android/widget/PullToRefreshListView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ public void setLastUpdated(CharSequence lastUpdated) {

@Override
public boolean onTouchEvent(MotionEvent event) {
final int y = (int) event.getY();
mBounceHack = false;

switch (event.getAction()) {
case MotionEvent.ACTION_UP:
mLastMotionY=0;
if (!isVerticalScrollBarEnabled()) {
setVerticalScrollBarEnabled(true);
}
Expand All @@ -186,9 +186,6 @@ public boolean onTouchEvent(MotionEvent event) {
}
}
break;
case MotionEvent.ACTION_DOWN:
mLastMotionY = y;
break;
case MotionEvent.ACTION_MOVE:
applyHeaderPadding(event);
break;
Expand All @@ -207,17 +204,19 @@ private void applyHeaderPadding(MotionEvent ev) {
}

int historicalY = (int) ev.getHistoricalY(p);
if(mLastMotionY==0){
mLastMotionY = historicalY;
}

// Calculate the padding to apply, we divide by 1.7 to
// simulate a more resistant effect during pull.
int topPadding = (int) (((historicalY - mLastMotionY)
- mRefreshViewHeight) / 1.7);

int topPadding = mRefreshView.getPaddingTop() + (int)((historicalY - mLastMotionY)/1.7);
mRefreshView.setPadding(
mRefreshView.getPaddingLeft(),
topPadding,
mRefreshView.getPaddingRight(),
mRefreshView.getPaddingBottom());
mLastMotionY = historicalY;
}
}
}
Expand Down Expand Up @@ -249,7 +248,6 @@ private void resetHeader() {
// Clear the full rotation animation
mRefreshViewImage.clearAnimation();
// Hide progress bar and arrow.
mRefreshViewImage.setVisibility(View.GONE);
mRefreshViewProgress.setVisibility(View.GONE);
}
}
Expand Down Expand Up @@ -282,16 +280,12 @@ public void onScroll(AbsListView view, int firstVisibleItem,
if (mCurrentScrollState == SCROLL_STATE_TOUCH_SCROLL
&& mRefreshState != REFRESHING) {
if (firstVisibleItem == 0) {
mRefreshViewImage.setVisibility(View.VISIBLE);
if ((mRefreshView.getBottom() >= mRefreshViewHeight + 20
|| mRefreshView.getTop() >= 0)
&& mRefreshState != RELEASE_TO_REFRESH) {
if (mRefreshState == PULL_TO_REFRESH && mRefreshView.getBottom() >= mRefreshViewHeight) {
mRefreshViewText.setText(R.string.pull_to_refresh_release_label);
mRefreshViewImage.clearAnimation();
mRefreshViewImage.startAnimation(mFlipAnimation);
mRefreshState = RELEASE_TO_REFRESH;
} else if (mRefreshView.getBottom() < mRefreshViewHeight + 20
&& mRefreshState != PULL_TO_REFRESH) {
} else if ((mRefreshState == TAP_TO_REFRESH)||(mRefreshState == RELEASE_TO_REFRESH && mRefreshView.getBottom() <= mRefreshViewHeight)) {
mRefreshViewText.setText(R.string.pull_to_refresh_pull_label);
if (mRefreshState != TAP_TO_REFRESH) {
mRefreshViewImage.clearAnimation();
Expand All @@ -300,7 +294,6 @@ public void onScroll(AbsListView view, int firstVisibleItem,
mRefreshState = PULL_TO_REFRESH;
}
} else {
mRefreshViewImage.setVisibility(View.GONE);
resetHeader();
}
} else if (mCurrentScrollState == SCROLL_STATE_FLING
Expand Down Expand Up @@ -334,13 +327,13 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
public void prepareForRefresh() {
resetHeaderPadding();

mRefreshViewImage.setVisibility(View.GONE);
// We need this hack, otherwise it will keep the previous drawable.
mRefreshViewImage.setImageDrawable(null);
mRefreshViewProgress.setVisibility(View.VISIBLE);

// Set refresh view text to the refreshing label
mRefreshViewText.setText(R.string.pull_to_refresh_refreshing_label);
mRefreshViewLastUpdated.setVisibility(View.GONE);

mRefreshState = REFRESHING;
}
Expand Down