Skip to content

Commit 06dcfb2

Browse files
NickEntinNickEntin
committed
Bump Paralayout dependency in demo app to 1.0.0-rc.5
1 parent b3e77c4 commit 06dcfb2

25 files changed

+73
-72
lines changed

‎Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private extension AccessibilityCustomActionsViewController {
6262
// MARK: - UIView
6363

6464
override func layoutSubviews() {
65-
views.forEach { $0.frame.size = .init(width: bounds.width / 2, height: 50) }
65+
views.forEach { $0.bounds.size = .init(width: bounds.width / 2, height: 50) }
6666

6767
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
6868

@@ -71,7 +71,7 @@ private extension AccessibilityCustomActionsViewController {
7171
distributionSpecifiers.append(subview)
7272
distributionSpecifiers.append(1.flexible)
7373
}
74-
applySubviewDistribution(distributionSpecifiers)
74+
applyVerticalSubviewDistribution(distributionSpecifiers)
7575
}
7676

7777
}

‎Example/AccessibilitySnapshot/AccessibilityPathViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private extension AccessibilityPathViewController {
117117
distributionSpecifiers.append(subview)
118118
distributionSpecifiers.append(1.flexible)
119119
}
120-
applySubviewDistribution(distributionSpecifiers)
120+
applyVerticalSubviewDistribution(distributionSpecifiers)
121121
}
122122

123123
}

‎Example/AccessibilitySnapshot/ActivationPointViewController.swift

+7-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ private extension ActivationPointViewController {
6565
// MARK: - UIView
6666

6767
override func layoutSubviews() {
68-
button.resize(toFit: bounds.size)
69-
customActivationPointView.resize(toFit: bounds.size)
68+
button.sizeToFit(bounds.size)
69+
customActivationPointView.sizeToFit(bounds.size)
7070

7171
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
7272

73-
applySubviewDistribution(
73+
applyVerticalSubviewDistribution(
7474
[
7575
statusBarHeight.fixed,
7676
1.flexible,
@@ -122,8 +122,8 @@ private extension ActivationPointViewController {
122122
label.sizeToFit()
123123
switchButton.sizeToFit()
124124

125-
label.alignToSuperview(.leftCenter, inset: 32)
126-
switchButton.alignToSuperview(.rightCenter, inset: 32)
125+
label.align(withSuperview: .leftCenter, inset: 32)
126+
switchButton.align(withSuperview: .rightCenter, inset: 32)
127127

128128
label.isAccessibilityElement = false
129129
}
@@ -150,7 +150,8 @@ private extension ActivationPointViewController {
150150
get {
151151
// Set the activation point to the center of switch so tapping the parent element toggles the switch.
152152
return Position.center.point(
153-
in: UIAccessibility.convertToScreenCoordinates(switchButton.frame, in: self)
153+
in: UIAccessibility.convertToScreenCoordinates(switchButton.frame, in: self),
154+
layoutDirection: effectiveUserInterfaceLayoutDirection
154155
)
155156
}
156157
set {

‎Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift

+9-3
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,17 @@ extension ButtonAccessibilityTraitsViewController {
203203
leftColSubviewDistribution.append(button)
204204
leftColSubviewDistribution.append(1.flexible)
205205
}
206-
applySubviewDistribution(leftColSubviewDistribution, alignment: .leading(inset: outerMargin))
206+
applyVerticalSubviewDistribution(
207+
leftColSubviewDistribution,
208+
orthogonalAlignment: .leading(inset: outerMargin)
209+
)
207210

208211
var centerColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
209212
for button in buttons[buttonsPerColumn..<(2 * buttonsPerColumn)] {
210213
centerColSubviewDistribution.append(button)
211214
centerColSubviewDistribution.append(1.flexible)
212215
}
213-
applySubviewDistribution(centerColSubviewDistribution)
216+
applyVerticalSubviewDistribution(centerColSubviewDistribution)
214217

215218
var rightColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
216219
for button in buttons[(2 * buttonsPerColumn)..<buttons.count] {
@@ -221,7 +224,10 @@ extension ButtonAccessibilityTraitsViewController {
221224
rightColSubviewDistribution.append(buttons[0].frame.height.fixed)
222225
rightColSubviewDistribution.append(1.flexible)
223226
}
224-
applySubviewDistribution(rightColSubviewDistribution, alignment: .trailing(inset: outerMargin))
227+
applyVerticalSubviewDistribution(
228+
rightColSubviewDistribution,
229+
orthogonalAlignment: .trailing(inset: outerMargin)
230+
)
225231
}
226232

227233
}

‎Example/AccessibilitySnapshot/DataTableViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private extension DataTableViewController {
147147
width: CGFloat(accessibilityColumnCount()),
148148
height: CGFloat(accessibilityRowCount())
149149
).rect(
150-
toFit: bounds.inset(left: 20, top: 20, right: 20, bottom: 20),
150+
toFit: bounds.insetBy(left: 20, top: 20, right: 20, bottom: 20),
151151
at: .center,
152152
in: self
153153
)
@@ -167,7 +167,7 @@ private extension DataTableViewController {
167167
}
168168

169169
notACell.sizeToFit()
170-
notACell.alignToSuperview(.topCenter, inset: 60)
170+
notACell.align(withSuperview: .topCenter, inset: 60)
171171
}
172172

173173
// MARK: - UIAccessibility

‎Example/AccessibilitySnapshot/DefaultControlsViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private extension DefaultControlsViewController {
9696
distributionSpecifiers.append(subview)
9797
distributionSpecifiers.append(1.flexible)
9898
}
99-
applySubviewDistribution(distributionSpecifiers)
99+
applyVerticalSubviewDistribution(distributionSpecifiers)
100100
}
101101

102102
}

‎Example/AccessibilitySnapshot/DescriptionEdgeCasesViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extension DescriptionEdgeCasesViewController {
116116
distributionSpecifiers.append(subview)
117117
distributionSpecifiers.append(1.flexible)
118118
}
119-
applySubviewDistribution(distributionSpecifiers)
119+
applyVerticalSubviewDistribution(distributionSpecifiers)
120120
}
121121

122122
}

‎Example/AccessibilitySnapshot/DynamicTypeViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ final class DynamicTypeViewController: AccessibilityViewController {
6464

6565
views.forEach { $0.frame.size = $0.sizeThatFits(view.bounds.size) }
6666

67-
let statusBarHeight = UIApplication.shared.statusBarFrame.height
67+
let statusBarHeight = view.window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
6868

6969
var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
7070
for subview in views {
7171
distributionSpecifiers.append(subview)
7272
distributionSpecifiers.append(1.flexible)
7373
}
74-
view.applySubviewDistribution(distributionSpecifiers)
74+
view.applyVerticalSubviewDistribution(distributionSpecifiers)
7575
}
7676

7777
}

