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

Collapse timestamps on "deleted" messages.

Browse source
This commit is contained in:
Lucio Maciel 2021-08-18 11:32:10 -03:00 • committed by Greyson Parrelli
parent b58cede072
commit fec4a7692d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -389,12 +389,14 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
int defaultTopMargin = readDimen(R.dimen.message_bubble_default_footer_bottom_margin);
int defaultBottomMargin = readDimen(R.dimen.message_bubble_bottom_padding);
int collapsedBottomMargin = readDimen(R.dimen.message_bubble_collapsed_bottom_padding);
if (!updatingFooter &&
!isCaptionlessMms(messageRecord) &&
!isViewOnceMessage(messageRecord) &&
!hasAudio(messageRecord) &&
if (!updatingFooter &&
!hasOnlyThumbnail(messageRecord) &&
!hasSticker(messageRecord) &&
!hasSharedContact(messageRecord) &&
!isViewOnceMessage(messageRecord) &&
!hasAudio(messageRecord) &&
isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
!bodyText.isJumbomoji() &&
!bodyText.isJumbomoji() &&
bodyText.getLastLineWidth() > 0)
{
TextView dateView = footer.getDateView();
@ -499,7 +501,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private int getMaxBubbleWidth() {
int paddings = getPaddingLeft() + getPaddingRight() + ViewUtil.getLeftMargin(bodyBubble) + ViewUtil.getRightMargin(bodyBubble);
if (groupThread && !messageRecord.isOutgoing()) {
if (groupThread && !messageRecord.isOutgoing() && !messageRecord.isRemoteDelete()) {
paddings += contactPhoto.getLayoutParams().width + ViewUtil.getLeftMargin(contactPhoto) + ViewUtil.getRightMargin(contactPhoto);
}
return getMeasuredWidth() - paddings;