From e3011c52c23b0030218577ad045e6f0f6e846335 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Tue, 31 Oct 2023 12:32:42 +1030
Subject: [PATCH] Fix padding and ordering

---
 .../securesms/conversation/v2/messages/VisibleMessageView.kt   | 3 +++
 app/src/main/res/layout/view_visible_message.xml               | 1 +
 2 files changed, 4 insertions(+)

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 afae348583..e30f612bfd 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
@@ -267,6 +267,7 @@ class VisibleMessageView : LinearLayout {
             binding.messageStatusImageView.isVisible =
                 iconID != null && (!message.isSent || isLastMessage || disappearing)
 
+            binding.messageStatusImageView.bringToFront()
             if (disappearing && !message.isPending) updateExpirationTimer(message, iconColor)
         } else {
             binding.messageStatusTextView.isVisible = false
@@ -344,6 +345,8 @@ class VisibleMessageView : LinearLayout {
     private fun updateExpirationTimer(message: MessageRecord, iconColor: Int?) {
         val expirationTimerView = ExpirationTimerView(binding.messageStatusImageView, iconColor)
 
+        if (!message.isOutgoing) binding.messageStatusTextView.bringToFront()
+
         if (message.expiresIn > 0) {
             expirationTimerView.setPercentComplete(0.0f)
             if (message.expireStarted > 0) {
diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml
index 6dbb7e4a47..32c8d4605a 100644
--- a/app/src/main/res/layout/view_visible_message.xml
+++ b/app/src/main/res/layout/view_visible_message.xml
@@ -152,6 +152,7 @@
                 android:id="@+id/messageStatusTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="2dp"
                 android:layout_gravity="center"
                 android:textSize="@dimen/very_small_font_size"
                 tools:text="Sent" />