Merge pull request #122 from cashapp/entin/viewDidLayoutSubviews

Stop using viewDidLayoutSubviews

Author: NickEntin

Example/AccessibilitySnapshot/AccessibilityCustomActionsViewController.swift

@@ -19,49 +19,61 @@ import UIKit
 
 final class AccessibilityCustomActionsViewController: AccessibilityViewController {
 
-    // MARK: - Life Cycle
-
-    init() {
-        self.views = [
-            .init(includeLabel: true, includeHint: true),
-            .init(includeLabel: true, includeHint: false),
-            .init(includeLabel: false, includeHint: true),
-            .init(includeLabel: false, includeHint: false),
-        ]
+    // MARK: - UIViewController
 
-        super.init(nibName: nil, bundle: nil)
+    override func loadView() {
+        view = View(
+            views: [
+                .init(includeLabel: true, includeHint: true),
+                .init(includeLabel: true, includeHint: false),
+                .init(includeLabel: false, includeHint: true),
+                .init(includeLabel: false, includeHint: false),
+            ]
+        )
     }
 
-    @available(*, unavailable)
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
+}
 
-    // MARK: - Private Properties
+// MARK: -
 
-    private let views: [CustomActionView]
+private extension AccessibilityCustomActionsViewController {
 
-    // MARK: - UIViewController
+    final class View: UIView {
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
+        // MARK: - Life Cycle
 
-        views.forEach(view.addSubview)
-    }
+        init(views: [CustomActionView], frame: CGRect = .zero) {
+            self.views = views
 
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
+            super.init(frame: frame)
 
-        views.forEach { $0.frame.size = .init(width: view.bounds.width / 2, height: 50) }
+            views.forEach(addSubview)
+        }
 
-        let statusBarHeight = UIApplication.shared.statusBarFrame.height
+        @available(*, unavailable)
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+        // MARK: - Private Properties
+
+        private let views: [CustomActionView]
 
-        var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
-        for subview in views {
-            distributionSpecifiers.append(subview)
-            distributionSpecifiers.append(1.flexible)
+        // MARK: - UIView
+
+        override func layoutSubviews() {
+            views.forEach { $0.frame.size = .init(width: bounds.width / 2, height: 50) }
+
+            let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+
+            var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
+            for subview in views {
+                distributionSpecifiers.append(subview)
+                distributionSpecifiers.append(1.flexible)
+            }
+            applySubviewDistribution(distributionSpecifiers)
         }
-        view.applySubviewDistribution(distributionSpecifiers)
+
     }
 
 }

Example/AccessibilitySnapshot/AccessibilityPathViewController.swift

@@ -19,61 +19,56 @@ import UIKit
 
 final class AccessibilityPathViewController: AccessibilityViewController {
 
-    // MARK: - Life Cycle
-
-    init() {
-        views = [
-            AccessibilityPathView(relativePath: UIBezierPath(
-                roundedRect: CGRect(x: 0, y: 0, width: 60, height: 40),
-                cornerRadius: 20
-            )),
-            AccessibilityPathView(relativePath: UIBezierPath(
-                arcCenter: CGPoint(x: 30, y: 20),
-                radius: 20,
-                startAngle: 0,
-                endAngle: 1.57,
-                clockwise: true
-            )),
-            AccessibilityPathView(relativePath: UIBezierPath(
-                ovalIn: CGRect(x: 0, y: 0, width: 60, height: 40)
-            )),
-            AccessibilityPathView(relativePath: UIBezierPath(
-                cgPath: {
-                    let path = CGMutablePath()
-                    path.move(to: .zero)
-                    path.addQuadCurve(
-                        to: .init(x: 60, y: 40),
-                        control: .init(x: 15, y: 30)
-                    )
-                    return path
-                }()
-            )),
-            AccessibilityPathView(relativePath: UIBezierPath(
-                cgPath: {
-                    let path = CGMutablePath()
-                    path.move(to: CGPoint(x: 0, y: 40))
-                    path.addLine(to: CGPoint(x: 20, y: 15))
-                    path.addLine(to: CGPoint(x: 40, y: 25))
-                    path.addLine(to: CGPoint(x: 60, y: 0))
-                    return path
-                }()
-            )),
-        ]
-
-        super.init(nibName: nil, bundle: nil)
-    }
-
-    @available(*, unavailable)
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
     // MARK: - Private Properties
 
-    private let views: [AccessibilityPathView]
+    private var views: [AccessibilityPathView] {
+        return (view as! View).views
+    }
 
     // MARK: - UIViewController
 
+    override func loadView() {
+        view = View(
+            views: [
+                AccessibilityPathView(relativePath: UIBezierPath(
+                    roundedRect: CGRect(x: 0, y: 0, width: 60, height: 40),
+                    cornerRadius: 20
+                )),
+                AccessibilityPathView(relativePath: UIBezierPath(
+                    arcCenter: CGPoint(x: 30, y: 20),
+                    radius: 20,
+                    startAngle: 0,
+                    endAngle: 1.57,
+                    clockwise: true
+                )),
+                AccessibilityPathView(relativePath: UIBezierPath(
+                    ovalIn: CGRect(x: 0, y: 0, width: 60, height: 40)
+                )),
+                AccessibilityPathView(relativePath: UIBezierPath(
+                    cgPath: {
+                        let path = CGMutablePath()
+                        path.move(to: .zero)
+                        path.addQuadCurve(
+                            to: .init(x: 60, y: 40),
+                            control: .init(x: 15, y: 30)
+                        )
+                        return path
+                    }()
+                )),
+                AccessibilityPathView(relativePath: UIBezierPath(
+                    cgPath: {
+                        let path = CGMutablePath()
+                        path.move(to: CGPoint(x: 0, y: 40))
+                        path.addLine(to: CGPoint(x: 20, y: 15))
+                        path.addLine(to: CGPoint(x: 40, y: 25))
+                        path.addLine(to: CGPoint(x: 60, y: 0))
+                        return path
+                    }()
+                )),
+            ]
+        )
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -82,21 +77,49 @@ final class AccessibilityPathViewController: AccessibilityViewController {
             subview.isAccessibilityElement = true
             subview.accessibilityLabel = "Label"
             subview.frame.size = .init(width: 60, height: 40)
-            view.addSubview(subview)
         }
     }
 
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
+}
 
-        let statusBarHeight = UIApplication.shared.statusBarFrame.height
+// MARK: -
 
-        var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
-        for subview in views {
-            distributionSpecifiers.append(subview)
-            distributionSpecifiers.append(1.flexible)
+private extension AccessibilityPathViewController {
+
+    final class View: UIView {
+
+        // MARK: - Life Cycle
+
+        init(views: [AccessibilityPathView], frame: CGRect = .zero) {
+            self.views = views
+
+            super.init(frame: frame)
+
+            views.forEach(addSubview(_:))
+        }
+
+        @available(*, unavailable)
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
         }
-        view.applySubviewDistribution(distributionSpecifiers)
+
+        // MARK: - Public Properties
+
+        let views: [AccessibilityPathView]
+
+        // MARK: - UIView
+
+        override func layoutSubviews() {
+            let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+
+            var distributionSpecifiers: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
+            for subview in views {
+                distributionSpecifiers.append(subview)
+                distributionSpecifiers.append(1.flexible)
+            }
+            applySubviewDistribution(distributionSpecifiers)
+        }
+
     }
 
 }

Example/AccessibilitySnapshot/ButtonAccessibilityTraitsViewController.swift

@@ -82,10 +82,16 @@ final class ButtonAccessibilityTraitsViewController: AccessibilityViewController
 
     // MARK: - Private Properties
 
-    private let buttons = (0..<27).map { _ in UIButton() }
+    private var buttons: [UIButton] {
+        return (view as! View).buttons
+    }
 
     // MARK: - UIViewController
 
+    override func loadView() {
+        view = View()
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -95,7 +101,6 @@ final class ButtonAccessibilityTraitsViewController: AccessibilityViewController
             button.setTitle(numberFormatter.string(from: NSNumber(value: (index + 1))), for: .normal)
             button.setTitleColor(.black, for: .normal)
             button.isAccessibilityElement = true
-            view.addSubview(button)
         }
 
         view.accessibilityElements = buttons
@@ -156,42 +161,69 @@ final class ButtonAccessibilityTraitsViewController: AccessibilityViewController
         buttons[26].accessibilityTraits = accessibilityTraits.reduce(.none, { $0.union($1) })
     }
 
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
+}
+
+// MARK: -
 
