From b28c684bd3240c0722b305e9cee5b4a4f934ed51 Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 21 Dec 2022 19:54:15 +0100 Subject: [PATCH] fix missing text in notification --- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 2 +- mastodon/src/main/res/layout/display_item_header.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 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 475a0dce1..bf917c6ad 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 @@ -238,7 +238,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ else timestamp.setText(item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt))); visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE); - deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null ? View.VISIBLE : View.GONE); + deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE); if(item.hasVisibilityToggle){ visibility.setImageResource(item.status.spoilerRevealed ? R.drawable.ic_visibility_off : R.drawable.ic_visibility); visibility.setContentDescription(item.parentFragment.getString(item.status.spoilerRevealed ? R.string.hide_content : R.string.reveal_content)); diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml index 6e3d8ce82..f21284911 100644 --- a/mastodon/src/main/res/layout/display_item_header.xml +++ b/mastodon/src/main/res/layout/display_item_header.xml @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="24dp" android:layout_marginEnd="8dp" - android:layout_toStartOf="@id/visibility" + android:layout_toStartOf="@id/delete_notification" android:layout_toEndOf="@id/avatar">