From 677fb4e4da282219a3580120ff68d1310507078a Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sat, 2 Sep 2023 21:02:11 -0300 Subject: [PATCH] fix: readds bot icon to timelines This was accidentally removed during the great merge, but its back again --- .../ui/displayitems/HeaderStatusDisplayItem.java | 9 +++++---- mastodon/src/main/res/layout/display_item_header.xml | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 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 b134099d3..15443333c 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 @@ -134,13 +134,11 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ public static class Holder extends StatusDisplayItem.Holder implements ImageLoaderViewHolder{ private final TextView name, time, username, extraText, pronouns; private final View collapseBtn, timeUsernameSeparator; - private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, markAsRead, collapseBtnIcon; + private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, markAsRead, collapseBtnIcon, botIcon; private final PopupMenu optionsMenu; private Relationship relationship; private APIRequest currentRelationshipRequest; - //TODO: readd - public Holder(Activity activity, ViewGroup parent){ this(activity, R.layout.display_item_header, parent); } @@ -159,7 +157,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ markAsRead=findViewById(R.id.mark_as_read); collapseBtn=findViewById(R.id.collapse_btn); collapseBtnIcon=findViewById(R.id.collapse_btn_icon); -// botIcon=findViewById(R.id.bot_icon); + botIcon=findViewById(R.id.bot_icon); extraText=findViewById(R.id.extra_text); pronouns=findViewById(R.id.pronouns); avatar.setOnClickListener(this::onAvaClick); @@ -325,6 +323,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ this.time.setVisibility(time==null ? View.GONE : View.VISIBLE); if(time!=null) this.time.setText(time); + botIcon.setVisibility(item.user.bot ? View.VISIBLE : View.GONE); + botIcon.setColorFilter(username.getCurrentTextColor()); + deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE); if (item.hasVisibilityToggle){ boolean hidden = !item.status.sensitiveRevealed || (item.status.hasSpoiler() && !item.status.spoilerRevealed); diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml index abf47a7bb..47626fd31 100644 --- a/mastodon/src/main/res/layout/display_item_header.xml +++ b/mastodon/src/main/res/layout/display_item_header.xml @@ -173,6 +173,16 @@ android:textColor="?colorM3OnSurfaceVariant" tools:text="\@Gargron@mastodon.social"/> + +