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

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
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.DatabaseFactory;
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.MessageRecord;
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.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,
@@ -1171,6 +1162,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (mediaThumbnailStub.resolved()) {
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)) {
@@ -1181,13 +1176,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
quoteView.dismiss();
}
int topMargin = (current.isOutgoing() || !startOfCluster || !groupThread) ? 0 : readDimen(R.dimen.message_bubble_content_top_padding);
if (mediaThumbnailStub.resolved()) {
ViewUtil.setTopMargin(mediaThumbnailStub.get(), topMargin);
}
if (linkPreviewStub.resolved()) {
ViewUtil.setTopMargin(linkPreviewStub.get(), topMargin);
ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0);
}
}
}