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

Respond to CR.

Browse source
This commit is contained in:
Matthew Chen 2018-04-13 15:10:16 -04:00
parent d7ae35f72c
commit 59a3d736bf
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)commontInit
{
// Ensure only called once.
OWSAssert(!self.bodyTextView);
_viewConstraints = [NSMutableArray new];

1
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View file

@ -48,6 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)commontInit
{
// Ensure only called once.
OWSAssert(!self.messageBubbleView);
_viewConstraints = [NSMutableArray new];

1
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
View file

@ -112,6 +112,7 @@ NS_ASSUME_NONNULL_BEGIN
- (void)createContents
{
// Ensure only called once.
OWSAssert(!self.boundsStrokeView);
self.backgroundColor = [UIColor whiteColor];

15
Signal/src/views/QuotedReplyPreview.swift
View file

@ -14,7 +14,7 @@ class QuotedReplyPreview: UIView {
public weak var delegate: QuotedReplyPreviewDelegate?
private let quotedReply: OWSQuotedReplyModel
private var quotedMessageView: OWSQuotedMessageView
private var quotedMessageView: OWSQuotedMessageView?
private var heightConstraint: NSLayoutConstraint!
required init?(coder aDecoder: NSCoder) {
@ -23,7 +23,6 @@ class QuotedReplyPreview: UIView {
init(quotedReply: OWSQuotedReplyModel) {
self.quotedReply = quotedReply
self.quotedMessageView = OWSQuotedMessageView(forPreview: quotedReply)
super.init(frame: .zero)
@ -37,6 +36,12 @@ class QuotedReplyPreview: UIView {
func updateContents() {
subviews.forEach { $0.removeFromSuperview() }
// We instantiate quotedMessageView late to ensure that it is updated
// every time contentSizeCategoryDidChange (i.e. when dynamic type
// sizes changes).
let quotedMessageView = OWSQuotedMessageView(forPreview: quotedReply)
self.quotedMessageView = quotedMessageView
quotedMessageView.backgroundColor = .clear
let cancelButton: UIButton = UIButton(type: .custom)
@ -70,7 +75,11 @@ class QuotedReplyPreview: UIView {
// MARK: Sizing
func updateHeight() {
let size = self.quotedMessageView.size(forMaxWidth: CGFloat.infinity)
guard let quotedMessageView = quotedMessageView else {
owsFail("\(logTag) missing quotedMessageView")
return
}
let size = quotedMessageView.size(forMaxWidth: CGFloat.infinity)
self.heightConstraint.constant = size.height
}