Skip to content

Fix item place error when load more #164

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

Fix item place error when load more #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2da9771
Fix item place error when load more
Dec 23, 2014
bccecfb
Fix StaggeredGridView item click not response
Dec 23, 2014
7e37241
Fix a tiny problem of this view
Dec 23, 2014
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
4 changes: 2 additions & 2 deletions library/src/main/java/com/etsy/android/grid/ExtendableListView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ private boolean onTouchUpTap(final MotionEvent event) {
mPendingCheckForTap : mPendingCheckForLongPress);
}
mLayoutMode = LAYOUT_NORMAL;
if (!mDataChanged && motionPosition >= 0 && mAdapter.isEnabled(motionPosition)) {
if (!mDataChanged && motionPosition >= 0 && mAdapter.isEnabled(motionPosition + mFirstPosition)) {
mTouchMode = TOUCH_MODE_TAP;
layoutChildren();
child.setPressed(true);
Expand Down Expand Up @@ -1297,7 +1297,7 @@ private boolean moveTheChildren(int deltaY, int incrementalDeltaY) {
}
for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i);
if (child.getBottom() >= top) {
if (child.getBottom() >= top || i + firstPosition + 2 >= footerViewsStart) {
break;
}
else {
Expand Down
2 changes: 2 additions & 0 deletions library/src/main/java/com/etsy/android/grid/StaggeredGridView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ private void onColumnSync() {
private void setPositionColumn(final int position, final int column) {
GridItemRecord rec = getOrCreateRecord(position);
rec.column = column;
rec.isHeaderFooter = false;
}

private void setPositionHeightRatio(final int position, final int height) {
Expand All @@ -1010,6 +1011,7 @@ private void setPositionHeightRatio(final int position, final int height) {
private void setPositionIsHeaderFooter(final int position) {
GridItemRecord rec = getOrCreateRecord(position);
rec.isHeaderFooter = true;
rec.column = -1;
}

private GridItemRecord getOrCreateRecord(final int position) {
Expand Down