From 3b18b0985b7633181e3f5877bf51a283563ed91f Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 1 Jun 2021 14:38:52 +1000
Subject: [PATCH] Add date break header

---
 .../v2/messages/ControlMessageView.kt         |   1 -
 .../v2/messages/VisibleMessageView.kt         |   6 +-
 .../main/res/layout/view_visible_message.xml  | 109 ++++++++++--------
 .../layout/view_visible_message_content.xml   |   2 +-
 4 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index 6553073518..793f60c66a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -30,7 +30,6 @@ class ControlMessageView : LinearLayout {
 
     // region Updating
     fun bind(message: MessageRecord) {
-        // TODO: Make view look better
         textView.text = message.getDisplayBody(context)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 3821e64f75..98aa02d06b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -57,13 +57,17 @@ class VisibleMessageView : LinearLayout {
             profilePictureContainer.visibility = View.GONE
             senderNameTextView.visibility = View.GONE
         }
+        // Date break
+        dateBreakTextView.text = "The Ancient Past"
         // Margins
         val messageContentViewLayoutParams = messageContentView.layoutParams as LinearLayout.LayoutParams
         messageContentViewLayoutParams.leftMargin = if (message.isOutgoing) resources.getDimension(R.dimen.very_large_spacing).toInt() else 0
         messageContentViewLayoutParams.rightMargin = if (message.isOutgoing) 0 else resources.getDimension(R.dimen.very_large_spacing).toInt()
         messageContentView.layoutParams = messageContentViewLayoutParams
+        // TODO: Inter-message spacing
         // Gravity
-        gravity = if (message.isOutgoing) Gravity.RIGHT else Gravity.LEFT
+        val gravity = if (message.isOutgoing) Gravity.RIGHT else Gravity.LEFT
+        mainContainer.gravity = gravity or Gravity.BOTTOM
         // Populate content view
         messageContentView.bind(message)
     }
diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml
index de0d628c2a..7cf579d17c 100644
--- a/app/src/main/res/layout/view_visible_message.xml
+++ b/app/src/main/res/layout/view_visible_message.xml
@@ -1,69 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="bottom">
+    android:orientation="vertical" >
 
-    <!-- The linear layout below is marked as "useless", but this isn't the case. It's
-         convenient because it allows you to show or hide the profile picture plus the spacers
-         before and behind it in one go. -->
+    <TextView
+        android:id="@+id/dateBreakTextView"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textStyle="bold"
+        android:gravity="center" />
 
     <LinearLayout
-        android:id="@+id/profilePictureContainer"
-        android:layout_width="wrap_content"
+        android:id="@+id/mainContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:gravity="bottom">
 
-        <View
-            android:layout_width="12dp"
-            android:layout_height="0dp" />
+        <!-- The linear layout below is marked as "useless", but this isn't the case. It's
+             convenient because it allows you to show or hide the profile picture plus the spacers
+             before and behind it in one go. -->
 
-        <RelativeLayout
+        <LinearLayout
+            android:id="@+id/profilePictureContainer"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
-                android:id="@+id/profilePictureView"
-                android:layout_width="@dimen/very_small_profile_picture_size"
-                android:layout_height="@dimen/very_small_profile_picture_size" />
+            <View
+                android:layout_width="12dp"
+                android:layout_height="0dp" />
 
-            <ImageView
-                android:id="@+id/moderatorIconImageView"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/ic_crown"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true" />
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
 
-        </RelativeLayout>
+                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                    android:id="@+id/profilePictureView"
+                    android:layout_width="@dimen/very_small_profile_picture_size"
+                    android:layout_height="@dimen/very_small_profile_picture_size" />
 
-        <View
-            android:layout_width="12dp"
-            android:layout_height="0dp" />
+                <ImageView
+                    android:id="@+id/moderatorIconImageView"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_crown"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true" />
 
-    </LinearLayout>
+            </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+            <View
+                android:layout_width="12dp"
+                android:layout_height="0dp" />
+
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/senderNameTextView"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:maxLines="1"
-            android:ellipsize="end" />
-
-        <org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageContentView
-            android:id="@+id/messageContentView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/senderNameTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:maxLines="1"
+                android:ellipsize="end" />
+
+            <org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageContentView
+                android:id="@+id/messageContentView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_visible_message_content.xml b/app/src/main/res/layout/view_visible_message_content.xml
index b829043b42..45faa14465 100644
--- a/app/src/main/res/layout/view_visible_message_content.xml
+++ b/app/src/main/res/layout/view_visible_message_content.xml
@@ -10,6 +10,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/text"
-        android:textSize="@dimen/small_font_size" />
+        android:textSize="@dimen/medium_font_size" />
 
 </LinearLayout>
\ No newline at end of file