Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(StatusDisplayItem/WarningFiltered): apply equal inset vertically

This commit is contained in:
FineFindus 2024-07-25 17:55:17 +02:00
parent ec495750fe
commit 7b31543d7a
No known key found for this signature in database
GPG Key ID: 64873EE210FF8E6B
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
View File

@ -52,13 +52,13 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
String title=item.applyingFilter.title; String title=item.applyingFilter.title;
text.setText(item.parentFragment.getString(R.string.sk_filtered, title)); text.setText(item.parentFragment.getString(R.string.sk_filtered, title));
itemView.setClipToOutline(item.inset); if(item.inset){
itemView.setOutlineProvider(item.inset ? OutlineProviders.roundedRect(12) : null); itemView.setClipToOutline(true);
itemView.setOutlineProvider(OutlineProviders.roundedRect(12));
}
} }
@Override @Override
public void onClick(){ public void onClick(){}
}
} }
} }

10
mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
View File

@ -11,6 +11,7 @@ import org.joinmastodon.android.fragments.BaseStatusListFragment;
import org.joinmastodon.android.ui.displayitems.StatusDisplayItem; import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem; import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
import java.util.List; import java.util.List;
@ -42,13 +43,16 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
boolean inset=(holder instanceof StatusDisplayItem.Holder<?> sdi) && sdi.getItem().inset; boolean inset=(holder instanceof StatusDisplayItem.Holder<?> sdi) && sdi.getItem().inset;
if(inset){ if(inset){
if(rect.isEmpty()){ if(rect.isEmpty()){
if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder){ if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder || holder instanceof WarningFilteredStatusDisplayItem.Holder){
rect.set(child.getX(), i == 0 && pos > 0 && displayItems.get(pos - 1).inset ? V.dp(-10) : child.getY(), child.getX() + child.getWidth(), child.getY() + child.getHeight() + V.dp(4)); float topInset=i == 0 && pos > 0 && displayItems.get(pos - 1).inset ? V.dp(-10) : child.getY();
if(holder instanceof WarningFilteredStatusDisplayItem.Holder)
topInset-=V.dp(4);
rect.set(child.getX(), topInset, child.getX() + child.getWidth(), child.getY() + child.getHeight() + V.dp(4));
}else { }else {
rect.set(child.getX(), i == 0 && pos > 0 && displayItems.get(pos - 1).inset ? V.dp(-10) : child.getY(), child.getX() + child.getWidth(), child.getY() + child.getHeight()); rect.set(child.getX(), i == 0 && pos > 0 && displayItems.get(pos - 1).inset ? V.dp(-10) : child.getY(), child.getX() + child.getWidth(), child.getY() + child.getHeight());
} }
}else{ }else{
if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder){ if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder || holder instanceof WarningFilteredStatusDisplayItem.Holder){
rect.bottom=Math.max(rect.bottom, child.getY()+child.getHeight()) + V.dp(4); rect.bottom=Math.max(rect.bottom, child.getY()+child.getHeight()) + V.dp(4);
}else { }else {
rect.bottom=Math.max(rect.bottom, child.getY()+child.getHeight()); rect.bottom=Math.max(rect.bottom, child.getY()+child.getHeight());