diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-11-24 14:09:20 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-11-26 14:04:17 +0100 |
| commit | 1fa2b4d99451e9cc854694e6a45d0a44ab27d311 (patch) | |
| tree | 785274c63316550a8e62ffead30fa943a32bf13e | |
| parent | 370e415566e5ccc664cbfeb916d939912aad0b35 (diff) | |
| download | mullvadvpn-1fa2b4d99451e9cc854694e6a45d0a44ab27d311.tar.xz mullvadvpn-1fa2b4d99451e9cc854694e6a45d0a44ab27d311.zip | |
UIMetrics: extract corner radius and text field margins
| -rw-r--r-- | ios/MullvadVPN/CustomTextField.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/TranslucentButtonBlurView.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/UIMetrics.swift | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ios/MullvadVPN/CustomTextField.swift b/ios/MullvadVPN/CustomTextField.swift index c923d3e925..9c400f4720 100644 --- a/ios/MullvadVPN/CustomTextField.swift +++ b/ios/MullvadVPN/CustomTextField.swift @@ -11,13 +11,13 @@ import UIKit class CustomTextField: UITextField { - var cornerRadius: CGFloat = 4 { + var cornerRadius: CGFloat = UIMetrics.controlCornerRadius { didSet { layer.cornerRadius = cornerRadius } } - var textMargins = UIEdgeInsets(top: 12, left: 14, bottom: 12, right: 14) { + var textMargins = UIMetrics.textFieldMargins { didSet { setNeedsLayout() } diff --git a/ios/MullvadVPN/TranslucentButtonBlurView.swift b/ios/MullvadVPN/TranslucentButtonBlurView.swift index 982e6f86dc..78c916d5ec 100644 --- a/ios/MullvadVPN/TranslucentButtonBlurView.swift +++ b/ios/MullvadVPN/TranslucentButtonBlurView.swift @@ -8,8 +8,6 @@ import UIKit -private let kButtonCornerRadius = CGFloat(4) - class TranslucentButtonBlurView: UIVisualEffectView { init(button: AppButton) { let effect = UIBlurEffect(style: button.style.blurEffectStyle) @@ -27,7 +25,7 @@ class TranslucentButtonBlurView: UIVisualEffectView { button.bottomAnchor.constraint(equalTo: contentView.bottomAnchor) ]) - layer.cornerRadius = kButtonCornerRadius + layer.cornerRadius = UIMetrics.controlCornerRadius layer.maskedCorners = button.style.cornerMask(effectiveUserInterfaceLayoutDirection) layer.masksToBounds = true } diff --git a/ios/MullvadVPN/UIMetrics.swift b/ios/MullvadVPN/UIMetrics.swift index 1ecfb8c4c1..6205830a78 100644 --- a/ios/MullvadVPN/UIMetrics.swift +++ b/ios/MullvadVPN/UIMetrics.swift @@ -33,6 +33,12 @@ extension UIMetrics { /// Spacing used between distinct sections of views static var sectionSpacing: CGFloat = 24 + /// Text field margins + static let textFieldMargins = UIEdgeInsets(top: 12, left: 14, bottom: 12, right: 14) + + /// Corner radius used for controls such as buttons and text fields + static let controlCornerRadius: CGFloat = 4 + /// Maximum width of the split view content container on iPad static var maximumSplitViewContentContainerWidth: CGFloat = 810 * 0.7 |