add layout QMUIContinuousNestedScrollLayout to support more fetures

Author: cgspine

qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/IQMUIContinuousNestedBottomView.java

@@ -17,9 +17,18 @@
 package com.qmuiteam.qmui.nestedScroll;
 
 public interface IQMUIContinuousNestedBottomView {
+ int HEIGHT_IS_ENOUGH_TO_SCROLL = -1;
  /**
  * consume scroll
  * @param dyUnconsumed the delta value to consume
  */
  void consumeScroll(int dyUnconsumed);
+
+ /**
+ * sometimes the content of BottomView is not enough to scroll,
+ * so BottomView should tell the this info to {@link QMUIContinuousNestedScrollLayout}
+ * @return {@link #HEIGHT_IS_ENOUGH_TO_SCROLL} if can scroll, or content height.
+ */
+ int getContentHeight();
+
 }

qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/IQMUIContinuousNestedTopView.java

@@ -19,8 +19,19 @@
 public interface IQMUIContinuousNestedTopView {
  /**
  * consume scroll
+ *
  * @param dyUnconsumed the delta value to consume
  * @return the remain unconsumed value
  */
  int consumeScroll(int dyUnconsumed);
+
+ int getCurrentScroll();
+
+ int getScrollRange();
+
+ void injectScrollNotifier(OnScrollNotifier notifier);
+
+ interface OnScrollNotifier {
+ void notify(int innerOffset, int innerRange);
+ }
 }

qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedBottomDelegateLayout.java

@@ -48,7 +48,6 @@ public abstract class QMUIContinuousNestedBottomDelegateLayout extends QMUIFrame
  private Rect mTempRect = new Rect();
  private int mNestedOffsetY = 0;
 
-
  public QMUIContinuousNestedBottomDelegateLayout(Context context) {
  this(context, null);
  }
@@ -66,40 +65,78 @@ public QMUIContinuousNestedBottomDelegateLayout(Context context, AttributeSet at
  ViewCompat.setNestedScrollingEnabled(this, true);
  mHeaderView = onCreateHeaderView();
  mContentView = onCreateContentView();
- addView(mHeaderView, getHeaderLayoutParam());
- addView(mContentView, getContentLayoutParam());
+ if (!(mContentView instanceof IQMUIContinuousNestedBottomView)) {
+ throw new IllegalStateException("the view create by onCreateContentView() " +
+ "should implement from IQMUIContinuousNestedBottomView");
+ }
+ addView(mHeaderView, new FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, getHeaderHeightLayoutParam()));
+ addView(mContentView, new FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
  mHeaderViewOffsetHelper = new QMUIViewOffsetHelper(mHeaderView);
  mContentViewOffsetHelper = new QMUIViewOffsetHelper(mContentView);
  mViewFlinger = new ViewFlinger();
  }
 
+ public View getHeaderView() {
+ return mHeaderView;
+ }
+
+ public View getContentView() {
+ return mContentView;
+ }
+
+ @Override
+ public int getContentHeight() {
+ IQMUIContinuousNestedBottomView b = (IQMUIContinuousNestedBottomView) mContentView;
+ int bc = b.getContentHeight();
+ if (bc == IQMUIContinuousNestedBottomView.HEIGHT_IS_ENOUGH_TO_SCROLL || bc > mContentView.getHeight()) {
+ return IQMUIContinuousNestedBottomView.HEIGHT_IS_ENOUGH_TO_SCROLL;
+ }
+ int bottomMargin = getContentBottomMargin();
+ if (bc + mHeaderView.getHeight() + bottomMargin > getHeight()) {
+ return IQMUIContinuousNestedBottomView.HEIGHT_IS_ENOUGH_TO_SCROLL;
+ }
+ return mHeaderView.getHeight() + bc + bottomMargin;
+ }
+
  @NonNull
  protected abstract View onCreateHeaderView();
 
  @NonNull
  protected abstract View onCreateContentView();
 
