From 50f9a089bfe0f923bdb0b7642018684b70567333 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 16 Jan 2019 09:55:23 -0500 Subject: [PATCH 1/2] Fix navbar layout in share extension. --- SignalMessaging/Views/OWSNavigationBar.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SignalMessaging/Views/OWSNavigationBar.swift b/SignalMessaging/Views/OWSNavigationBar.swift index d091cdf81..aae117725 100644 --- a/SignalMessaging/Views/OWSNavigationBar.swift +++ b/SignalMessaging/Views/OWSNavigationBar.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -156,11 +156,13 @@ public class OWSNavigationBar: UINavigationBar { } public override func layoutSubviews() { - if CurrentAppContext().isMainApp { - guard OWSWindowManager.shared().hasCall() else { - super.layoutSubviews() - return - } + guard CurrentAppContext().isMainApp else { + super.layoutSubviews() + return + } + guard OWSWindowManager.shared().hasCall() else { + super.layoutSubviews() + return } guard #available(iOS 11, *) else { From 635a644e2f7589c02f3eea774664abd29fb132d0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 16 Jan 2019 10:04:33 -0500 Subject: [PATCH 2/2] Fix safe area insets in SAE. --- .../ContactShareApprovalViewController.swift | 5 +++-- .../ViewControllers/MessageApprovalViewController.swift | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift b/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift index 78806e9b7..d44b1519d 100644 --- a/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/ContactShareApprovalViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -366,7 +366,8 @@ public class ContactShareApprovalViewController: OWSViewController, EditContactS scrollView.preservesSuperviewLayoutMargins = false self.view.addSubview(scrollView) scrollView.layoutMargins = .zero - scrollView.autoPinWidthToSuperview() + scrollView.autoPinEdge(toSuperviewSafeArea: .leading) + scrollView.autoPinEdge(toSuperviewSafeArea: .trailing) scrollView.autoPin(toTopLayoutGuideOf: self, withInset: 0) scrollView.autoPinEdge(toSuperviewEdge: .bottom) diff --git a/SignalMessaging/ViewControllers/MessageApprovalViewController.swift b/SignalMessaging/ViewControllers/MessageApprovalViewController.swift index 33e6c8d36..f836f3568 100644 --- a/SignalMessaging/ViewControllers/MessageApprovalViewController.swift +++ b/SignalMessaging/ViewControllers/MessageApprovalViewController.swift @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // import Foundation @@ -78,7 +78,8 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat // Recipient Row let recipientRow = createRecipientRow() view.addSubview(recipientRow) - recipientRow.autoPinWidthToSuperview() + recipientRow.autoPinEdge(toSuperviewSafeArea: .leading) + recipientRow.autoPinEdge(toSuperviewSafeArea: .trailing) recipientRow.autoPin(toTopLayoutGuideOf: self, withInset: 0) // Text View @@ -91,7 +92,8 @@ public class MessageApprovalViewController: OWSViewController, UITextViewDelegat textView.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0) textView.textContainerInset = UIEdgeInsets(top: 10.0, left: 10.0, bottom: 10.0, right: 10.0) view.addSubview(textView) - textView.autoPinWidthToSuperview() + textView.autoPinEdge(toSuperviewSafeArea: .leading) + textView.autoPinEdge(toSuperviewSafeArea: .trailing) textView.autoPinEdge(.top, to: .bottom, of: recipientRow) textView.autoPin(toBottomLayoutGuideOf: self, withInset: 0) }