keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix layout issue on iPhone X / iOS 12

Browse Source
pull/79/head
Niels Andriesse 5 years ago
parent 7cfd43ff6b
commit 0eaacfd352
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/Loki/View Controllers/JoinPublicChatVC.swift
Unescape Escape View File

@ -94,7 +94,7 @@ final class JoinPublicChatVC : UIViewController, UIPageViewControllerDataSource,
if #available(iOS 13, *) { if #available(iOS 13, *) {
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight
} else { } else {
let statusBarHeight: CGFloat = 20 let statusBarHeight = UIApplication.shared.statusBarFrame.height
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight
} }
pageVCView.set(.height, to: height) pageVCView.set(.height, to: height)
@ -208,7 +208,7 @@ private final class EnterChatURLVC : UIViewController {
let stackView = UIStackView(arrangedSubviews: [ chatURLTextField, UIView.spacer(withHeight: Values.smallSpacing), explanationLabel, UIView.vStretchingSpacer(), nextButtonContainer ]) let stackView = UIStackView(arrangedSubviews: [ chatURLTextField, UIView.spacer(withHeight: Values.smallSpacing), explanationLabel, UIView.vStretchingSpacer(), nextButtonContainer ])
stackView.axis = .vertical stackView.axis = .vertical
stackView.alignment = .fill stackView.alignment = .fill
stackView.layoutMargins = UIEdgeInsets(top: Values.largeSpacing, left: Values.largeSpacing, bottom: Values.mediumSpacing, right: Values.largeSpacing) stackView.layoutMargins = UIEdgeInsets(top: Values.largeSpacing, left: Values.largeSpacing, bottom: Values.largeSpacing, right: Values.largeSpacing)
stackView.isLayoutMarginsRelativeArrangement = true stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView) view.addSubview(stackView)
stackView.pin(.leading, to: .leading, of: view) stackView.pin(.leading, to: .leading, of: view)

6
Signal/src/Loki/View Controllers/LinkDeviceVC.swift
Unescape Escape View File

