Skip to content

Commit f0f100c

Browse files
authored
Merge pull request #75 from hyperoslo/fix/crash
Check parent before adding constraints
2 parents 5ef2907 + 0b9a4f9 commit f0f100c

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

Example/GalleryDemo/GalleryDemo/Sources/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
99
lazy var navigationController: UINavigationController = { [unowned self] in
1010
let controller = UINavigationController(rootViewController: self.viewController)
1111
return controller
12-
}()
12+
}()
1313

1414
lazy var viewController: ViewController = {
1515
let controller = ViewController()
1616
return controller
17-
}()
17+
}()
1818

1919
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
2020
window = UIWindow(frame: UIScreen.main.bounds)

Sources/Utils/Pages/PagesController.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,25 @@ class PagesController: UIViewController {
8989
let usePageIndicator = controllers.count > 1
9090
if usePageIndicator {
9191
view.addSubview(pageIndicator)
92-
}
93-
view.addSubview(scrollView)
94-
scrollView.addSubview(scrollViewContentView)
95-
96-
Constraint.on(
97-
pageIndicator.leftAnchor.constraint(equalTo: pageIndicator.superview!.leftAnchor),
98-
pageIndicator.rightAnchor.constraint(equalTo: pageIndicator.superview!.rightAnchor),
99-
pageIndicator.heightAnchor.constraint(equalToConstant: 40)
100-
)
101-
102-
if #available(iOS 11, *) {
103-
Constraint.on(
104-
pageIndicator.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
105-
)
106-
} else {
10792
Constraint.on(
108-
pageIndicator.bottomAnchor.constraint(equalTo: pageIndicator.superview!.bottomAnchor)
93+
pageIndicator.leftAnchor.constraint(equalTo: pageIndicator.superview!.leftAnchor),
94+
pageIndicator.rightAnchor.constraint(equalTo: pageIndicator.superview!.rightAnchor),
95+
pageIndicator.heightAnchor.constraint(equalToConstant: 40)
10996
)
97+
98+
if #available(iOS 11, *) {
99+
Constraint.on(
100+
pageIndicator.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
101+
)
102+
} else {
103+
Constraint.on(
104+
pageIndicator.bottomAnchor.constraint(equalTo: pageIndicator.superview!.bottomAnchor)
105+
)
106+
}
110107
}
108+
109+
view.addSubview(scrollView)
110+
scrollView.addSubview(scrollViewContentView)
111111

112112
scrollView.g_pinUpward()
113113
if usePageIndicator {

0 commit comments

Comments
 (0)