‎Example/AccessibilitySnapshot/ElementOrderViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private extension ElementOrderViewController {
117117
)
118118

119119
case .container, .viewWithAccessibleSubviews:
120-
view.alignToSuperview(.center)
120+
view.align(withSuperview: .center)
121121
}
122122
}
123123
}

‎Example/AccessibilitySnapshot/ElementSelectionViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private extension ElementSelectionViewController {
222222
distributionSpecifiers.append(subview)
223223
distributionSpecifiers.append(1.flexible)
224224
}
225-
applySubviewDistribution(distributionSpecifiers)
225+
applyVerticalSubviewDistribution(distributionSpecifiers)
226226
}
227227

228228
}

‎Example/AccessibilitySnapshot/InvertColorsViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ private extension InvertColorsViewController {
113113
override func layoutSubviews() {
114114
let nestedViews: [UIView] = [self] + nestedSubviews
115115
for (containingView, subview) in zip(nestedViews.dropLast(), nestedViews.dropFirst()) {
116-
subview.frame = containingView.bounds.inset(left: 30, top: 60, right: 30, bottom: 60)
116+
subview.frame = containingView.bounds.insetBy(left: 30, top: 60, right: 30, bottom: 60)
117117
}
118118

119119
statusLabel.sizeToFit()
120-
statusLabel.alignToSuperview(.topCenter, inset: 20)
120+
statusLabel.align(withSuperview: .topCenter, inset: 20)
121121
}
122122

123123
}

