From 9bfc73d6ee55eb97abb4fcce70dbf7bac1426bb8 Mon Sep 17 00:00:00 2001 From: sk Date: Mon, 28 Aug 2023 20:04:52 +0200 Subject: [PATCH] fix wrong bottom padding hopefully, lol --- .../ui/displayitems/TextStatusDisplayItem.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java index 21f4487a0..de09e45ab 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java @@ -195,12 +195,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand); StatusDisplayItem next=getNextVisibleDisplayItem().orElse(null); - int bottomPadding=next instanceof FooterStatusDisplayItem - ? V.dp(6) - : (!item.inset && next instanceof DummyStatusDisplayItem) || - next instanceof EmojiReactionsStatusDisplayItem e && !e.isHidden() - ? 0 - : V.dp(12); + if(next!=null && !next.parentID.equals(item.parentID)) next=null; + int bottomPadding=next instanceof FooterStatusDisplayItem ? V.dp(6) + : item.inset ? V.dp(12) + : next!=null ? V.dp(12) + : 0; itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), bottomPadding); if (!GlobalUserPreferences.collapseLongPosts) {