Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust padding measurement to prevent text from touching footer.

Browse Source
This commit is contained in:
Alex Hart
2026-01-22 14:25:00 -04:00
parent e3efc53b64
commit 52c2c58988
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private static final int MAX_MEASURE_CALLS = 3; private static final int MAX_MEASURE_CALLS = 3;
private static final int FOOTER_POSITION_THRESHOLD = ViewUtil.dpToPx(8); private static final int FOOTER_POSITION_THRESHOLD = ViewUtil.dpToPx(8);
private static final int TEXT_FOOTER_SPACING = ViewUtil.dpToPx(12);
private static final Rect SWIPE_RECT = new Rect(); private static final Rect SWIPE_RECT = new Rect();
@@ -583,8 +584,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (bodyText.isSingleLine() && !messageRecord.isFailed()) { if (bodyText.isSingleLine() && !messageRecord.isFailed()) {
int maxBubbleWidth = hasBigImageLinkPreview(messageRecord) || hasThumbnail(messageRecord) ? readDimen(R.dimen.media_bubble_max_width) : getMaxBubbleWidth(); int maxBubbleWidth = hasBigImageLinkPreview(messageRecord) || hasThumbnail(messageRecord) ? readDimen(R.dimen.media_bubble_max_width) : getMaxBubbleWidth();
int bodyMargins = ViewUtil.getLeftMargin(bodyText) + ViewUtil.getRightMargin(bodyText); int bodyMargins = ViewUtil.getLeftMargin(bodyText) + ViewUtil.getRightMargin(bodyText);
int sizeWithMargins = bodyText.getMeasuredWidth() + ViewUtil.dpToPx(6) + footerWidth + bodyMargins; int sizeWithMargins = bodyText.getMeasuredWidth() + TEXT_FOOTER_SPACING + footerWidth + bodyMargins;
int minSize = Math.min(maxBubbleWidth, Math.max(bodyText.getMeasuredWidth() + ViewUtil.dpToPx(6) + footerWidth + bodyMargins, bodyBubble.getMeasuredWidth())); int minSize = Math.min(maxBubbleWidth, Math.max(bodyText.getMeasuredWidth() + TEXT_FOOTER_SPACING + footerWidth + bodyMargins, bodyBubble.getMeasuredWidth()));
if (hasQuote(messageRecord) && sizeWithMargins < availableWidth) { if (hasQuote(messageRecord) && sizeWithMargins < availableWidth) {
ViewUtil.setTopMargin(footer, collapsedTopMargin, false); ViewUtil.setTopMargin(footer, collapsedTopMargin, false);
@@ -607,7 +608,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
// prevent footer flickering from small measurement variations // prevent footer flickering from small measurement variations
if (!updatingFooter && !messageRecord.isFailed()) { if (!updatingFooter && !messageRecord.isFailed()) {
int currentLineWidth = bodyText.getLastLineWidth(); int currentLineWidth = bodyText.getLastLineWidth();
int requiredSpace = currentLineWidth + ViewUtil.dpToPx(6) + footerWidth; int requiredSpace = currentLineWidth + TEXT_FOOTER_SPACING + footerWidth;
int availableSpace = bodyText.getMeasuredWidth(); int availableSpace = bodyText.getMeasuredWidth();
boolean lineWidthChangedSlightly = (lastFooterDecisionLineWidth > 0 && boolean lineWidthChangedSlightly = (lastFooterDecisionLineWidth > 0 &&