GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-18 05:01:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: stop fling when it reaches the edge.

Browse Source
This commit is contained in:
cgspine
2019-10-31 16:07:52 +08:00
parent d90fa282df
commit 2190ee26df
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedBottomDelegateLayout.java
+25 -8
View File
@@ -35,6 +35,7 @@ import com.qmuiteam.qmui.util.QMUIViewHelper;
import com.qmuiteam.qmui.util.QMUIViewOffsetHelper;
import androidx.annotation.NonNull;
import androidx.core.view.NestedScrollingChild;
import androidx.core.view.NestedScrollingChild2;
import androidx.core.view.NestedScrollingChildHelper;
import androidx.core.view.NestedScrollingParent2;
@@ -260,7 +261,7 @@ public abstract class QMUIContinuousNestedBottomDelegateLayout extends QMUIFrame
if (getContentHeight() != HEIGHT_IS_ENOUGH_TO_SCROLL) {
return 0;
}
return mHeaderView.getHeight() +
return mHeaderView.getHeight() - getHeaderStickyHeight() +
((IQMUIContinuousNestedBottomView) mContentView).getScrollOffsetRange();
}
@@ -405,9 +406,19 @@ public abstract class QMUIContinuousNestedBottomDelegateLayout extends QMUIFrame
@Override
public void onNestedScroll(View target, int dxConsumed, int dyConsumed, int dxUnconsumed,
int dyUnconsumed, int type) {
int remain = offsetBy(dyUnconsumed);
dispatchNestedScroll(0, dyUnconsumed - remain, 0, remain, null,
type);
if(dyUnconsumed > 0 && getCurrentScroll() >= getScrollOffsetRange()){
// RecyclerView does not stop scroller when over scroll with NestedScrollingParent
if(mContentView instanceof NestedScrollingChild2){
((NestedScrollingChild2) mContentView).stopNestedScroll(type);
}else if(mContentView instanceof NestedScrollingChild){
((NestedScrollingChild) mContentView).stopNestedScroll();
}
((IQMUIContinuousNestedBottomView)mContentView).stopScroll();
}else{
int remain = offsetBy(dyUnconsumed);
dispatchNestedScroll(0, dyUnconsumed - remain, 0, remain, null,
type);
}
}
@Override
@@ -671,11 +682,17 @@ public abstract class QMUIContinuousNestedBottomDelegateLayout extends QMUIFrame
final int y = scroller.getCurrY();
int unconsumedY = y - mLastFlingY;
mLastFlingY = y;
if (!mChildHelper.hasNestedScrollingParent(ViewCompat.TYPE_NON_TOUCH)) {
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL, ViewCompat.TYPE_NON_TOUCH);
IQMUIContinuousNestedBottomView bottomView = (IQMUIContinuousNestedBottomView) mContentView;
boolean canScroll = unconsumedY <= 0 || bottomView.getCurrentScroll() < bottomView.getScrollOffsetRange();
if(canScroll){
if (!mChildHelper.hasNestedScrollingParent(ViewCompat.TYPE_NON_TOUCH)) {
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL, ViewCompat.TYPE_NON_TOUCH);
}
consumeScroll(unconsumedY);
postOnAnimation();
}else{
stop();
}
consumeScroll(unconsumedY);
postOnAnimation();
}
mEatRunOnAnimationRequest = false;
qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedTopAreaBehavior.java
+16 -2
View File
@@ -428,8 +428,21 @@ public class QMUIContinuousNestedTopAreaBehavior extends QMUIViewOffsetBehavior<
int unconsumedY = y - mLastFlingY;
mLastFlingY = y;
if (mCurrentParent != null && mCurrentChild != null) {
scroll(mCurrentParent, mCurrentChild, unconsumedY);
postOnAnimation();
boolean canScroll = true;
if(mCurrentParent instanceof QMUIContinuousNestedScrollLayout){
QMUIContinuousNestedScrollLayout layout = (QMUIContinuousNestedScrollLayout) mCurrentParent;
if(unconsumedY > 0 && layout.getCurrentScroll() >= layout.getScrollRange()){
canScroll = false;
}else if(unconsumedY < 0 && layout.getCurrentScroll() <= 0){
canScroll = false;
}
}
if(canScroll){
scroll(mCurrentParent, mCurrentChild, unconsumedY);
postOnAnimation();
}else{
mOverScroller.abortAnimation();
}
}
}
@@ -437,6 +450,7 @@ public class QMUIContinuousNestedTopAreaBehavior extends QMUIViewOffsetBehavior<
if (mReSchedulePostAnimationCallback) {
internalPostOnAnimation();
} else {
mCurrentParent = null;
mCurrentChild = null;
onFlingOrScrollEnd();
}