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

Fix rounded corners for messages with a quote and small link preview.

Browse source
This commit is contained in:
Cody Henthorne 2021-04-01 09:44:25 -04:00 • committed by Alex Hart
parent 6418eac658
commit c3af3e4740
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -964,7 +964,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
int defaultRadius = readDimen(R.dimen.message_corner_radius); int defaultRadius = readDimen(R.dimen.message_corner_radius);
int collapseRadius = readDimen(R.dimen.message_corner_collapse_radius); int collapseRadius = readDimen(R.dimen.message_corner_collapse_radius);
if (bigImage) { if (bigImage || hasQuote(current)) {
linkPreviewStub.get().setCorners(0, 0); linkPreviewStub.get().setCorners(0, 0);
} else if (isStartOfMessageCluster(current, previous, isGroupThread) && !current.isOutgoing() && isGroupThread) { } else if (isStartOfMessageCluster(current, previous, isGroupThread) && !current.isOutgoing() && isGroupThread) {
linkPreviewStub.get().setCorners(0, 0); linkPreviewStub.get().setCorners(0, 0);
@ -1076,6 +1076,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));
} }
if (linkPreviewStub.resolved() && !hasBigImageLinkPreview(current)) {
ViewUtil.setTopMargin(linkPreviewStub.get(), readDimen(R.dimen.message_bubble_top_padding));
}
} else { } else {
if (quoteView != null) { if (quoteView != null) {
quoteView.dismiss(); quoteView.dismiss();
@ -1084,6 +1088,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (mediaThumbnailStub.resolved()) { if (mediaThumbnailStub.resolved()) {
ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0); ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0);
} }
if (linkPreviewStub.resolved()) {
ViewUtil.setTopMargin(linkPreviewStub.get(), 0);
}
} }
} }