diff --git a/Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift b/Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift index f0c12600..99a86d71 100644 --- a/Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift +++ b/Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift @@ -62,7 +62,7 @@ private extension AccessibilityCustomActionsViewController { // MARK: - UIView override func layoutSubviews() { - views.forEach { $0.frame.size = .init(width: bounds.width / 2, height: 50) } + views.forEach { $0.bounds.size = .init(width: bounds.width / 2, height: 50) } let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0 @@ -71,7 +71,7 @@ private extension AccessibilityCustomActionsViewController { distributionSpecifiers.append(subview) distributionSpecifiers.append(1.flexible) } - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } diff --git a/Example/AccessibilitySnapshot/AccessibilityPathViewController.swift b/Example/AccessibilitySnapshot/AccessibilityPathViewController.swift index 39a20bf1..080c4e84 100644 --- a/Example/AccessibilitySnapshot/AccessibilityPathViewController.swift +++ b/Example/AccessibilitySnapshot/AccessibilityPathViewController.swift @@ -117,7 +117,7 @@ private extension AccessibilityPathViewController { distributionSpecifiers.append(subview) distributionSpecifiers.append(1.flexible) } - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } diff --git a/Example/AccessibilitySnapshot/ActivationPointViewController.swift b/Example/AccessibilitySnapshot/ActivationPointViewController.swift index a47adc0b..7ab287f7 100644 --- a/Example/AccessibilitySnapshot/ActivationPointViewController.swift +++ b/Example/AccessibilitySnapshot/ActivationPointViewController.swift @@ -65,12 +65,12 @@ private extension ActivationPointViewController { // MARK: - UIView override func layoutSubviews() { - button.resize(toFit: bounds.size) - customActivationPointView.resize(toFit: bounds.size) + button.sizeToFit(bounds.size) + customActivationPointView.sizeToFit(bounds.size) let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0 - applySubviewDistribution( + applyVerticalSubviewDistribution( [ statusBarHeight.fixed, 1.flexible, @@ -122,8 +122,8 @@ private extension ActivationPointViewController { label.sizeToFit() switchButton.sizeToFit() - label.alignToSuperview(.leftCenter, inset: 32) - switchButton.alignToSuperview(.rightCenter, inset: 32) + label.align(withSuperview: .leftCenter, inset: 32) + switchButton.align(withSuperview: .rightCenter, inset: 32) label.isAccessibilityElement = false } @@ -150,7 +150,8 @@ private extension ActivationPointViewController { get { // Set the activation point to the center of switch so tapping the parent element toggles the switch. return Position.center.point( - in: UIAccessibility.convertToScreenCoordinates(switchButton.frame, in: self) + in: UIAccessibility.convertToScreenCoordinates(switchButton.frame, in: self), + layoutDirection: effectiveUserInterfaceLayoutDirection ) } set { diff --git a/Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift b/Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift index 0b9e7fc9..25c98a32 100644 --- a/Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift +++ b/Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift @@ -203,14 +203,17 @@ extension ButtonAccessibilityTraitsViewController { leftColSubviewDistribution.append(button) leftColSubviewDistribution.append(1.flexible) } - applySubviewDistribution(leftColSubviewDistribution, alignment: .leading(inset: outerMargin)) + applyVerticalSubviewDistribution( + leftColSubviewDistribution, + orthogonalAlignment: .leading(inset: outerMargin) + ) var centerColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ] for button in buttons[buttonsPerColumn..<(2 * buttonsPerColumn)] { centerColSubviewDistribution.append(button) centerColSubviewDistribution.append(1.flexible) } - applySubviewDistribution(centerColSubviewDistribution) + applyVerticalSubviewDistribution(centerColSubviewDistribution) var rightColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ] for button in buttons[(2 * buttonsPerColumn).. CGSize { diff --git a/Example/AccessibilitySnapshot/SwitchControlViewController.swift b/Example/AccessibilitySnapshot/SwitchControlViewController.swift index 14fdc333..111c36f0 100644 --- a/Example/AccessibilitySnapshot/SwitchControlViewController.swift +++ b/Example/AccessibilitySnapshot/SwitchControlViewController.swift @@ -145,7 +145,7 @@ private extension SwitchControlViewController { 1.flexible, ] ) - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } diff --git a/Example/AccessibilitySnapshot/TabBarViewController.swift b/Example/AccessibilitySnapshot/TabBarViewController.swift index 3ce408f2..bc995d15 100644 --- a/Example/AccessibilitySnapshot/TabBarViewController.swift +++ b/Example/AccessibilitySnapshot/TabBarViewController.swift @@ -126,7 +126,7 @@ extension TabBarViewController { distributionSpecifiers.append(subview) distributionSpecifiers.append(1.flexible) } - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } @@ -205,7 +205,7 @@ private final class TabBarTraitView: UIView { override func layoutSubviews() { tabs.forEach { $0.frame.size.height = bounds.height } - spreadOutSubviews(tabs, margin: 0) + horizontallySpreadSubviews(tabs, margin: 0) } override func sizeThatFits(_ size: CGSize) -> CGSize { @@ -270,13 +270,13 @@ private final class TabBarTraitView: UIView { outerLabelContainer.frame = bounds leftLabel.sizeToFit() - leftLabel.alignToSuperview(.leftCenter, inset: 4) + leftLabel.capInsetsAlignmentProxy.align(withSuperview: .leftCenter, inset: 4) rightLabel.sizeToFit() - rightLabel.alignToSuperview(.rightCenter, inset: 4) + rightLabel.capInsetsAlignmentProxy.align(withSuperview: .rightCenter, inset: 4) middleLabel.sizeToFit() - middleLabel.alignToSuperview(.center) + middleLabel.capInsetsAlignmentProxy.align(withSuperview: .center) } } @@ -352,7 +352,7 @@ private final class TabBarTraitContainerView: UIView { override func layoutSubviews() { itemLabels.forEach { $0.frame.size.height = bounds.height } - spreadOutSubviews(itemLabels, margin: 0) + horizontallySpreadSubviews(itemLabels, margin: 0) for (label, element) in zip(itemLabels, accessibilityElements as! [UIAccessibilityElement]) { element.accessibilityFrameInContainerSpace = label.frame diff --git a/Example/AccessibilitySnapshot/UserInterfaceDirectionViewController.swift b/Example/AccessibilitySnapshot/UserInterfaceDirectionViewController.swift index 4f3a01d0..23181698 100644 --- a/Example/AccessibilitySnapshot/UserInterfaceDirectionViewController.swift +++ b/Example/AccessibilitySnapshot/UserInterfaceDirectionViewController.swift @@ -74,7 +74,7 @@ private extension UserIntefaceDirectionViewController { // MARK: - UIView override func layoutSubviews() { - let statusBarHeight = UIApplication.shared.statusBarFrame.height + let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0 var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ] for subview in [unspecifiedView, playbackView, spatialView, forceLeftToRightView, forceRightToLeftView] { @@ -82,7 +82,7 @@ private extension UserIntefaceDirectionViewController { distributionSpecifiers.append(subview) distributionSpecifiers.append(1.flexible) } - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } @@ -125,7 +125,7 @@ private extension UserIntefaceDirectionViewController { // MARK: - UIView override func layoutSubviews() { - applySubviewDistribution(subviews, axis: .horizontal) + applyHorizontalSubviewDistribution(subviews) } } diff --git a/Example/AccessibilitySnapshot/ViewAccessibilityPropertiesViewController.swift b/Example/AccessibilitySnapshot/ViewAccessibilityPropertiesViewController.swift index bac70eeb..feb0feb7 100644 --- a/Example/AccessibilitySnapshot/ViewAccessibilityPropertiesViewController.swift +++ b/Example/AccessibilitySnapshot/ViewAccessibilityPropertiesViewController.swift @@ -123,7 +123,7 @@ extension ViewAccessibilityPropertiesViewController { distributionSpecifiers.append(subview) distributionSpecifiers.append(1.flexible) } - applySubviewDistribution(distributionSpecifiers) + applyVerticalSubviewDistribution(distributionSpecifiers) } } diff --git a/Example/Podfile b/Example/Podfile index 1cc5b504..72110a55 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -3,9 +3,7 @@ use_modular_headers! platform :ios, '13.0' target 'AccessibilitySnapshotDemo' do - # Paralayout does not support Xcode 12 in the current release version. Support will be added in 1.0 (see - # square/Paralayout#23), so once that's released we can switch back to the release version. - pod 'Paralayout', :git => 'https://github.com/square/Paralayout' + pod 'Paralayout', '= 1.0.0-rc.5' target 'SnapshotTests' do inherit! :search_paths diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 4c1ab1de..ea358311 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -11,38 +11,32 @@ PODS: - iOSSnapshotTestCase/Core (8.0.0) - iOSSnapshotTestCase/SwiftSupport (8.0.0): - iOSSnapshotTestCase/Core - - Paralayout (0.9.1) + - Paralayout (1.0.0-rc.5) - SnapshotTesting (1.7.2) DEPENDENCIES: - AccessibilitySnapshot/Core (from `../AccessibilitySnapshot.podspec`) - AccessibilitySnapshot/iOSSnapshotTestCase (from `../AccessibilitySnapshot.podspec`) - AccessibilitySnapshot/SnapshotTesting (from `../AccessibilitySnapshot.podspec`) - - Paralayout (from `https://github.com/square/Paralayout`) + - Paralayout (= 1.0.0-rc.5) - SnapshotTesting (= 1.7.2) SPEC REPOS: trunk: - iOSSnapshotTestCase + - Paralayout - SnapshotTesting EXTERNAL SOURCES: AccessibilitySnapshot: :path: "../AccessibilitySnapshot.podspec" - Paralayout: - :git: https://github.com/square/Paralayout - -CHECKOUT OPTIONS: - Paralayout: - :commit: 0aaf2f7576a98258d363c853b5b6c63a40bced4f - :git: https://github.com/square/Paralayout SPEC CHECKSUMS: AccessibilitySnapshot: d55ec4ea875392d4b753893cd132e522be031997 iOSSnapshotTestCase: a670511f9ee3829c2b9c23e6e68f315fd7b6790f - Paralayout: f4d6727fca5b592eb93a7cc408e45404599a4b0a + Paralayout: 844978af530a061a31d849c7b554510190b9cddf SnapshotTesting: 8caa6661fea7c8019d5b46de77c16bab99c36c5c -PODFILE CHECKSUM: fd2807639b60c8ef2714d8401e711fb0df567b5b +PODFILE CHECKSUM: de5390900844b21156469b30e094a6bba820f0df COCOAPODS: 1.11.3 diff --git a/Example/SnapshotTests/AccessibilityPropertiesTests.swift b/Example/SnapshotTests/AccessibilityPropertiesTests.swift index b29da129..bbd0e1b8 100644 --- a/Example/SnapshotTests/AccessibilityPropertiesTests.swift +++ b/Example/SnapshotTests/AccessibilityPropertiesTests.swift @@ -74,7 +74,7 @@ final class AccessibilitySnapshotTests: SnapshotTestCase { view.addSubview(label) label.sizeToFit() - label.center = view.point(at: .center) + label.align(withSuperview: .center) if ProcessInfo().operatingSystemVersion.majorVersion != 13 { SnapshotVerifyAccessibility(view, identifier: "monochrome", useMonochromeSnapshot: true) @@ -104,7 +104,7 @@ final class AccessibilitySnapshotTests: SnapshotTestCase { view.addSubview(label) label.sizeToFit() - label.center = view.point(at: .center) + label.align(withSuperview: .center) let viewController = UIViewController() viewController.view = view @@ -129,7 +129,7 @@ final class AccessibilitySnapshotTests: SnapshotTestCase { view.addSubview(label) label.sizeToFit() - label.center = view.point(at: .center) + label.align(withSuperview: .center) let viewController = UIViewController() viewController.view.addSubview(view) diff --git a/Example/SnapshotTests/AccessibleContainerView.swift b/Example/SnapshotTests/AccessibleContainerView.swift index bfa054d2..643399eb 100644 --- a/Example/SnapshotTests/AccessibleContainerView.swift +++ b/Example/SnapshotTests/AccessibleContainerView.swift @@ -60,7 +60,7 @@ final class AccessibleContainerView: UIView { distribution.removeLast() distribution.append(outerMargin.fixed) - applySubviewDistribution(distribution, axis: .horizontal) + applyHorizontalSubviewDistribution(distribution) } override func sizeThatFits(_ size: CGSize) -> CGSize { diff --git a/Example/SnapshotTests/DefaultControlsTests.swift b/Example/SnapshotTests/DefaultControlsTests.swift index 32e5971f..7ff60683 100644 --- a/Example/SnapshotTests/DefaultControlsTests.swift +++ b/Example/SnapshotTests/DefaultControlsTests.swift @@ -131,8 +131,8 @@ private final class ContainerView: UIView { // MARK: - UIView override func layoutSubviews() { - control.frame.size = control.sizeThatFits(bounds.insetBy(dx: 10, dy: 10).size) - control.alignToSuperview(.center) + control.bounds.size = control.sizeThatFits(bounds.insetBy(dx: 10, dy: 10).size) + control.align(withSuperview: .center) } override func sizeThatFits(_ size: CGSize) -> CGSize { diff --git a/Example/SnapshotTests/SwitchControlsTests.swift b/Example/SnapshotTests/SwitchControlsTests.swift index 6efe2dbd..d08a1f51 100644 --- a/Example/SnapshotTests/SwitchControlsTests.swift +++ b/Example/SnapshotTests/SwitchControlsTests.swift @@ -174,7 +174,7 @@ private final class ContainerView: UIView { override func layoutSubviews() { control.frame.size = control.sizeThatFits(bounds.insetBy(dx: 10, dy: 10).size) - control.alignToSuperview(.center) + control.align(withSuperview: .center) } override func sizeThatFits(_ size: CGSize) -> CGSize {