zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Adjust the padding and layout of the NavigationActionView.

This commit is contained in:
Jeff Verkoeyen 2022-11-12 20:22:57 -08:00
parent 87df13987a
commit 0f495e17dd
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Mastodon/Scene/Onboarding/Share/NavigationActionView.swift
View File

@ -13,6 +13,7 @@ import MastodonLocalization
final class NavigationActionView: UIView { final class NavigationActionView: UIView {
static let buttonHeight: CGFloat = 50 static let buttonHeight: CGFloat = 50
static let minimumBackButtonWidth: CGFloat = 100
private var observations = Set<NSKeyValueObservation>() private var observations = Set<NSKeyValueObservation>()
@ -27,6 +28,8 @@ final class NavigationActionView: UIView {
let backButton: PrimaryActionButton = { let backButton: PrimaryActionButton = {
let button = PrimaryActionButton() let button = PrimaryActionButton()
button.action = .back button.action = .back
button.contentEdgeInsets = WelcomeViewController.actionButtonPadding
button.titleLabel?.adjustsFontForContentSizeCategory = true
button.setTitle(L10n.Common.Controls.Actions.back, for: .normal) button.setTitle(L10n.Common.Controls.Actions.back, for: .normal)
return button return button
}() }()
@ -35,6 +38,8 @@ final class NavigationActionView: UIView {
let nextButton: PrimaryActionButton = { let nextButton: PrimaryActionButton = {
let button = PrimaryActionButton() let button = PrimaryActionButton()
button.action = .next button.action = .next
button.contentEdgeInsets = WelcomeViewController.actionButtonPadding
button.titleLabel?.adjustsFontForContentSizeCategory = true
button.setTitle(L10n.Common.Controls.Actions.next, for: .normal) button.setTitle(L10n.Common.Controls.Actions.next, for: .normal)
return button return button
}() }()
@ -77,9 +82,8 @@ extension NavigationActionView {
nextButtonShadowContainer.translatesAutoresizingMaskIntoConstraints = false nextButtonShadowContainer.translatesAutoresizingMaskIntoConstraints = false
buttonContainer.addArrangedSubview(nextButtonShadowContainer) buttonContainer.addArrangedSubview(nextButtonShadowContainer)
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
backButtonShadowContainer.heightAnchor.constraint(equalToConstant: NavigationActionView.buttonHeight).priority(.required - 1), backButtonShadowContainer.heightAnchor.constraint(greaterThanOrEqualToConstant: NavigationActionView.buttonHeight).priority(.required - 1),
nextButtonShadowContainer.heightAnchor.constraint(equalToConstant: NavigationActionView.buttonHeight).priority(.required - 1), nextButtonShadowContainer.heightAnchor.constraint(greaterThanOrEqualToConstant: NavigationActionView.buttonHeight).priority(.required - 1),
nextButtonShadowContainer.widthAnchor.constraint(equalTo: backButtonShadowContainer.widthAnchor, multiplier: 2).priority(.required - 1),
]) ])
backButton.translatesAutoresizingMaskIntoConstraints = false backButton.translatesAutoresizingMaskIntoConstraints = false
@ -99,6 +103,17 @@ extension NavigationActionView {
nextButton.trailingAnchor.constraint(equalTo: nextButtonShadowContainer.trailingAnchor), nextButton.trailingAnchor.constraint(equalTo: nextButtonShadowContainer.trailingAnchor),
nextButton.bottomAnchor.constraint(equalTo: nextButtonShadowContainer.bottomAnchor), nextButton.bottomAnchor.constraint(equalTo: nextButtonShadowContainer.bottomAnchor),
]) ])
// We want the back button to be as small as possible, allowing the next button to take up
// any remaining space. .defaultLow is "the priority level at which a button hugs its
// contents horizontally". Setting this on backButton allows nextButton to eat up remaining
// space. Note that we have to set this on the backButton, not the container, because it's
// backButton's size that determines the compression amount.
backButton.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
// Ensure that the back button has a reasonable minimum tap area.
NSLayoutConstraint.activate([
backButton.widthAnchor.constraint(greaterThanOrEqualToConstant: NavigationActionView.minimumBackButtonWidth).priority(.defaultLow - 1)
])
} }
} }