mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2025-10-29 11:35:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix padding in StaggeredGridLayoutManagerItemOffsetDecoration for Card Layout 3.

Browse Source
This commit is contained in:
Docile-Alligator 2025-07-06 12:05:36 -04:00
parent 2068d28dd5
commit 47e829400f
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
View File

@ -4599,7 +4599,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
}
@UnstableApi
class PostMaterial3CardVideoAutoplayViewHolder extends PostBaseVideoAutoplayViewHolder {
public class PostMaterial3CardVideoAutoplayViewHolder extends PostBaseVideoAutoplayViewHolder {
PostMaterial3CardVideoAutoplayViewHolder(ItemPostCard3VideoTypeAutoplayBinding binding) {
super(binding.getRoot(),
binding.iconGifImageViewItemPostCard3VideoTypeAutoplay,
@ -4639,7 +4639,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
}
@UnstableApi
class PostMaterial3CardVideoAutoplayLegacyControllerViewHolder extends PostBaseVideoAutoplayViewHolder {
public class PostMaterial3CardVideoAutoplayLegacyControllerViewHolder extends PostBaseVideoAutoplayViewHolder {
PostMaterial3CardVideoAutoplayLegacyControllerViewHolder(ItemPostCard3VideoTypeAutoplayLegacyControllerBinding binding) {
super(binding.getRoot(),
binding.iconGifImageViewItemPostCard3VideoTypeAutoplay,
@ -4751,7 +4751,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
}
}
class PostMaterial3CardTextTypeViewHolder extends PostTextTypeViewHolder {
public class PostMaterial3CardTextTypeViewHolder extends PostTextTypeViewHolder {
PostMaterial3CardTextTypeViewHolder(@NonNull ItemPostCard3TextBinding binding) {
super(binding.getRoot());
setBaseView(

50
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragmentBase.java
View File

@ -27,12 +27,14 @@ import android.widget.Toast;
import androidx.annotation.DimenRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.OptIn;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import androidx.media3.common.util.UnstableApi;
import androidx.paging.ItemSnapshotList;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearSmoothScroller;
@ -940,18 +942,25 @@ public abstract class PostFragmentBase extends Fragment {
protected static class StaggeredGridLayoutManagerItemOffsetDecoration extends RecyclerView.ItemDecoration {
private final int mItemOffset;
private final int mHalfOffset;
private final int mQuaterOffset;
private final int mCard3HorizontalSpace;
private final int mCard3VerticalSpace;
private final int mNColumns;
StaggeredGridLayoutManagerItemOffsetDecoration(int itemOffset, int nColumns) {
mItemOffset = itemOffset;
mNColumns = nColumns;
mCard3HorizontalSpace = -itemOffset / 4 * 3;
mCard3VerticalSpace = -itemOffset / 4;
mHalfOffset = itemOffset / 2;
mQuaterOffset = itemOffset / 4;
}
StaggeredGridLayoutManagerItemOffsetDecoration(@NonNull Context context, @DimenRes int itemOffsetId, int nColumns) {
this(context.getResources().getDimensionPixelSize(itemOffsetId), nColumns);
}
@OptIn(markerClass = UnstableApi.class)
@Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent,
@NonNull RecyclerView.State state) {
@ -961,21 +970,46 @@ public abstract class PostFragmentBase extends Fragment {
int spanIndex = layoutParams.getSpanIndex();
int halfOffset = mItemOffset / 2;
int viewPosition = ((RecyclerView.LayoutParams) view.getLayoutParams()).getViewLayoutPosition();
if (parent.getAdapter() != null) {
RecyclerView.ViewHolder viewHolder = parent.getChildViewHolder(view);
if (viewHolder instanceof PostRecyclerViewAdapter.PostMaterial3CardVideoAutoplayViewHolder ||
viewHolder instanceof PostRecyclerViewAdapter.PostMaterial3CardVideoAutoplayLegacyControllerViewHolder ||
viewHolder instanceof PostRecyclerViewAdapter.PostMaterial3CardWithPreviewViewHolder ||
viewHolder instanceof PostRecyclerViewAdapter.PostMaterial3CardGalleryTypeViewHolder ||
viewHolder instanceof PostRecyclerViewAdapter.PostMaterial3CardTextTypeViewHolder) {
if (mNColumns == 2) {
if (spanIndex == 0) {
outRect.set(-mHalfOffset, mCard3VerticalSpace, mCard3HorizontalSpace, mCard3VerticalSpace);
} else {
outRect.set(mCard3HorizontalSpace, mCard3VerticalSpace, -mHalfOffset, mCard3VerticalSpace);
}
} else if (mNColumns == 3) {
if (spanIndex == 0) {
outRect.set(-mHalfOffset, mCard3VerticalSpace, mCard3HorizontalSpace, mCard3VerticalSpace);
} else if (spanIndex == 1) {
outRect.set(mCard3HorizontalSpace, mCard3VerticalSpace, mCard3HorizontalSpace, mCard3VerticalSpace);
} else {
outRect.set(mCard3HorizontalSpace, mCard3VerticalSpace, -mHalfOffset, mCard3VerticalSpace);
}
}
return;
}
}
if (mNColumns == 2) {
if (spanIndex == 0) {
outRect.set(halfOffset, 0, halfOffset / 2, 0);
outRect.set(mHalfOffset, 0, mQuaterOffset, 0);
} else {
outRect.set(halfOffset / 2, 0, halfOffset, 0);
outRect.set(mQuaterOffset, 0, mHalfOffset, 0);
}
} else if (mNColumns == 3) {
if (spanIndex == 0) {
outRect.set(halfOffset, 0, halfOffset / 2, 0);
outRect.set(mHalfOffset, 0, mQuaterOffset, 0);
} else if (spanIndex == 1) {
outRect.set(halfOffset / 2, 0, halfOffset / 2, 0);
outRect.set(mQuaterOffset, 0, mQuaterOffset, 0);
} else {
outRect.set(halfOffset / 2, 0, halfOffset, 0);
outRect.set(mQuaterOffset, 0, mHalfOffset, 0);
}
}
}