Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions library/src/main/java/com/cjj/MaterialHeaderView.java
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ public void onRefreshing(MaterialRefreshLayout materialRefreshLayout) {
materialWaveView.onRefreshing(materialRefreshLayout);
}
if (circleProgressBar != null) {
ViewCompat.setScaleX(circleProgressBar, 1f);
ViewCompat.setScaleY(circleProgressBar, 1f);
ViewCompat.setAlpha(circleProgressBar, 1f);
circleProgressBar.onRefreshing(materialRefreshLayout);
}
}
Expand Down
7 changes: 6 additions & 1 deletion library/src/main/java/com/cjj/MaterialRefreshLayout.java
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,16 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
return true;
} else if (dy < 0 && !canChildScrollDown() && isLoadMore) {
if (mMaterialFooterView != null && !isLoadMoreing) {
soveLoadMoreLogic();
isLoadMoreing = true;
}
return super.onInterceptTouchEvent(ev);
}
break;
case MotionEvent.ACTION_UP:
if (isLoadMoreing) {
soveLoadMoreLogic();
}
break;
}
return super.onInterceptTouchEvent(ev);
}
Expand Down