From 07d5c719d48d05310c4bde5644fcf37e3f214863 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Tue, 29 Oct 2024 20:47:33 +0100
Subject: [PATCH 1/2] improve mst_action_button

---
 src/main/res/layout/conversation_item_received.xml | 8 +++-----
 src/main/res/layout/conversation_item_sent.xml     | 8 +++-----
 src/main/res/values/dimens.xml                     | 2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/res/layout/conversation_item_received.xml b/src/main/res/layout/conversation_item_received.xml
index fa79955a9..cd7322b75 100644
--- a/src/main/res/layout/conversation_item_received.xml
+++ b/src/main/res/layout/conversation_item_received.xml
@@ -181,18 +181,16 @@
             <Button
                 android:id="@+id/msg_action_button"
                 android:visibility="gone"
-                style="@style/Signal.Text.Body"
+                style="@style/ButtonPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:paddingTop="@dimen/message_bubble_showmore_padding"
-                android:paddingBottom="@dimen/message_bubble_showmore_padding"
+                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                android:padding="@dimen/message_bubble_showmore_padding"
                 android:minHeight="1dp"
                 android:minWidth="0dp"
-                android:background="@drawable/touch_highlight_background_strong"
-                android:textColor="@color/delta_accent_darker"
                 android:text="@string/show_full_message"
                 android:textAllCaps="false"/>
 
diff --git a/src/main/res/layout/conversation_item_sent.xml b/src/main/res/layout/conversation_item_sent.xml
index e82d01366..185db432e 100644
--- a/src/main/res/layout/conversation_item_sent.xml
+++ b/src/main/res/layout/conversation_item_sent.xml
@@ -159,18 +159,16 @@
             <Button
                 android:id="@+id/msg_action_button"
                 android:visibility="gone"
-                style="@style/Signal.Text.Body"
+                style="@style/ButtonPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
-                android:paddingTop="@dimen/message_bubble_showmore_padding"
-                android:paddingBottom="@dimen/message_bubble_showmore_padding"
+                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                android:padding="@dimen/message_bubble_showmore_padding"
                 android:minHeight="1dp"
                 android:minWidth="0dp"
-                android:background="@drawable/touch_highlight_background_strong"
-                android:textColor="@color/delta_accent_darker"
                 android:text="@string/show_full_message"
                 android:textAllCaps="false"/>
 
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index e915874ae..725cd7098 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -24,7 +24,7 @@
     <dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
     <dimen name="message_bubble_edge_margin">32dp</dimen>
     <dimen name="message_bubble_bottom_padding">6dp</dimen>
-    <dimen name="message_bubble_showmore_padding">4dp</dimen>
+    <dimen name="message_bubble_showmore_padding">8dp</dimen>
     <dimen name="transparent_footer_padding">2dp</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>

From 404097fe302edfa2a192abe05f4dc66323978d98 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Wed, 30 Oct 2024 18:22:21 +0100
Subject: [PATCH 2/2] keep old style for "show full message"

---
 .../securesms/ConversationItem.java            | 14 ++++++++++----
 .../res/layout/conversation_item_received.xml  | 18 ++++++++++++++++++
 src/main/res/layout/conversation_item_sent.xml | 18 ++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
index ff908166b..2628cd130 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationItem.java
@@ -111,6 +111,7 @@ public class ConversationItem extends BaseConversationItem
   protected ViewGroup              contactPhotoHolder;
   private   ViewGroup              container;
   private   Button                 msgActionButton;
+  private   Button                 showFullButton;
 
   private @NonNull  Stub<ConversationItemThumbnail> mediaThumbnailStub;
   private @NonNull  Stub<AudioView>                 audioViewStub;
@@ -157,6 +158,7 @@ public class ConversationItem extends BaseConversationItem
     this.container               =            findViewById(R.id.container);
     this.replyView               =            findViewById(R.id.reply_icon);
     this.msgActionButton         =            findViewById(R.id.msg_action_button);
+    this.showFullButton          =            findViewById(R.id.show_full_button);
 
     setOnClickListener(new ClickListener(null));
 
