From 196d82c17a6442bedad47525cc91461d67dcedf8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 25 Jun 2018 09:42:18 -0400 Subject: [PATCH] Respond to CR. --- .../ConversationView/Cells/OWSContactOffersCell.m | 2 -- .../ConversationView/Cells/OWSMessageCell.m | 2 -- .../ConversationView/Cells/OWSSystemMessageCell.m | 2 -- .../Cells/OWSUnreadIndicatorCell.m | 2 -- .../MessageDetailViewController.swift | 14 +++----------- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m index da10b82be..9fe6d53f1 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m @@ -41,8 +41,6 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssert(!self.titleLabel); - self.preservesSuperviewLayoutMargins = NO; - self.contentView.preservesSuperviewLayoutMargins = NO; self.layoutMargins = UIEdgeInsetsZero; self.contentView.layoutMargins = UIEdgeInsetsZero; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index f319f5381..22e7fb1dd 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -49,8 +49,6 @@ NS_ASSUME_NONNULL_BEGIN // Ensure only called once. OWSAssert(!self.messageBubbleView); - self.preservesSuperviewLayoutMargins = NO; - self.contentView.preservesSuperviewLayoutMargins = NO; self.layoutMargins = UIEdgeInsetsZero; self.contentView.layoutMargins = UIEdgeInsetsZero; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m index 9df580b1f..b24ffb6e2 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m @@ -46,8 +46,6 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssert(!self.imageView); - self.preservesSuperviewLayoutMargins = NO; - self.contentView.preservesSuperviewLayoutMargins = NO; self.layoutMargins = UIEdgeInsetsZero; self.contentView.layoutMargins = UIEdgeInsetsZero; diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m index b2b62d08c..172b3a495 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSUnreadIndicatorCell.m @@ -40,8 +40,6 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssert(!self.titleLabel); - self.preservesSuperviewLayoutMargins = NO; - self.contentView.preservesSuperviewLayoutMargins = NO; self.layoutMargins = UIEdgeInsetsZero; self.contentView.layoutMargins = UIEdgeInsetsZero; diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index 37e648add..04b7039a1 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -87,20 +87,12 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele object: OWSPrimaryStorage.shared().dbNotificationObject) } - override public func viewWillLayoutSubviews() { + override public func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { Logger.debug("\(self.logTag) in \(#function)") - super.viewWillLayoutSubviews() + super.viewWillTransition(to: size, with: coordinator) - self.conversationLayoutInfo.viewWidth = self.view.width() - } - - override public func viewDidLayoutSubviews() { - Logger.debug("\(self.logTag) in \(#function)") - - super.viewDidLayoutSubviews() - - self.conversationLayoutInfo.viewWidth = self.view.width() + self.conversationLayoutInfo.viewWidth = size.width } override func viewWillAppear(_ animated: Bool) {