From cc699a3f5ed66068b67762687e9d7e71b3409bad Mon Sep 17 00:00:00 2001 From: sk Date: Fri, 8 Sep 2023 21:58:08 +0200 Subject: [PATCH] fix spacing stuff in report fragment --- .../report/ReportReasonChoiceFragment.java | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java index 32b2edec6..7834867d0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java @@ -83,7 +83,7 @@ public class ReportReasonChoiceFragment extends StatusListFragment{ reportStatus=Parcels.unwrap(getArguments().getParcelable("status")); if(reportStatus!=null){ Status hiddenStatus=reportStatus.clone(); - hiddenStatus.spoilerText=getString(R.string.post_hidden); + if(hiddenStatus.spoilerText==null) hiddenStatus.spoilerText=getString(R.string.post_hidden); onDataLoaded(Collections.singletonList(hiddenStatus)); setTitle(R.string.report_title_post); }else{ @@ -168,17 +168,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{ ((UsableRecyclerView)list).setIncludeMarginsInItemHitbox(false); if(reportStatus!=null){ - list.addItemDecoration(new RecyclerView.ItemDecoration(){ - @Override - public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){ - RecyclerView.ViewHolder holder=parent.getChildViewHolder(view); - if(holder instanceof LinkCardStatusDisplayItem.Holder || holder instanceof MediaGridStatusDisplayItem.Holder){ - outRect.left=V.dp(16); - outRect.right=V.dp(16); - } - } - }); - list.addItemDecoration(new RecyclerView.ItemDecoration(){ private Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG); { @@ -222,10 +211,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{ if(holder instanceof StatusDisplayItem.Holder){ outRect.left=outRect.right=V.dp(16); } - int index=holder.getAbsoluteAdapterPosition()-mergeAdapter.getPositionForAdapter(adapter); - if(index==displayItems.size()){ - outRect.top=V.dp(32); - } } }); } @@ -251,18 +236,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{ return null; } - @Override - protected void onModifyItemViewHolder(BindableViewHolder holder){ - if((Object)holder instanceof MediaGridStatusDisplayItem.Holder h){ - View layout=h.getLayout(); - layout.setOutlineProvider(OutlineProviders.roundedRect(8)); - layout.setClipToOutline(true); - View overlay=h.getSensitiveOverlay(); - overlay.setOutlineProvider(OutlineProviders.roundedRect(8)); - overlay.setClipToOutline(true); - } - } - @Override public void putRelationship(String id, Relationship rel){ super.putRelationship(id, rel);