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

Fix overflow handling in condensed mode.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-01-06 11:49:16 -05:00
parent 62038e83dd
commit a504c9dd56
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -992,7 +992,11 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
private boolean hasExtraText(MessageRecord messageRecord) {
return MessageRecordUtil.hasExtraText(messageRecord) || (!messageRecord.isDisplayBodyEmpty(context) && isContentCondensed());
return MessageRecordUtil.hasExtraText(messageRecord);
}
private boolean hasCondensedContent(MessageRecord messageRecord) {
return !messageRecord.isDisplayBodyEmpty(context) && isContentCondensed();
}
private boolean hasQuote(MessageRecord messageRecord) {
@@ -1067,6 +1071,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
if (isContentCondensed()) {
bodyText.setOverflowText(getLongMessageSpan(messageRecord));
bodyText.setMaxLines(CONDENSED_MODE_MAX_LINES);
} else {
bodyText.setMaxLines(Integer.MAX_VALUE);
@@ -1329,7 +1334,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
mediaThumbnailStub.require().setPlayVideoClickListener(playVideoClickListener);
mediaThumbnailStub.require().setOnLongClickListener(passthroughClickListener);
mediaThumbnailStub.require().setOnClickListener(passthroughClickListener);
mediaThumbnailStub.require().showShade(messageRecord.isDisplayBodyEmpty(getContext()) && !hasExtraText(messageRecord));
mediaThumbnailStub.require().showShade(messageRecord.isDisplayBodyEmpty(getContext()) && !hasExtraText(messageRecord) && !hasCondensedContent(messageRecord));
mediaThumbnailStub.require().setImageResource(requestManager,
thumbnailSlides,
showControls,
@@ -1521,7 +1526,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
topEnd = 0;
}
if (hasLinkPreview(messageRecord) || hasExtraText(messageRecord)) {
if (hasLinkPreview(messageRecord) || hasExtraText(messageRecord) || hasCondensedContent(messageRecord)) {
bottomStart = 0;
bottomEnd = 0;
}