empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix margins on message bubbles.

Browse source
This commit is contained in:
Lucio Maciel 2021-07-23 09:04:36 -03:00 • committed by Greyson Parrelli
parent bfbdbdcbc0
commit 0ba7ff911b
6 changed files with 160 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -88,7 +88,6 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer;
import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
@ -727,14 +726,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
bodyText.setText(StringUtil.trim(styledText)); bodyText.setText(StringUtil.trim(styledText));
bodyText.setVisibility(View.VISIBLE); bodyText.setVisibility(View.VISIBLE);
} }
if (!messageRecord.isOutgoing()) {
if (!messageRecord.isMms()) {
ViewUtil.setTopMargin(bodyText, readDimen(R.dimen.message_bubble_content_top_padding));
} else {
ViewUtil.setTopMargin(bodyText, readDimen(R.dimen.message_bubble_text_top_padding));
}
}
} }
private void setMediaAttributes(@NonNull MessageRecord messageRecord, private void setMediaAttributes(@NonNull MessageRecord messageRecord,
@ -1171,6 +1162,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (mediaThumbnailStub.resolved()) { if (mediaThumbnailStub.resolved()) {
ViewUtil.setTopMargin(mediaThumbnailStub.get(), readDimen(R.dimen.message_bubble_top_padding)); ViewUtil.setTopMargin(mediaThumbnailStub.get(), readDimen(R.dimen.message_bubble_top_padding));
} else if (startOfCluster && !current.isOutgoing() && groupThread) {
ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_quote_negative_margin));
} else {
ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_top_padding));
} }
if (linkPreviewStub.resolved() && !hasBigImageLinkPreview(current)) { if (linkPreviewStub.resolved() && !hasBigImageLinkPreview(current)) {
@ -1181,13 +1176,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
quoteView.dismiss(); quoteView.dismiss();
} }
int topMargin = (current.isOutgoing() || !startOfCluster || !groupThread) ? 0 : readDimen(R.dimen.message_bubble_content_top_padding);
if (mediaThumbnailStub.resolved()) { if (mediaThumbnailStub.resolved()) {
ViewUtil.setTopMargin(mediaThumbnailStub.get(), topMargin); ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0);
}
if (linkPreviewStub.resolved()) {
ViewUtil.setTopMargin(linkPreviewStub.get(), topMargin);
} }
} }
} }

34
app/src/main/res/layout/conversation_item_received_multimedia.xml
View file

@ -73,6 +73,7 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="4dp"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
@ -95,7 +96,7 @@
android:id="@+id/quote_view" android:id="@+id/quote_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_content_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:visibility="gone" android:visibility="gone"
@ -109,38 +110,34 @@
android:layout_width="@dimen/media_bubble_default_dimens" android:layout_width="@dimen/media_bubble_default_dimens"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_shared_contact" android:layout="@layout/conversation_item_received_shared_contact"
android:layout_marginTop="@dimen/message_bubble_content_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:visibility="gone" /> android:visibility="gone" />
<ViewStub <ViewStub
android:id="@+id/image_view_stub" android:id="@+id/image_view_stub"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_thumbnail" android:layout="@layout/conversation_item_received_thumbnail" />
android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
<ViewStub <ViewStub
android:id="@+id/sticker_view_stub" android:id="@+id/sticker_view_stub"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_sticker" android:layout="@layout/conversation_item_received_sticker" />
android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
<ViewStub <ViewStub
android:id="@+id/link_preview_stub" android:id="@+id/link_preview_stub"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_link_preview" android:layout="@layout/conversation_item_received_link_preview" />
android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
<ViewStub <ViewStub
android:id="@+id/audio_view_stub" android:id="@+id/audio_view_stub"
android:layout_width="@dimen/message_audio_width" android:layout_width="@dimen/message_audio_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:layout="@layout/conversation_item_received_audio" /> android:layout="@layout/conversation_item_received_audio" />
<ViewStub <ViewStub
@ -148,9 +145,8 @@
android:layout_width="210dp" android:layout_width="210dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_content_top_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:layout="@layout/conversation_item_received_document" /> android:layout="@layout/conversation_item_received_document" />
<ViewStub <ViewStub
@ -158,11 +154,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_content_top_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:layout="@layout/conversation_item_received_revealable" /> android:layout="@layout/conversation_item_received_revealable" />
<LinearLayout
android:id="@+id/conversation_body_footer_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/conversation_item_body" android:id="@+id/conversation_item_body"
style="@style/Signal.Text.Body" style="@style/Signal.Text.Body"
@ -171,7 +172,7 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_content_top_padding" android:layout_marginTop="@dimen/message_bubble_content_top_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/signal_text_primary" android:textColor="@color/signal_text_primary"
android:textColorLink="@color/signal_text_primary" android:textColorLink="@color/signal_text_primary"
@ -184,7 +185,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="-4dp" android:layout_marginTop="-5dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:alpha="0.7" android:alpha="0.7"
@ -194,6 +195,7 @@
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color" app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color" app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" /> app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
</LinearLayout>
<org.thoughtcrime.securesms.components.ConversationItemFooter <org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_sticker_footer" android:id="@+id/conversation_item_sticker_footer"

