Skip to content

Fixing the following squids: #25

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

Fixing the following squids: #25

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
2 changes: 2 additions & 0 deletions library/src/main/java/com/cundong/recyclerview/EndlessRecyclerOnScrollListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
staggeredGridLayoutManager.findLastVisibleItemPositions(lastPositions);
lastVisibleItemPosition = findMax(lastPositions);
break;
default:
break;
}
}

Expand Down
3 changes: 1 addition & 2 deletions library/src/main/java/com/cundong/recyclerview/HeaderAndFooterRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ public HeaderAndFooterRecyclerViewAdapter(RecyclerView.Adapter innerAdapter) {
*/
public void setAdapter(RecyclerView.Adapter<RecyclerView.ViewHolder> adapter) {

if (adapter != null) {
if (!(adapter instanceof RecyclerView.Adapter))
if (adapter != null&&!(adapter instanceof RecyclerView.Adapter)) {
throw new RuntimeException("your adapter must be a RecyclerView.Adapter");
}

Expand Down
21 changes: 7 additions & 14 deletions library/src/main/java/com/cundong/recyclerview/RecyclerViewUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,10 @@ public static void removeFooterView(RecyclerView recyclerView) {
public static void removeHeaderView(RecyclerView recyclerView) {

RecyclerView.Adapter outerAdapter = recyclerView.getAdapter();

if (outerAdapter != null && outerAdapter instanceof HeaderAndFooterRecyclerViewAdapter) {

int headerViewCounter = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderViewsCount();
if (headerViewCounter > 0) {
View headerView = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderView();
((HeaderAndFooterRecyclerViewAdapter) outerAdapter).removeFooterView(headerView);
}
int headerViewCounter = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderViewsCount();
if (outerAdapter != null && outerAdapter instanceof HeaderAndFooterRecyclerViewAdapter && headerViewCounter > 0) {
View headerView = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderView();
((HeaderAndFooterRecyclerViewAdapter) outerAdapter).removeFooterView(headerView);
}
}

Expand All @@ -95,12 +91,9 @@ public static void removeHeaderView(RecyclerView recyclerView) {
*/
public static int getLayoutPosition(RecyclerView recyclerView, RecyclerView.ViewHolder holder) {
RecyclerView.Adapter outerAdapter = recyclerView.getAdapter();
if (outerAdapter != null && outerAdapter instanceof HeaderAndFooterRecyclerViewAdapter) {

int headerViewCounter = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderViewsCount();
if (headerViewCounter > 0) {
return holder.getLayoutPosition() - headerViewCounter;
}
int headerViewCounter = ((HeaderAndFooterRecyclerViewAdapter) outerAdapter).getHeaderViewsCount();
if (outerAdapter != null && outerAdapter instanceof HeaderAndFooterRecyclerViewAdapter && headerViewCounter > 0) {
return holder.getLayoutPosition() - headerViewCounter;
}

return holder.getLayoutPosition();
Expand Down
2 changes: 2 additions & 0 deletions sample/src/main/java/com/cundong/recyclerview/sample/EndlessGridLayoutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ public void handleMessage(Message msg) {
case -3:
RecyclerViewStateUtils.setFooterViewState(activity, activity.mRecyclerView, REQUEST_COUNT, LoadingFooter.State.NetWorkError, activity.mFooterClick);
break;
default:
break;
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions sample/src/main/java/com/cundong/recyclerview/sample/EndlessLinearLayoutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ public void handleMessage(Message msg) {
case -3:
RecyclerViewStateUtils.setFooterViewState(activity, activity.mRecyclerView, REQUEST_COUNT, LoadingFooter.State.NetWorkError, activity.mFooterClick);
break;
default:
break;
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions sample/src/main/java/com/cundong/recyclerview/sample/EndlessStaggeredGridLayoutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ public void handleMessage(Message msg) {
case -3:
RecyclerViewStateUtils.setFooterViewState(activity, activity.mRecyclerView, REQUEST_COUNT, LoadingFooter.State.NetWorkError, activity.mFooterClick);
break;
default:
break;
}
}
}
Expand Down