‎Example/AccessibilitySnapshot/LabelAccessibilityPropertiesViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extension LabelAccessibilityPropertiesViewController {
141141
distributionSpecifiers.append(label)
142142
distributionSpecifiers.append(1.flexible)
143143
}
144-
applySubviewDistribution(distributionSpecifiers)
144+
applyVerticalSubviewDistribution(distributionSpecifiers)
145145
}
146146

147147
}

‎Example/AccessibilitySnapshot/LandmarkContainerViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ private extension LandmarkContainerViewController {
6363
override func layoutSubviews() {
6464
views.forEach { $0.sizeToFit() }
6565

66-
let statusBarHeight = UIApplication.shared.statusBarFrame.height
66+
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
6767

6868
var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
6969
for subview in views {
7070
distributionSpecifiers.append(subview)
7171
distributionSpecifiers.append(1.flexible)
7272
}
73-
applySubviewDistribution(distributionSpecifiers)
73+
applyVerticalSubviewDistribution(distributionSpecifiers)
7474
}
7575

7676
// MARK: - UIAccessibility

‎Example/AccessibilitySnapshot/ListContainerViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ private extension ListContainerViewController {
6363
override func layoutSubviews() {
6464
views.forEach { $0.sizeToFit() }
6565

66-
let statusBarHeight = UIApplication.shared.statusBarFrame.height
66+
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
6767

6868
var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
6969
for subview in views {
7070
distributionSpecifiers.append(subview)
7171
distributionSpecifiers.append(1.flexible)
7272
}
73-
applySubviewDistribution(distributionSpecifiers)
73+
applyVerticalSubviewDistribution(distributionSpecifiers)
7474
}
7575

7676
// MARK: - UIAccessibility

‎Example/AccessibilitySnapshot/ModalAccessibilityViewController.swift

+15-13
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ private extension ModalAccessibilityViewController {
104104
// MARK: - UIView
105105

106106
override func layoutSubviews() {
107-
views[0].alignToSuperview(.topLeft, inset: 20)
108-
views[1].alignToSuperview(.topRight, inset: 20)
109-
views[2].alignToSuperview(.bottomRight, inset: 20)
110-
views[3].alignToSuperview(.bottomLeft, inset: 20)
107+
views[0].align(withSuperview: .topLeft, inset: 20)
108+
views[1].align(withSuperview: .topRight, inset: 20)
109+
views[2].align(withSuperview: .bottomRight, inset: 20)
110+
views[3].align(withSuperview: .bottomLeft, inset: 20)
111111

112112
var distributionItems: [ViewDistributionSpecifying] = [1.flexible]
113113

@@ -125,7 +125,7 @@ private extension ModalAccessibilityViewController {
125125

126126
_ = distributionItems.dropLast()
127127
distributionItems.append(1.flexible)
128-
applySubviewDistribution(distributionItems)
128+
applyVerticalSubviewDistribution(distributionItems)
129129
}
130130

131131
}
@@ -178,7 +178,7 @@ private extension ModalAccessibilityViewController {
178178

179179
override func layoutSubviews() {
180180
label.sizeToFit()
181-
label.alignToSuperview(.center)
181+
label.align(withSuperview: .center)
182182

183183
switch accessibilityMode {
184184
case .viewContainsAccessibleElement,
@@ -227,13 +227,15 @@ private extension ModalAccessibilityViewController {
227227

228228
override func layoutSubviews() {
229229
modalViews.forEach { $0.sizeToFit() }
230-
applySubviewDistribution([
231-
10.fixed,
232-
modalViews[0],
233-
10.fixed,
234-
modalViews[1],
235-
10.fixed,
236-
])
230+
applyVerticalSubviewDistribution(
231+
[
232+
10.fixed,
233+
modalViews[0],
234+
10.fixed,
235+
modalViews[1],
236+
10.fixed,
237+
]
238+
)
237239
}
238240

239241
override func sizeThatFits(_ size: CGSize) -> CGSize {

‎Example/AccessibilitySnapshot/SwitchControlViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private extension SwitchControlViewController {
145145
1.flexible,
146146
]
147147
)
148-
applySubviewDistribution(distributionSpecifiers)
148+
applyVerticalSubviewDistribution(distributionSpecifiers)
149149
}
150150

151151
}

‎Example/AccessibilitySnapshot/TabBarViewController.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ extension TabBarViewController {
126126
distributionSpecifiers.append(subview)
127127
distributionSpecifiers.append(1.flexible)
128128
}
129-
applySubviewDistribution(distributionSpecifiers)
129+
applyVerticalSubviewDistribution(distributionSpecifiers)
130130
}
131131

132132
}
@@ -205,7 +205,7 @@ private final class TabBarTraitView: UIView {
205205

206206
override func layoutSubviews() {
207207
tabs.forEach { $0.frame.size.height = bounds.height }
208-
spreadOutSubviews(tabs, margin: 0)
208+
horizontallySpreadSubviews(tabs, margin: 0)
209209
}
210210

211211
override func sizeThatFits(_ size: CGSize) -> CGSize {
@@ -270,13 +270,13 @@ private final class TabBarTraitView: UIView {
270270
outerLabelContainer.frame = bounds
271271

272272
leftLabel.sizeToFit()
273-
leftLabel.alignToSuperview(.leftCenter, inset: 4)
273+
leftLabel.align(withSuperview: .leftCenter, inset: 4)
274274

275275
rightLabel.sizeToFit()
276-
rightLabel.alignToSuperview(.rightCenter, inset: 4)
276+
rightLabel.align(withSuperview: .rightCenter, inset: 4)
277277

278278
middleLabel.sizeToFit()
279-
middleLabel.alignToSuperview(.center)
279+
middleLabel.align(withSuperview: .center)
280280
}
281281

282282
}
@@ -352,7 +352,7 @@ private final class TabBarTraitContainerView: UIView {
352352
override func layoutSubviews() {
353353
itemLabels.forEach { $0.frame.size.height = bounds.height }
354354

355-
spreadOutSubviews(itemLabels, margin: 0)
355+
horizontallySpreadSubviews(itemLabels, margin: 0)
356356

357357
for (label, element) in zip(itemLabels, accessibilityElements as! [UIAccessibilityElement]) {
358358
element.accessibilityFrameInContainerSpace = label.frame

‎Example/AccessibilitySnapshot/UserInterfaceDirectionViewController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ private extension UserIntefaceDirectionViewController {
7474
// MARK: - UIView
7575

7676
override func layoutSubviews() {
77-
let statusBarHeight = UIApplication.shared.statusBarFrame.height
77+
let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
7878

7979
var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
8080
for subview in [unspecifiedView, playbackView, spatialView, forceLeftToRightView, forceRightToLeftView] {
8181
subview.frame.size = .init(width: 200, height: 32)
8282
distributionSpecifiers.append(subview)
8383
distributionSpecifiers.append(1.flexible)
8484
}
85-
applySubviewDistribution(distributionSpecifiers)
85+
applyVerticalSubviewDistribution(distributionSpecifiers)
8686
}
8787

8888
}
@@ -125,7 +125,7 @@ private extension UserIntefaceDirectionViewController {
125125
// MARK: - UIView
126126

127127
override func layoutSubviews() {
128-
applySubviewDistribution(subviews, axis: .horizontal)
128+
applyHorizontalSubviewDistribution(subviews)
129129
}
130130

131131
}

‎Example/AccessibilitySnapshot/ViewAccessibilityPropertiesViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ extension ViewAccessibilityPropertiesViewController {
123123
distributionSpecifiers.append(subview)
124124
distributionSpecifiers.append(1.flexible)
125125
}
126-
applySubviewDistribution(distributionSpecifiers)
126+
applyVerticalSubviewDistribution(distributionSpecifiers)
127127
}
128128

129129
}

‎Example/Podfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ use_modular_headers!
33
platform :ios, '13.0'
44

55
target 'AccessibilitySnapshotDemo' do
6-
# Paralayout does not support Xcode 12 in the current release version. Support will be added in 1.0 (see
7-
# square/Paralayout#23), so once that's released we can switch back to the release version.
8-
pod 'Paralayout', :git => 'https://github.com/square/Paralayout'
6+
pod 'Paralayout', '= 1.0.0-rc.5'
97

108
target 'SnapshotTests' do
119
inherit! :search_paths

0 commit comments

Comments
 (0)