From c08b1617c22a78653e13b273e89601dac586e192 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 3 Mar 2022 13:35:27 +1100 Subject: [PATCH] slim the button width again --- Session/Home/HomeVC.swift | 2 +- .../Home/Message Requests/MessageRequestsViewController.swift | 3 +-- Session/Sheets & Modals/Modal.swift | 2 +- SessionUIKit/Style Guide/Values.swift | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index afe38b0fc..2c4a71e3a 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -70,7 +70,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv let createNewPrivateChatButton = Button(style: .prominentOutline, size: .large) createNewPrivateChatButton.setTitle(NSLocalizedString("vc_home_empty_state_button_title", comment: ""), for: UIControl.State.normal) createNewPrivateChatButton.addTarget(self, action: #selector(createNewDM), for: UIControl.Event.touchUpInside) - createNewPrivateChatButton.set(.width, to: 196) + createNewPrivateChatButton.set(.width, to: Values.iPadButtonWidth) let result = UIStackView(arrangedSubviews: [ explanationLabel, createNewPrivateChatButton ]) result.axis = .vertical result.spacing = Values.mediumSpacing diff --git a/Session/Home/Message Requests/MessageRequestsViewController.swift b/Session/Home/Message Requests/MessageRequestsViewController.swift index 32e1fc46e..d7eeda35c 100644 --- a/Session/Home/Message Requests/MessageRequestsViewController.swift +++ b/Session/Home/Message Requests/MessageRequestsViewController.swift @@ -159,8 +159,7 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -Values.largeSpacing ), - // Note: The '182' is to match the 'Next' button on the New DM page (which doesn't have a fixed width) - clearAllButton.widthAnchor.constraint(equalToConstant: 182), + clearAllButton.widthAnchor.constraint(equalToConstant: Values.iPadButtonWidth), clearAllButton.heightAnchor.constraint(equalToConstant: NewConversationButtonSet.collapsedButtonSize) ]) } diff --git a/Session/Sheets & Modals/Modal.swift b/Session/Sheets & Modals/Modal.swift index e2a3acb20..f77cb4bc1 100644 --- a/Session/Sheets & Modals/Modal.swift +++ b/Session/Sheets & Modals/Modal.swift @@ -53,7 +53,7 @@ class Modal: BaseVC, UIGestureRecognizerDelegate { private func setUpViewHierarchy() { view.addSubview(contentView) if UIDevice.current.isIPad { - contentView.set(.width, to: Values.iPadButtonWidth) + contentView.set(.width, to: Values.iPadModalWidth) contentView.center(in: view) } else { contentView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: Values.veryLargeSpacing).isActive = true diff --git a/SessionUIKit/Style Guide/Values.swift b/SessionUIKit/Style Guide/Values.swift index 90dbdc8bc..0b18e2ce8 100644 --- a/SessionUIKit/Style Guide/Values.swift +++ b/SessionUIKit/Style Guide/Values.swift @@ -44,6 +44,7 @@ public final class Values : NSObject { @objc public static let onboardingButtonBottomOffset = isIPhone5OrSmaller ? CGFloat(52) : CGFloat(72) // MARK: - iPad Sizes - @objc public static let iPadButtonWidth = UIScreen.main.bounds.width / 2 + @objc public static let iPadModalWidth = UIScreen.main.bounds.width / 2 + @objc public static let iPadButtonWidth = CGFloat(196) @objc public static let iPadButtonSpacing = CGFloat(32) }