-        buttons.forEach { $0.sizeToFit() }
+extension ButtonAccessibilityTraitsViewController {
 
-        let statusBarHeight = UIApplication.shared.statusBarFrame.height
+    final class View: UIView {
 
-        let additionalButtonSpacers = (buttons.count % 3 == 0) ? 0 : (3 - (buttons.count % 3))
-        let buttonsPerColumn = (buttons.count + additionalButtonSpacers) / 3
+        // MARK: - Life Cycle
 
-        let outerMargin = view.bounds.width / 5
+        override init(frame: CGRect) {
+            super.init(frame: frame)
 
-        var leftColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
-        for button in buttons[0..<buttonsPerColumn] {
-            leftColSubviewDistribution.append(button)
-            leftColSubviewDistribution.append(1.flexible)
+            buttons.forEach(addSubview(_:))
         }
-        view.applySubviewDistribution(leftColSubviewDistribution, alignment: .leading(inset: outerMargin))
 
-        var centerColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
-        for button in buttons[buttonsPerColumn..<(2 * buttonsPerColumn)] {
-            centerColSubviewDistribution.append(button)
-            centerColSubviewDistribution.append(1.flexible)
+        @available(*, unavailable)
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
         }
-        view.applySubviewDistribution(centerColSubviewDistribution)
 
-        var rightColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
-        for button in buttons[(2 * buttonsPerColumn)..<buttons.count] {
-            rightColSubviewDistribution.append(button)
-            rightColSubviewDistribution.append(1.flexible)
-        }
-        for _ in 0..<additionalButtonSpacers {
-            rightColSubviewDistribution.append(buttons[0].frame.height.fixed)
-            rightColSubviewDistribution.append(1.flexible)
+        // MARK: - Public Properties
+
+        let buttons = (0..<27).map { _ in UIButton() }
+
+        // MARK: - UIView
+
+        override func layoutSubviews() {
+            buttons.forEach { $0.sizeToFit() }
+
+            let statusBarHeight = window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
+
+            let additionalButtonSpacers = (buttons.count % 3 == 0) ? 0 : (3 - (buttons.count % 3))
+            let buttonsPerColumn = (buttons.count + additionalButtonSpacers) / 3
+
+            let outerMargin = bounds.width / 5
+
+            var leftColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
+            for button in buttons[0..<buttonsPerColumn] {
+                leftColSubviewDistribution.append(button)
+                leftColSubviewDistribution.append(1.flexible)
+            }
+            applySubviewDistribution(leftColSubviewDistribution, alignment: .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)
+
+            var rightColSubviewDistribution: [ViewDistributionSpecifying] = [ statusBarHeight.fixed, 1.flexible ]
+            for button in buttons[(2 * buttonsPerColumn)..<buttons.count] {
+                rightColSubviewDistribution.append(button)
+                rightColSubviewDistribution.append(1.flexible)
+            }
+            for _ in 0..<additionalButtonSpacers {
+                rightColSubviewDistribution.append(buttons[0].frame.height.fixed)
+                rightColSubviewDistribution.append(1.flexible)
+            }
+            applySubviewDistribution(rightColSubviewDistribution, alignment: .trailing(inset: outerMargin))
         }
-        view.applySubviewDistribution(rightColSubviewDistribution, alignment: .trailing(inset: outerMargin))
+
     }
 
 }