From 02400012013d4ff53a4ae85b21ef5d3e639de6a8 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 16 Nov 2022 10:28:07 +1100 Subject: [PATCH] fix copy and share buttons are getting squashed when switching from landscape to portrait in new DM VC --- Session/Home/New Conversation/NewDMVC.swift | 11 ++++++----- SessionUIKit/Style Guide/Values.swift | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Session/Home/New Conversation/NewDMVC.swift b/Session/Home/New Conversation/NewDMVC.swift index 3c2e22eba..54ae31d23 100644 --- a/Session/Home/New Conversation/NewDMVC.swift +++ b/Session/Home/New Conversation/NewDMVC.swift @@ -362,11 +362,6 @@ private final class EnterPublicKeyVC: UIViewController { result.spacing = UIDevice.current.isIPad ? Values.iPadButtonSpacing : Values.mediumSpacing result.distribution = .fillEqually - if (UIDevice.current.isIPad) { - result.layoutMargins = UIEdgeInsets(top: 0, left: Values.iPadButtonContainerMargin, bottom: 0, right: Values.iPadButtonContainerMargin) - result.isLayoutMarginsRelativeArrangement = true - } - return result }() @@ -474,6 +469,12 @@ private final class EnterPublicKeyVC: UIViewController { } else { viewHeight?.constant = size.height } + + if (UIDevice.current.isIPad) { + let iPadButtonContainerMargin: CGFloat = (size.width - Values.iPadButtonSpacing) / 2 - Values.iPadButtonWidth - Values.largeSpacing + buttonContainer.layoutMargins = UIEdgeInsets(top: 0, left: iPadButtonContainerMargin, bottom: 0, right: iPadButtonContainerMargin) + buttonContainer.isLayoutMarginsRelativeArrangement = true + } } diff --git a/SessionUIKit/Style Guide/Values.swift b/SessionUIKit/Style Guide/Values.swift index fd03c9dcb..fd12c70c9 100644 --- a/SessionUIKit/Style Guide/Values.swift +++ b/SessionUIKit/Style Guide/Values.swift @@ -57,5 +57,4 @@ public final class Values : NSObject { @objc public static let iPadButtonWidth = CGFloat(196) @objc public static let iPadButtonSpacing = CGFloat(32) @objc public static let iPadUserSessionIdContainerWidth = iPadButtonWidth * 2 + iPadButtonSpacing - @objc public static let iPadButtonContainerMargin = (UIScreen.main.bounds.width - iPadButtonSpacing) / 2 - iPadButtonWidth - largeSpacing }