From 1874267b324ca92eac0d98586f30c0e7260bdfe1 Mon Sep 17 00:00:00 2001 From: Grishka Date: Wed, 18 Sep 2024 05:07:07 +0300 Subject: [PATCH] Fix paddings --- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 2 +- .../joinmastodon/android/ui/displayitems/StatusDisplayItem.java | 1 - .../android/ui/displayitems/TextStatusDisplayItem.java | 2 -- mastodon/src/main/res/layout/display_item_spoiler.xml | 2 +- mastodon/src/main/res/layout/display_item_text.xml | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index af84be236..1292eb726 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -260,7 +260,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ time=item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)); timeAndUsername.setText(time+" ยท @"+item.user.acct); - itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : V.dp(4)); + itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(6) : V.dp(4)); if(TextUtils.isEmpty(item.extraText)){ extraText.setVisibility(View.GONE); }else{ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 835efa9a7..59eea28f7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -144,7 +144,6 @@ public abstract class StatusDisplayItem{ HtmlParser.applyFilterHighlights(fragment.getActivity(), parsedText, status.filtered); } TextStatusDisplayItem text=new TextStatusDisplayItem(parentID, parsedText, fragment, statusForContent); - text.reduceTopPadding=header==null; contentItems.add(text); }else if(header!=null){ header.needBottomPadding=true; 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 520d2c547..4e46f0c9b 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 @@ -32,7 +32,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ private CharSequence translatedText; private CustomEmojiHelper translationEmojiHelper=new CustomEmojiHelper(); public boolean textSelectable; - public boolean reduceTopPadding; public final Status status; public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status){ @@ -94,7 +93,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ text.setTextIsSelectable(item.textSelectable); text.setInvalidateOnEveryFrame(false); itemView.setClickable(false); - text.setPadding(text.getPaddingLeft(), item.reduceTopPadding ? V.dp(8) : V.dp(12), text.getPaddingRight(), text.getPaddingBottom()); itemView.setPaddingRelative(V.dp(item.fullWidth ? 0 : 48), 0, 0, 0); text.setTextColor(UiUtils.getThemeColor(text.getContext(), R.attr.colorM3OnSurface)); text.setTextSize(TypedValue.COMPLEX_UNIT_SP, item.fullWidth ? 18 : 16); diff --git a/mastodon/src/main/res/layout/display_item_spoiler.xml b/mastodon/src/main/res/layout/display_item_spoiler.xml index b2ef32ee4..43a8ba16c 100644 --- a/mastodon/src/main/res/layout/display_item_spoiler.xml +++ b/mastodon/src/main/res/layout/display_item_spoiler.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" - android:paddingTop="16dp" + android:paddingTop="6dp" android:paddingRight="16dp">