From 94b862a3ff526df33367ed93630d5159db2d9f84 Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 15 Mar 2023 23:27:43 +0100 Subject: [PATCH] improve reblog/reply line render --- .../displayitems/ReblogOrReplyLineStatusDisplayItem.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java index 2e1b8a77f..6f9766c3d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java @@ -92,13 +92,10 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{ separator=findViewById(R.id.separator); if (GlobalUserPreferences.replyLineAboveHeader && GlobalUserPreferences.compactReblogReplyLine) { itemView.getViewTreeObserver().addOnPreDrawListener(() -> { + if (item == null) return true; int orientation = ((LinearLayout) itemView).getOrientation(); - extraText.setPaddingRelative(extraText.getPaddingStart(), V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom()); - separator.setVisibility(View.GONE); - if (getItem() != null && getItem().extra != null) { - if (orientation == LinearLayout.VERTICAL) extraText.setPaddingRelative(extraText.getPaddingStart(), 0, extraText.getPaddingEnd(), extraText.getPaddingBottom()); - else separator.setVisibility(View.VISIBLE); - } + extraText.setPaddingRelative(extraText.getPaddingStart(), item.extra != null && orientation == LinearLayout.VERTICAL ? 0 : V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom()); + separator.setVisibility(item.extra != null && orientation == LinearLayout.HORIZONTAL ? View.VISIBLE : View.GONE); return true; }); }