From c58705722a6a4a870b9bff46619ff7d285d78153 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 13 Nov 2019 09:15:48 -0400
Subject: [PATCH] Fix Insights Adapter item text clashing.

---
 res/layout/insights_dashboard_adapter_item.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/res/layout/insights_dashboard_adapter_item.xml b/res/layout/insights_dashboard_adapter_item.xml
index e6130c4137..fb02d7a3b7 100644
--- a/res/layout/insights_dashboard_adapter_item.xml
+++ b/res/layout/insights_dashboard_adapter_item.xml
@@ -14,27 +14,33 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/recipient_display_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginStart="9dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Signal.Title.Insights"
         app:layout_constraintBottom_toTopOf="@id/recipient_insecure_contribution"
+        app:layout_constraintEnd_toStartOf="@id/recipient_invite"
         app:layout_constraintStart_toEndOf="@id/recipient_avatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Cayce Pollard" />
+        tools:text="Cayce Pollard (This is a long name to make sure we stick within our bounds)" />
 
     <TextView
         android:id="@+id/recipient_insecure_contribution"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="9dp"
         android:layout_marginTop="1dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:text="@string/InsightsDashboardFragment__not_using_signal_yet"
         android:textAppearance="@style/TextAppearance.Signal.Body.Insights"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/recipient_invite"
         app:layout_constraintStart_toEndOf="@id/recipient_avatar"
         app:layout_constraintTop_toBottomOf="@id/recipient_display_name"
         app:layout_constraintVertical_chainStyle="packed" />