@ -94,7 +94,7 @@ final class LinkDeviceVC : UIViewController, UIPageViewControllerDataSource, UIP
if #available(iOS 13, *) { if #available(iOS 13, *) {
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight
} else { } else {
let statusBarHeight: CGFloat = 20 let statusBarHeight = UIApplication.shared.statusBarFrame.height
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight
} }
pageVCView.set(.height, to: height) pageVCView.set(.height, to: height)
@ -180,7 +180,7 @@ private final class EnterPublicKeyVC : UIViewController {
linkButton.pin(.leading, to: .leading, of: linkButtonContainer, withInset: isSmallScreen ? 48 : 80) linkButton.pin(.leading, to: .leading, of: linkButtonContainer, withInset: isSmallScreen ? 48 : 80)
linkButton.pin(.top, to: .top, of: linkButtonContainer) linkButton.pin(.top, to: .top, of: linkButtonContainer)
linkButtonContainer.pin(.trailing, to: .trailing, of: linkButton, withInset: isSmallScreen ? 48 : 80) linkButtonContainer.pin(.trailing, to: .trailing, of: linkButton, withInset: isSmallScreen ? 48 : 80)
linkButtonBottomConstraint = linkButtonContainer.pin(.bottom, to: .bottom, of: linkButton, withInset: Values.veryLargeSpacing) linkButtonBottomConstraint = linkButtonContainer.pin(.bottom, to: .bottom, of: linkButton, withInset: Values.largeSpacing)
// Set up top stack view // Set up top stack view
let topStackView = UIStackView(arrangedSubviews: [ titleLabel, explanationLabel, publicKeyTextField ]) let topStackView = UIStackView(arrangedSubviews: [ titleLabel, explanationLabel, publicKeyTextField ])
topStackView.axis = .vertical topStackView.axis = .vertical
@ -236,7 +236,7 @@ private final class EnterPublicKeyVC : UIViewController {
@objc private func handleKeyboardWillHideNotification(_ notification: Notification) { @objc private func handleKeyboardWillHideNotification(_ notification: Notification) {
bottomConstraint.constant = 0 bottomConstraint.constant = 0
linkButtonBottomConstraint.constant = Values.veryLargeSpacing linkButtonBottomConstraint.constant = Values.largeSpacing
UIView.animate(withDuration: 0.25) { UIView.animate(withDuration: 0.25) {
self.view.layoutIfNeeded() self.view.layoutIfNeeded()
} }

4
Signal/src/Loki/View Controllers/NewPrivateChatVC.swift
Unescape Escape View File

@ -93,7 +93,7 @@ final class NewPrivateChatVC : UIViewController, UIPageViewControllerDataSource,
if #available(iOS 13, *) { if #available(iOS 13, *) {
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight
} else { } else {
let statusBarHeight: CGFloat = 20 let statusBarHeight = UIApplication.shared.statusBarFrame.height
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight
} }
pageVCView.set(.height, to: height) pageVCView.set(.height, to: height)
@ -217,7 +217,7 @@ private final class EnterPublicKeyVC : UIViewController {
let stackView = UIStackView(arrangedSubviews: [ publicKeyTextField, UIView.spacer(withHeight: Values.smallSpacing), explanationLabel, UIView.spacer(withHeight: Values.largeSpacing), separator, UIView.spacer(withHeight: Values.veryLargeSpacing), userPublicKeyLabel, UIView.spacer(withHeight: Values.veryLargeSpacing), buttonContainer, UIView.vStretchingSpacer(), nextButtonContainer ]) let stackView = UIStackView(arrangedSubviews: [ publicKeyTextField, UIView.spacer(withHeight: Values.smallSpacing), explanationLabel, UIView.spacer(withHeight: Values.largeSpacing), separator, UIView.spacer(withHeight: Values.veryLargeSpacing), userPublicKeyLabel, UIView.spacer(withHeight: Values.veryLargeSpacing), buttonContainer, UIView.vStretchingSpacer(), nextButtonContainer ])
stackView.axis = .vertical stackView.axis = .vertical
stackView.alignment = .fill stackView.alignment = .fill
stackView.layoutMargins = UIEdgeInsets(top: Values.largeSpacing, left: Values.largeSpacing, bottom: Values.mediumSpacing, right: Values.largeSpacing) stackView.layoutMargins = UIEdgeInsets(top: Values.largeSpacing, left: Values.largeSpacing, bottom: Values.largeSpacing, right: Values.largeSpacing)
stackView.isLayoutMarginsRelativeArrangement = true stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView) view.addSubview(stackView)
stackView.pin(to: view) stackView.pin(to: view)

4
Signal/src/Loki/View Controllers/QRCodeVC.swift
Unescape Escape View File

@ -84,7 +84,7 @@ final class QRCodeVC : UIViewController, UIPageViewControllerDataSource, UIPageV
if #available(iOS 13, *) { if #available(iOS 13, *) {
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight
} else { } else {
let statusBarHeight: CGFloat = 20 let statusBarHeight = UIApplication.shared.statusBarFrame.height
height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight height = navigationController!.view.bounds.height - navigationBar.height() - Values.tabBarHeight - statusBarHeight
} }
pageVCView.set(.height, to: height) pageVCView.set(.height, to: height)
@ -211,7 +211,7 @@ private final class ViewMyQRCodeVC : UIViewController {
stackView.axis = .vertical stackView.axis = .vertical
stackView.spacing = isSmallScreen ? Values.mediumSpacing : Values.largeSpacing stackView.spacing = isSmallScreen ? Values.mediumSpacing : Values.largeSpacing
stackView.alignment = .fill stackView.alignment = .fill
stackView.layoutMargins = UIEdgeInsets(top: Values.mediumSpacing, left: Values.largeSpacing, bottom: Values.mediumSpacing, right: Values.largeSpacing) stackView.layoutMargins = UIEdgeInsets(top: Values.largeSpacing, left: Values.largeSpacing, bottom: Values.largeSpacing, right: Values.largeSpacing)
stackView.isLayoutMarginsRelativeArrangement = true stackView.isLayoutMarginsRelativeArrangement = true
view.addSubview(stackView) view.addSubview(stackView)
stackView.pin(.leading, to: .leading, of: view) stackView.pin(.leading, to: .leading, of: view)

Write Preview
Loading…
Cancel
Save