@@ -406,6 +408,7 @@ public class ConversationItem extends BaseConversationItem
 
     int downloadState = messageRecord.getDownloadState();
     if (downloadState == DcMsg.DC_DOWNLOAD_AVAILABLE || downloadState == DcMsg.DC_DOWNLOAD_FAILURE || downloadState == DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
+      showFullButton.setVisibility(View.GONE);
       msgActionButton.setVisibility(View.VISIBLE);
       if (downloadState==DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
         msgActionButton.setEnabled(false);
@@ -426,6 +429,7 @@ public class ConversationItem extends BaseConversationItem
         }
       });
     } else if (messageRecord.getType() == DcMsg.DC_MSG_WEBXDC) {
+      showFullButton.setVisibility(View.GONE);
       msgActionButton.setVisibility(View.VISIBLE);
       msgActionButton.setEnabled(true);
       msgActionButton.setText(R.string.start_app);
@@ -438,10 +442,11 @@ public class ConversationItem extends BaseConversationItem
       });
     }
     else if (messageRecord.hasHtml()) {
-      msgActionButton.setVisibility(View.VISIBLE);
-      msgActionButton.setEnabled(true);
-      msgActionButton.setText(R.string.show_full_message);
-      msgActionButton.setOnClickListener(view -> {
+      msgActionButton.setVisibility(View.GONE);
+      showFullButton.setVisibility(View.VISIBLE);
+      showFullButton.setEnabled(true);
+      showFullButton.setText(R.string.show_full_message);
+      showFullButton.setOnClickListener(view -> {
         if (eventListener != null && batchSelected.isEmpty()) {
           eventListener.onShowFullClicked(messageRecord);
         } else {
@@ -450,6 +455,7 @@ public class ConversationItem extends BaseConversationItem
       });
     } else {
       msgActionButton.setVisibility(View.GONE);
+      showFullButton.setVisibility(View.GONE);
     }
   }
 
diff --git a/src/main/res/layout/conversation_item_received.xml b/src/main/res/layout/conversation_item_received.xml
index cd7322b75..44570085f 100644
--- a/src/main/res/layout/conversation_item_received.xml
+++ b/src/main/res/layout/conversation_item_received.xml
@@ -194,6 +194,24 @@
                 android:text="@string/show_full_message"
                 android:textAllCaps="false"/>
 
+            <Button
+                android:id="@+id/show_full_button"
+                android:visibility="gone"
+                style="@style/Signal.Text.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:paddingTop="@dimen/message_bubble_showmore_padding"
+                android:paddingBottom="@dimen/message_bubble_showmore_padding"
+                android:minHeight="1dp"
+                android:minWidth="0dp"
+                android:background="@drawable/touch_highlight_background_strong"
+                android:textColor="@color/delta_accent_darker"
+                android:text="@string/show_full_message"
+                android:textAllCaps="false"/>
+
             <org.thoughtcrime.securesms.components.ConversationItemFooter
                 android:id="@+id/conversation_item_footer"
                 android:layout_width="wrap_content"
diff --git a/src/main/res/layout/conversation_item_sent.xml b/src/main/res/layout/conversation_item_sent.xml
index 185db432e..1bc1ac05d 100644
--- a/src/main/res/layout/conversation_item_sent.xml
+++ b/src/main/res/layout/conversation_item_sent.xml
@@ -172,6 +172,24 @@
                 android:text="@string/show_full_message"
                 android:textAllCaps="false"/>
 
+            <Button
+                android:id="@+id/show_full_button"
+                android:visibility="gone"
+                style="@style/Signal.Text.Body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:paddingTop="@dimen/message_bubble_showmore_padding"
+                android:paddingBottom="@dimen/message_bubble_showmore_padding"
+                android:minHeight="1dp"
+                android:minWidth="0dp"
+                android:background="@drawable/touch_highlight_background_strong"
+                android:textColor="@color/delta_accent_darker"
+                android:text="@string/show_full_message"
+                android:textAllCaps="false"/>
+
             <org.thoughtcrime.securesms.components.ConversationItemFooter
                 android:id="@+id/conversation_item_footer"
                 android:layout_width="wrap_content"