- protected FrameLayout.LayoutParams getHeaderLayoutParam() {
- return new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ protected int getHeaderStickyHeight() {
+ return 0;
+ }
+
+
+ protected int getHeaderHeightLayoutParam() {
+ return ViewGroup.LayoutParams.WRAP_CONTENT;
  }
 
- protected FrameLayout.LayoutParams getContentLayoutParam() {
- return new FrameLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+ protected int getContentBottomMargin() {
+ return 0;
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+ int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+ mContentView.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(
+ heightSize - getHeaderStickyHeight() - getContentBottomMargin(),
+ MeasureSpec.EXACTLY));
  }
 
  @Override
  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- FrameLayout.LayoutParams headerLp = (LayoutParams) mHeaderView.getLayoutParams();
- mHeaderView.layout(headerLp.leftMargin, headerLp.topMargin,
- headerLp.leftMargin + mHeaderView.getMeasuredWidth(),
- headerLp.topMargin + mHeaderView.getMeasuredHeight());
-
- FrameLayout.LayoutParams contentLp = (LayoutParams) mContentView.getLayoutParams();
- int contentTop = mHeaderView.getBottom() + headerLp.bottomMargin + contentLp.topMargin;
- mContentView.layout(contentLp.leftMargin, contentTop,
- contentLp.leftMargin + mContentView.getMeasuredWidth(),
+ mHeaderView.layout(0, 0, mHeaderView.getMeasuredWidth(),
+ mHeaderView.getMeasuredHeight());
+
+
+ int contentTop = mHeaderView.getBottom();
+ mContentView.layout(0, contentTop, mContentView.getMeasuredWidth(),
  contentTop + mContentView.getMeasuredHeight());
 
  mHeaderViewOffsetHelper.onViewLayout();
@@ -108,22 +145,18 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
  private int offsetBy(int dyUnConsumed) {
  int canConsume = 0;
+ IQMUIContinuousNestedBottomView b = (IQMUIContinuousNestedBottomView) mContentView;
+ int contentHeight = b.getContentHeight();
+ FrameLayout.LayoutParams headerLp = (LayoutParams) mHeaderView.getLayoutParams();
+ int minOffset = -mHeaderView.getHeight() - headerLp.bottomMargin + getHeaderStickyHeight();
+ if (contentHeight != IQMUIContinuousNestedBottomView.HEIGHT_IS_ENOUGH_TO_SCROLL) {
+ minOffset += mContentView.getHeight() - contentHeight;
+ minOffset = Math.min(minOffset, 0);
+ }
  if (dyUnConsumed > 0) {
- FrameLayout.LayoutParams contentLp = (LayoutParams) mContentView.getLayoutParams();
- int maxOffset = mContentView.getBottom() + contentLp.bottomMargin - getHeight();
- if (maxOffset >= dyUnConsumed) {
- canConsume = dyUnConsumed;
- } else {
- canConsume = maxOffset;
- }
+ canConsume = Math.min(mHeaderView.getTop() - minOffset, dyUnConsumed);
  } else if (dyUnConsumed < 0) {
- FrameLayout.LayoutParams headerLp = (LayoutParams) mHeaderView.getLayoutParams();
- int minOffset = mHeaderView.getTop() - headerLp.topMargin;
- if (minOffset <= dyUnConsumed) {
- canConsume = dyUnConsumed;
- } else {
- canConsume = minOffset;
- }
+ canConsume = Math.max(mHeaderView.getTop() - headerLp.topMargin, dyUnConsumed);
  }
  if (canConsume != 0) {
  mHeaderViewOffsetHelper.setTopAndBottomOffset(mHeaderViewOffsetHelper.getTopAndBottomOffset() - canConsume);
@@ -134,17 +167,13 @@ private int offsetBy(int dyUnConsumed) {
 
  @Override
  public void consumeScroll(int dy) {
- if (mContentView instanceof IQMUIContinuousNestedBottomView) {
- ((IQMUIContinuousNestedBottomView) mContentView).consumeScroll(dy);
- } else {
- mScrollConsumed[0] = 0;
- mScrollConsumed[1] = 0;
- dispatchNestedPreScroll(0, dy, mScrollConsumed, null, ViewCompat.TYPE_NON_TOUCH);
- int unConsumed = dy - mScrollConsumed[1];
- int remain = offsetBy(unConsumed);
- dispatchNestedScroll(0, unConsumed - remain, 0,
- remain, null, ViewCompat.TYPE_NON_TOUCH);
- }
+ mScrollConsumed[0] = 0;
+ mScrollConsumed[1] = 0;
+ dispatchNestedPreScroll(0, dy, mScrollConsumed, null, ViewCompat.TYPE_NON_TOUCH);
+ int unConsumed = dy - mScrollConsumed[1];
+ int remain = offsetBy(unConsumed);
+ dispatchNestedScroll(0, unConsumed - remain, 0,
+ remain, null, ViewCompat.TYPE_NON_TOUCH);
  }
 
  // NestedScrollingChild2
@@ -393,7 +422,7 @@ public boolean onTouchEvent(MotionEvent ev) {
  touchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
  }
 
- if(ev.getAction() == MotionEvent.ACTION_DOWN){
+ if (ev.getAction() == MotionEvent.ACTION_DOWN) {
  mNestedOffsetY = 0;
  }
 

qmui/src/main/java/com/qmuiteam/qmui/nestedScroll/QMUIContinuousNestedBottomRecyclerView.java

@@ -40,4 +40,22 @@ public QMUIContinuousNestedBottomRecyclerView(@NonNull Context context, @Nullabl
  public void consumeScroll(int yUnconsumed) {
  scrollBy(0, yUnconsumed);
  }
+
+ @Override
+ public int getContentHeight() {
+ Adapter adapter = getAdapter();
+ if(adapter == null){
+ return 0;
+ }
+ LayoutManager layoutManager = getLayoutManager();
+ if(layoutManager == null){
+ return 0;
+ }
+ final int scrollRange = computeVerticalScrollRange();
+ final int offsetRange = scrollRange - computeVerticalScrollExtent();
+ if(offsetRange > 0){
+ return HEIGHT_IS_ENOUGH_TO_SCROLL;
+ }
+ return scrollRange;
+ }
 }