From 7cbf269b2a00f880d8bd034a6e9d5a859d4cc7f4 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 14 Feb 2022 11:44:22 -0500
Subject: [PATCH] Fix name wrapping in conversation banner.

---
 .../conversation/ConversationBannerView.java         | 12 ++++++------
 app/src/main/res/layout/conversation_banner_view.xml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
index 274c96eddf..c7dc2a7762 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationBannerView.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.conversation;
 
 import android.content.Context;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -20,7 +21,9 @@ import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
+import org.thoughtcrime.securesms.util.SpanUtil;
 
 public class ConversationBannerView extends ConstraintLayout {
 
@@ -79,15 +82,12 @@ public class ConversationBannerView extends ConstraintLayout {
   }
 
   public String setTitle(@NonNull Recipient recipient) {
+    SpannableStringBuilder title = new SpannableStringBuilder(recipient.isSelf() ? getContext().getString(R.string.note_to_self) : recipient.getDisplayNameOrUsername(getContext()));
     if (recipient.isReleaseNotes()) {
-      contactTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_official_28, 0);
-    } else {
-      contactTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
+      SpanUtil.appendCenteredImageSpan(title, ContextUtil.requireDrawable(getContext(), R.drawable.ic_official_28), 28, 28);
     }
-
-    String title = recipient.isSelf() ? getContext().getString(R.string.note_to_self) : recipient.getDisplayNameOrUsername(getContext());
     contactTitle.setText(title);
-    return title;
+    return title.toString();
   }
 
   public void setAbout(@NonNull Recipient recipient) {
diff --git a/app/src/main/res/layout/conversation_banner_view.xml b/app/src/main/res/layout/conversation_banner_view.xml
index 42c6039344..10511a3e87 100644
--- a/app/src/main/res/layout/conversation_banner_view.xml
+++ b/app/src/main/res/layout/conversation_banner_view.xml
@@ -59,7 +59,7 @@
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/message_request_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:drawablePadding="4dp"