Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed setDecorationEndOffset DividerItemDecoration

This commit is contained in:
Mariotaku Lee 2015-03-22 12:18:05 +08:00
parent 4c41cc1af1
commit 066249d593
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/DividerItemDecoration.java
View File

@ -94,9 +94,9 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
final int childCount = parent.getChildCount(); final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
final View child = parent.getChildAt(i); final View child = parent.getChildAt(i);
final int childPos = parent.getChildPosition(child); final int childPos = parent.getChildAdapterPosition(child);
final int start = getDecorationStart(), end = getDecorationEnd(parent); final int start = getDecorationStart(), end = getDecorationEnd(parent);
if (start >= 0 && end >= 0 && (childPos < start || childPos > end)) continue; if (start >= 0 && childPos < start || end >= 0 && childPos > end) continue;
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
.getLayoutParams(); .getLayoutParams();
final int top = child.getBottom() + params.bottomMargin + final int top = child.getBottom() + params.bottomMargin +
@ -115,9 +115,9 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
final int childCount = parent.getChildCount(); final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
final View child = parent.getChildAt(i); final View child = parent.getChildAt(i);
final int childPos = parent.getChildPosition(child); final int childPos = parent.getChildAdapterPosition(child);
final int start = getDecorationStart(), end = getDecorationEnd(parent); final int start = getDecorationStart(), end = getDecorationEnd(parent);
if (start >= 0 && end >= 0 && (childPos < start || childPos > end)) continue; if (start >= 0 && childPos < start || end >= 0 && childPos > end) continue;
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
.getLayoutParams(); .getLayoutParams();
final int left = child.getRight() + params.rightMargin + final int left = child.getRight() + params.rightMargin +
@ -131,9 +131,9 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
@Override @Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State state) { public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State state) {
final int childPos = parent.getChildPosition(view); final int childPos = parent.getChildAdapterPosition(view);
final int start = getDecorationStart(), end = getDecorationEnd(parent); final int start = getDecorationStart(), end = getDecorationEnd(parent);
if (start >= 0 && end >= 0 && childPos < start && childPos > end) { if (start >= 0 && childPos < start || end >= 0 && childPos > end) {
outRect.setEmpty(); outRect.setEmpty();
return; return;
} }

6
twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
View File

@ -633,11 +633,9 @@ public class StatusFragment extends BaseSupportFragment
final DividerItemDecoration decoration = mFragment.getItemDecoration(); final DividerItemDecoration decoration = mFragment.getItemDecoration();
decoration.setDecorationStart(0); decoration.setDecorationStart(0);
if (mReplies != null) { if (mReplies != null) {
// decoration.setDecorationEndOffset(2); decoration.setDecorationEndOffset(2);
decoration.setDecorationEnd(getItemCount() - 2);
} else { } else {
// decoration.setDecorationEndOffset(3); decoration.setDecorationEndOffset(3);
decoration.setDecorationEnd(getItemCount() - 3);
} }
mFragment.mRecyclerView.invalidateItemDecorations(); mFragment.mRecyclerView.invalidateItemDecorations();
} }