signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Handle layout of long group name labels.

Browse Source
This commit is contained in:
Matthew Chen 2018-06-01 10:40:28 -04:00
parent b030bfb5b3
commit 23e2d971e4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -358,6 +358,11 @@ NS_ASSUME_NONNULL_BEGIN
self.footerLabel.hidden = NO;
}
// Footer labels can extend past the message bubble, but
// we want to leave spaces for an expiration timer and
// include padding so that they still visually "cling" to the
// appropriate incoming/outgoing edge.
const CGFloat maxFooterLabelWidth = self.contentWidth - 100;
if (hasExpirationTimer &&
attributedText) {
[self.viewConstraints addObjectsFromArray:@[
@ -365,8 +370,11 @@ NS_ASSUME_NONNULL_BEGIN
[self.footerLabel autoVCenterInSuperview],
(self.isIncoming ? [self.expirationTimerView autoPinLeadingToSuperviewMargin]
: [self.expirationTimerView autoPinTrailingToSuperviewMargin]),
(self.isIncoming ? [self.footerLabel autoPinLeadingToTrailingEdgeOfView:self.expirationTimerView offset:0.f]
: [self.footerLabel autoPinTrailingToLeadingEdgeOfView:self.expirationTimerView offset:0.f]),
(self.isIncoming ? [self.footerLabel autoPinLeadingToTrailingEdgeOfView:self.expirationTimerView]
: [self.footerLabel autoPinTrailingToLeadingEdgeOfView:self.expirationTimerView]),
[self.footerLabel autoSetDimension:ALDimensionWidth
toSize:maxFooterLabelWidth
relation:NSLayoutRelationLessThanOrEqual],
[self.footerView autoSetDimension:ALDimensionHeight toSize:self.footerHeight],
]];
} else if (hasExpirationTimer) {
@ -382,6 +390,9 @@ NS_ASSUME_NONNULL_BEGIN
(self.isIncoming ? [self.footerLabel autoPinLeadingToSuperviewMargin]
: [self.footerLabel autoPinTrailingToSuperviewMargin]),
[self.footerView autoSetDimension:ALDimensionHeight toSize:self.footerHeight],
[self.footerLabel autoSetDimension:ALDimensionWidth
toSize:maxFooterLabelWidth
relation:NSLayoutRelationLessThanOrEqual],
]];
} else {
OWSFail(@"%@ Cell unexpectedly has neither expiration timer nor footer text.", self.logTag);