From 8fd17fd909b2f16084e77f27793a9d76302c6555 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Mon, 1 Dec 2025 12:00:05 -0500
Subject: [PATCH] Small UI fixes for pinned messages.

---
 .../securesms/conversation/PinnedContextMenu.kt             | 6 +++++-
 .../securesms/conversation/PinnedMessagesBottomSheet.kt     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedContextMenu.kt
index fbe1af5e6d..e87287a87e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedContextMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedContextMenu.kt
@@ -22,6 +22,7 @@ object PinnedContextMenu {
     anchorView: View,
     rootView: ViewGroup = anchorView.rootView as ViewGroup,
     message: MmsMessageRecord,
+    isGroup: Boolean,
     canUnpin: Boolean,
     onUnpin: () -> Unit = {},
     onCopy: () -> Unit = {},
@@ -33,6 +34,7 @@ object PinnedContextMenu {
       anchorView = anchorView,
       rootView = rootView,
       message = message,
+      isGroup = isGroup,
       canUnpin = canUnpin,
       callbacks = object : Callbacks {
         override fun onUnpin() = onUnpin()
@@ -48,6 +50,7 @@ object PinnedContextMenu {
     anchorView: View,
     rootView: ViewGroup,
     message: MmsMessageRecord,
+    isGroup: Boolean,
     canUnpin: Boolean,
     callbacks: Callbacks
   ) {
@@ -97,10 +100,11 @@ object PinnedContextMenu {
     }
 
     val horizontalPosition = if (message.isOutgoing) SignalContextMenu.HorizontalPosition.END else SignalContextMenu.HorizontalPosition.START
+    val offsetX = if (message.isOutgoing || !isGroup) 16f else 48f
     SignalContextMenu.Builder(anchorView, rootView)
       .preferredHorizontalPosition(horizontalPosition)
       .preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW)
-      .offsetX(DimensionUnit.DP.toPixels(16f).toInt())
+      .offsetX(DimensionUnit.DP.toPixels(offsetX).toInt())
       .offsetY(DimensionUnit.DP.toPixels(4f).toInt())
       .show(actions)
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt
index 9141b83776..32009636ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt
@@ -165,6 +165,7 @@ class PinnedMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment()
         anchorView = itemView,
         rootView = itemView.rootView as ViewGroup,
         message = item.conversationMessage.messageRecord as MmsMessageRecord,
+        isGroup = item.conversationMessage.threadRecipient.isPushV2Group,
         canUnpin = requireArguments().getBoolean(KEY_CAN_UNPIN),
         onUnpin = {
           dismiss()