Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -390,7 +390,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
int defaultBottomMargin = readDimen(R.dimen.message_bubble_bottom_padding); int defaultBottomMargin = readDimen(R.dimen.message_bubble_bottom_padding);
int collapsedBottomMargin = readDimen(R.dimen.message_bubble_collapsed_bottom_padding); int collapsedBottomMargin = readDimen(R.dimen.message_bubble_collapsed_bottom_padding);
if (!updatingFooter && if (!updatingFooter &&
!isCaptionlessMms(messageRecord) && !hasOnlyThumbnail(messageRecord) &&
!hasSticker(messageRecord) &&
!hasSharedContact(messageRecord) &&
!isViewOnceMessage(messageRecord) && !isViewOnceMessage(messageRecord) &&
!hasAudio(messageRecord) && !hasAudio(messageRecord) &&
isFooterVisible(messageRecord, nextMessageRecord, groupThread) && isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
@@ -499,7 +501,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private int getMaxBubbleWidth() { private int getMaxBubbleWidth() {
int paddings = getPaddingLeft() + getPaddingRight() + ViewUtil.getLeftMargin(bodyBubble) + ViewUtil.getRightMargin(bodyBubble); 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); paddings += contactPhoto.getLayoutParams().width + ViewUtil.getLeftMargin(contactPhoto) + ViewUtil.getRightMargin(contactPhoto);
} }
return getMeasuredWidth() - paddings; return getMeasuredWidth() - paddings;