Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 16:19:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small UI fixes for pinned messages.

Browse Source
This commit is contained in:
Michelle Tang
2025-12-01 12:00:05 -05:00
committed by jeffrey-signal
parent 6d01fff7ee
commit 8fd17fd909
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedContextMenu.kt
View File

@@ -22,6 +22,7 @@ object PinnedContextMenu {
anchorView: View, anchorView: View,
rootView: ViewGroup = anchorView.rootView as ViewGroup, rootView: ViewGroup = anchorView.rootView as ViewGroup,
message: MmsMessageRecord, message: MmsMessageRecord,
isGroup: Boolean,
canUnpin: Boolean, canUnpin: Boolean,
onUnpin: () -> Unit = {}, onUnpin: () -> Unit = {},
onCopy: () -> Unit = {}, onCopy: () -> Unit = {},
@@ -33,6 +34,7 @@ object PinnedContextMenu {
anchorView = anchorView, anchorView = anchorView,
rootView = rootView, rootView = rootView,
message = message, message = message,
isGroup = isGroup,
canUnpin = canUnpin, canUnpin = canUnpin,
callbacks = object : Callbacks { callbacks = object : Callbacks {
override fun onUnpin() = onUnpin() override fun onUnpin() = onUnpin()
@@ -48,6 +50,7 @@ object PinnedContextMenu {
anchorView: View, anchorView: View,
rootView: ViewGroup, rootView: ViewGroup,
message: MmsMessageRecord, message: MmsMessageRecord,
isGroup: Boolean,
canUnpin: Boolean, canUnpin: Boolean,
callbacks: Callbacks callbacks: Callbacks
) { ) {
@@ -97,10 +100,11 @@ object PinnedContextMenu {
} }
val horizontalPosition = if (message.isOutgoing) SignalContextMenu.HorizontalPosition.END else SignalContextMenu.HorizontalPosition.START 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) SignalContextMenu.Builder(anchorView, rootView)
.preferredHorizontalPosition(horizontalPosition) .preferredHorizontalPosition(horizontalPosition)
.preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW) .preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW)
.offsetX(DimensionUnit.DP.toPixels(16f).toInt()) .offsetX(DimensionUnit.DP.toPixels(offsetX).toInt())
.offsetY(DimensionUnit.DP.toPixels(4f).toInt()) .offsetY(DimensionUnit.DP.toPixels(4f).toInt())
.show(actions) .show(actions)
} }

1
app/src/main/java/org/thoughtcrime/securesms/conversation/PinnedMessagesBottomSheet.kt
View File

@@ -165,6 +165,7 @@ class PinnedMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment()
anchorView = itemView, anchorView = itemView,
rootView = itemView.rootView as ViewGroup, rootView = itemView.rootView as ViewGroup,
message = item.conversationMessage.messageRecord as MmsMessageRecord, message = item.conversationMessage.messageRecord as MmsMessageRecord,
isGroup = item.conversationMessage.threadRecipient.isPushV2Group,
canUnpin = requireArguments().getBoolean(KEY_CAN_UNPIN), canUnpin = requireArguments().getBoolean(KEY_CAN_UNPIN),
onUnpin = { onUnpin = {
dismiss() dismiss()