From 58dc5b38813d7600a6e5d1a208e67b2faec01802 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 7 Jan 2019 00:19:31 +0100 Subject: [PATCH] space between sender name and text, tackles #170 --- res/layout/conversation_item_received.xml | 2 +- res/layout/conversation_item_sent.xml | 2 +- src/org/thoughtcrime/securesms/ConversationItem.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml index 8cffd2f20..2f8ec2b63 100644 --- a/res/layout/conversation_item_received.xml +++ b/res/layout/conversation_item_received.xml @@ -129,11 +129,11 @@ android:id="@+id/conversation_item_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" android:layout_marginRight="@dimen/message_bubble_horizontal_padding" style="@style/Signal.Text.Body" + android:paddingTop="@dimen/message_bubble_top_padding" android:textColor="?conversation_item_incoming_text_primary_color" android:textColorLink="?conversation_item_incoming_text_primary_color" app:scaleEmojis="true" diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml index 8531c6be9..ff606811a 100644 --- a/res/layout/conversation_item_sent.xml +++ b/res/layout/conversation_item_sent.xml @@ -107,11 +107,11 @@ android:id="@+id/conversation_item_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginLeft="@dimen/message_bubble_horizontal_padding" android:layout_marginRight="@dimen/message_bubble_horizontal_padding" android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" style="@style/Signal.Text.Body" + android:paddingTop="@dimen/message_bubble_top_padding" android:textColor="?conversation_item_outgoing_text_primary_color" android:textColorLink="?conversation_item_outgoing_text_primary_color" app:scaleEmojis="true" diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 81b942fdb..37c4d2c7c 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -634,6 +634,14 @@ public class ConversationItem extends LinearLayout } groupSenderHolder.setVisibility(groupSenderHolderVisibility); + + boolean collapse = false; + if(groupSenderHolderVisibility==VISIBLE && current.getType()==DcMsg.DC_MSG_TEXT) { + collapse = true; + } + + int spacingTop = collapse? 0 /*2dp border come from the senderHolder*/ : readDimen(context, R.dimen.message_bubble_top_padding); + ViewUtil.setPaddingTop(bodyText, spacingTop); } private void setMessageShape(@NonNull DcMsg current) {