15
app/src/main/res/layout/conversation_item_received_text_only.xml
View file

@ -72,6 +72,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="-6dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:orientation="horizontal" android:orientation="horizontal"
@ -92,13 +93,19 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/conversation_body_footer_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/conversation_item_body" android:id="@+id/conversation_item_body"
style="@style/Signal.Text.Body" style="@style/Signal.Text.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="1dp" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:ellipsize="end" android:ellipsize="end"
@ -113,7 +120,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="-4dp" android:layout_marginTop="-5dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:alpha="0.7" android:alpha="0.7"
@ -124,6 +131,8 @@
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary" app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
app:footer_text_color="@color/signal_text_secondary" /> app:footer_text_color="@color/signal_text_secondary" />
</LinearLayout>
<org.thoughtcrime.securesms.components.ConversationItemFooter <org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_sticker_footer" android:id="@+id/conversation_item_sticker_footer"
android:layout_width="wrap_content" android:layout_width="wrap_content"

12
app/src/main/res/layout/conversation_item_sent_multimedia.xml
View file

@ -115,6 +115,12 @@
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:layout="@layout/conversation_item_sent_revealable" /> android:layout="@layout/conversation_item_sent_revealable" />
<LinearLayout
android:id="@+id/conversation_body_footer_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/conversation_item_body" android:id="@+id/conversation_item_body"
style="@style/Signal.Text.Body" style="@style/Signal.Text.Body"
@ -123,7 +129,7 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/conversation_item_sent_text_primary_color" android:textColor="@color/conversation_item_sent_text_primary_color"
android:textColorLink="@color/conversation_item_sent_text_primary_color" android:textColorLink="@color/conversation_item_sent_text_primary_color"
@ -136,7 +142,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="-4dp" android:layout_marginTop="-5dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:clipChildren="false" android:clipChildren="false"
@ -146,6 +152,8 @@
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary" app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
app:footer_text_color="@color/signal_text_secondary" /> app:footer_text_color="@color/signal_text_secondary" />
</LinearLayout>
<org.thoughtcrime.securesms.components.ConversationItemFooter <org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_sticker_footer" android:id="@+id/conversation_item_sticker_footer"
android:layout_width="wrap_content" android:layout_width="wrap_content"

11
app/src/main/res/layout/conversation_item_sent_text_only.xml
View file

@ -46,6 +46,12 @@
android:orientation="vertical" android:orientation="vertical"
tools:backgroundTint="@color/core_grey_05"> tools:backgroundTint="@color/core_grey_05">
<LinearLayout
android:id="@+id/conversation_body_footer_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/conversation_item_body" android:id="@+id/conversation_item_body"
style="@style/Signal.Text.Body" style="@style/Signal.Text.Body"
@ -54,7 +60,7 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="@dimen/message_bubble_top_padding" android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/conversation_item_sent_text_primary_color" android:textColor="@color/conversation_item_sent_text_primary_color"
android:textColorLink="@color/conversation_item_sent_text_primary_color" android:textColorLink="@color/conversation_item_sent_text_primary_color"
@ -67,7 +73,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="-4dp" android:layout_marginTop="-5dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:clipChildren="false" android:clipChildren="false"
@ -76,6 +82,7 @@
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color" app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color" app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" /> app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
</LinearLayout>
<org.thoughtcrime.securesms.components.ConversationItemFooter <org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_sticker_footer" android:id="@+id/conversation_item_sticker_footer"

1
app/src/main/res/values/dimens.xml
View file

@ -40,6 +40,7 @@
<dimen name="message_bubble_content_top_padding">4dp</dimen> <dimen name="message_bubble_content_top_padding">4dp</dimen>
<dimen name="message_bubble_top_padding_audio">12dp</dimen> <dimen name="message_bubble_top_padding_audio">12dp</dimen>
<dimen name="message_bubble_collapsed_footer_padding">6dp</dimen> <dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
<dimen name="message_bubble_quote_negative_margin">-3dp</dimen>
<dimen name="message_bubble_edge_margin">32dp</dimen> <dimen name="message_bubble_edge_margin">32dp</dimen>
<dimen name="message_bubble_bottom_padding">7dp</dimen> <dimen name="message_bubble_bottom_padding">7dp</dimen>
<dimen name="media_bubble_remove_button_size">24dp</dimen> <dimen name="media_bubble_remove_button_size">24dp</dimen>