From 909c0c544c747dd989a625ddc1657999436a245d Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 15 Nov 2017 15:49:45 -0800
Subject: [PATCH] Make sure thread preview text is to left of unread indicator

---
 res/layout/conversation_list_item_view.xml    | 40 ++++++++++---------
 .../securesms/ConversationListItem.java       |  8 ++--
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index b475f7af6d..91685ae3ab 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -78,8 +78,8 @@
                 android:layout_below="@id/from"
                 android:layout_toRightOf="@id/indicators_parent"
                 android:layout_toEndOf="@id/indicators_parent"
-                android:layout_toLeftOf="@+id/delivery_status"
-                android:layout_toStartOf="@+id/delivery_status"
+                android:layout_toLeftOf="@+id/status"
+                android:layout_toStartOf="@+id/status"
                 android:paddingRight="1dp"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
@@ -135,23 +135,27 @@
                   android:textSize="12sp"
                 />
 
-        <org.thoughtcrime.securesms.components.DeliveryStatusView
-                  android:id="@+id/delivery_status"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_below="@+id/date"
-                  android:layout_toLeftOf="@+id/archived"
-                  android:layout_toStartOf="@+id/archived"
-                  android:layout_alignWithParentIfMissing="true"
-                  app:iconColor="?attr/conversation_list_item_subject_color"/>
 
-        <ImageView android:id="@+id/unread_indicator"
-                   android:layout_width="24dp"
-                   android:layout_height="24dp"
-                   android:layout_below="@id/date"
-                   android:layout_toLeftOf="@id/archived"
-                   android:layout_toStartOf="@id/archived"
-                   android:layout_alignWithParentIfMissing="true"/>
+        <FrameLayout android:id="@+id/status"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_below="@id/date"
+                     android:layout_toLeftOf="@id/archived"
+                     android:layout_toStartOf="@id/archived"
+                     android:layout_alignWithParentIfMissing="true">
+
+            <org.thoughtcrime.securesms.components.DeliveryStatusView
+                    android:id="@+id/delivery_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:iconColor="?attr/conversation_list_item_subject_color"/>
+
+            <ImageView android:id="@+id/unread_indicator"
+                       android:layout_width="24dp"
+                       android:layout_height="24dp"/>
+
+        </FrameLayout>
+
 
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationListItem>
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index cd1e28e901..9072680ae4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -191,9 +191,9 @@ public class ConversationListItem extends RelativeLayout
       this.thumbnailView.setVisibility(View.GONE);
 
       LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
-      subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
+      subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.status);
       if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-        subjectParams.addRule(RelativeLayout.START_OF, R.id.delivery_status);
+        subjectParams.addRule(RelativeLayout.START_OF, R.id.status);
       }
       this.subjectView.setLayoutParams(subjectParams);
     }
@@ -273,9 +273,9 @@ public class ConversationListItem extends RelativeLayout
       if (archivedView.getVisibility() == View.VISIBLE &&
           (archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth())
       {
-        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
+        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.status);
         if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-          thumbnailParams.addRule(RelativeLayout.START_OF, R.id.delivery_status);
+          thumbnailParams.addRule(RelativeLayout.START_OF, R.id.status);
         }
       } else {
         thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date);