From 8ad0069fec2e112202ad697e4c60b8dccb879177 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 6 Aug 2019 10:22:05 +1000 Subject: [PATCH] Fix group message UI --- res/layout/conversation_item_received.xml | 2 +- .../securesms/conversation/ConversationItem.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml index 5eef475d4d..bab8911673 100644 --- a/res/layout/conversation_item_received.xml +++ b/res/layout/conversation_item_received.xml @@ -35,6 +35,7 @@ android:foreground="@drawable/contact_photo_background" android:layout_width="@dimen/conversation_item_avatar_size" android:layout_height="@dimen/conversation_item_avatar_size" + android:layout_marginBottom="2dp" android:cropToPadding="true" android:contentDescription="@string/conversation_item_received__contact_photo_description" /> @@ -55,7 +56,6 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/message_bubble_edge_margin" android:layout_marginStart="8dp" - android:layout_toEndOf="@id/contact_photo_container" android:orientation="vertical" android:clipToPadding="false" android:clipChildren="false" diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java index fa647eb75d..60e622d371 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -678,6 +678,12 @@ public class ConversationItem extends LinearLayout } private void setContactPhoto(@NonNull Recipient recipient) { + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)bodyBubble.getLayoutParams(); + float scale = getResources().getDisplayMetrics().density; + float marginInDP = groupThread ? 44 : 8; + int marginInPX = Math.round(marginInDP * scale); + layoutParams.setMarginStart(marginInPX); + bodyBubble.setLayoutParams(layoutParams); if (contactPhoto == null) return; contactPhoto.setAvatar(glideRequests, recipient, true); }