mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Collapse timestamps on "deleted" messages.

fork-5.53.8
Lucio Maciel 2021-08-18 11:32:10 -03:00 zatwierdzone przez Greyson Parrelli
rodzic b58cede072
commit fec4a7692d
1 zmienionych plików z 8 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
Wyświetl plik

@ -389,12 +389,14 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
int defaultTopMargin = readDimen(R.dimen.message_bubble_default_footer_bottom_margin); int defaultTopMargin = readDimen(R.dimen.message_bubble_default_footer_bottom_margin);
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) &&
!isViewOnceMessage(messageRecord) && !hasSticker(messageRecord) &&
!hasAudio(messageRecord) && !hasSharedContact(messageRecord) &&
!isViewOnceMessage(messageRecord) &&
!hasAudio(messageRecord) &&
isFooterVisible(messageRecord, nextMessageRecord, groupThread) && isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
!bodyText.isJumbomoji() && !bodyText.isJumbomoji() &&
bodyText.getLastLineWidth() > 0) bodyText.getLastLineWidth() > 0)
{ {
TextView dateView = footer.getDateView(); TextView dateView = footer.getDateView();
@ -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;