oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/fixedBubbleSize'

Browse source
This commit is contained in:
Matthew Chen 2018-06-26 17:27:13 -04:00
parent 5e676c13d2 2232c25487
commit ec8db7ee6f
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
View file

@ -415,9 +415,12 @@ NS_ASSUME_NONNULL_BEGIN
if (textStackView) {
CGSize bubbleSize = [self measureSize];
[self.viewConstraints addObjectsFromArray:@[
[self autoSetDimension:ALDimensionWidth toSize:bubbleSize.width relation:NSLayoutRelationLessThanOrEqual],
]];
[NSLayoutConstraint autoSetPriority:UILayoutPriorityRequired
forConstraints:^{
[self.viewConstraints addObjectsFromArray:@[
[self autoSetDimension:ALDimensionWidth toSize:bubbleSize.width],
]];
}];
}
}

5
Signal/src/ViewControllers/ConversationView/ConversationStyle.swift
View file

@ -38,9 +38,6 @@ public class ConversationStyle: NSObject {
@objc public var fullWidthContentWidth: CGFloat = 0
@objc public var maxMessageWidth: CGFloat = 0
// TODO: Can we eliminate this after moving timestamps and
// message status inside the message bubbles.
@objc public var maxFooterWidth: CGFloat = 0
@objc public var textInsetTop: CGFloat = 0
@objc public var textInsetBottom: CGFloat = 0
@ -98,8 +95,6 @@ public class ConversationStyle: NSObject {
fullWidthContentWidth = viewWidth - (fullWidthGutterLeading + fullWidthGutterTrailing)
maxMessageWidth = floor(contentWidth - 48)
// TODO: Should this be different?
maxFooterWidth = maxMessageWidth - 10
let messageTextFont = UIFont.ows_dynamicTypeBody
// Don't include the distance from the "cap height" to the top of the UILabel