Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adopted trait registration API and fixed iOS 17 crash #19

Merged
merged 2 commits into from Sep 12, 2023
Merged

Adopted trait registration API and fixed iOS 17 crash #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf7f7c
Adopted trait registration API and fixed iOS 17 crash
FelixLisczyk Sep 1, 2023
f402e7e
Fixed compilation on Xcode 14
FelixLisczyk Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/UIOnboardingViewController.swift
View file
Open in desktop
Expand Up @@ -52,6 +52,14 @@ final class UIOnboardingViewController: UIViewController {
self.screen = screen
super.init(nibName: nil, bundle: nil)
modalPresentationStyle = .fullScreen

#if swift(>=5.9)
if #available(iOS 17.0, *) {
registerForTraitChanges([UITraitHorizontalSizeClass.self]) { (self: Self, _) in
self.handleHorizontalSizeClassChange()
}
}
#endif
}

required init?(coder: NSCoder) {
Expand Down Expand Up @@ -91,6 +99,16 @@ final class UIOnboardingViewController: UIViewController {
}

override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
if #unavailable(iOS 17.0), traitCollection.horizontalSizeClass != previousTraitCollection?.horizontalSizeClass {
// iOS 17+ uses the trait registration API instead. (`registerForTraitChanges(_:handler:)`)
handleHorizontalSizeClassChange()
}
}

private func handleHorizontalSizeClassChange() {
// Check if the view is visible and the properties are initialized.
guard viewIfLoaded?.window != nil else { return }

onboardingStackView.onboardingTitleLabelStack.configureFont(traitCollection.horizontalSizeClass == .regular ? 80 : (UIScreenType.isiPhoneSE || UIScreenType.isiPhone6s ? 41 : 44))

continueButtonHeight.constant = UIFontMetrics.default.scaledValue(for: traitCollection.horizontalSizeClass == .regular ? 50 : (UIScreenType.isiPhoneSE ? 48 : 52))
Expand Down
18 changes: 18 additions & 0 deletions Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingCell.swift
View file
Open in desktop
Expand Up @@ -56,6 +56,14 @@ final class UIOnboardingCell: UITableViewCell {

override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)

#if swift(>=5.9)
if #available(iOS 17.0, *) {
registerForTraitChanges([UITraitHorizontalSizeClass.self]) { (self: Self, _) in
self.handleHorizontalSizeClassChange()
}
}
#endif
}

required init?(coder: NSCoder) {
Expand Down Expand Up @@ -113,6 +121,16 @@ final class UIOnboardingCell: UITableViewCell {
}

override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
if #unavailable(iOS 17.0), traitCollection.horizontalSizeClass != previousTraitCollection?.horizontalSizeClass {
// iOS 17+ uses the trait registration API instead. (`registerForTraitChanges(_:handler:)`)
handleHorizontalSizeClassChange()
}
}

private func handleHorizontalSizeClassChange() {
// Check if the view is visible and the properties are initialized.
guard window != nil else { return }

configureFonts()

stackBottom.constant = traitCollection.horizontalSizeClass == .regular ? -48 : -12
Expand Down
18 changes: 18 additions & 0 deletions Sources/UIOnboarding/UIOnboardingViewController.swift
View file
Open in desktop
Expand Up @@ -52,6 +52,14 @@ public final class UIOnboardingViewController: UIViewController {
self.screen = screen
super.init(nibName: nil, bundle: nil)
modalPresentationStyle = .fullScreen

#if swift(>=5.9)
if #available(iOS 17.0, *) {
registerForTraitChanges([UITraitHorizontalSizeClass.self]) { (self: Self, _) in
self.handleHorizontalSizeClassChange()
}
}
#endif
}

required init?(coder: NSCoder) {
Expand Down Expand Up @@ -91,6 +99,16 @@ public final class UIOnboardingViewController: UIViewController {
}

public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
if #unavailable(iOS 17.0), traitCollection.horizontalSizeClass != previousTraitCollection?.horizontalSizeClass {
// iOS 17+ uses the trait registration API instead. (`registerForTraitChanges(_:handler:)`)
handleHorizontalSizeClassChange()
}
}

private func handleHorizontalSizeClassChange() {
// Check if the view is visible and the properties are initialized.
guard viewIfLoaded?.window != nil else { return }

onboardingStackView.onboardingTitleLabelStack.configureFont(traitCollection.horizontalSizeClass == .regular ? 80 : (UIScreenType.isiPhoneSE || UIScreenType.isiPhone6s ? 41 : 44))

continueButtonHeight.constant = UIFontMetrics.default.scaledValue(for: traitCollection.horizontalSizeClass == .regular ? 50 : (UIScreenType.isiPhoneSE ? 48 : 52))
Expand Down
18 changes: 18 additions & 0 deletions Sources/UIOnboarding/Views/UIOnboardingCell.swift
View file
Open in desktop
Expand Up @@ -56,6 +56,14 @@ final class UIOnboardingCell: UITableViewCell {

override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)

#if swift(>=5.9)
if #available(iOS 17.0, *) {
registerForTraitChanges([UITraitHorizontalSizeClass.self]) { (self: Self, _) in
self.handleHorizontalSizeClassChange()
}
}
#endif
}

required init?(coder: NSCoder) {
Expand Down Expand Up @@ -113,6 +121,16 @@ final class UIOnboardingCell: UITableViewCell {
}

override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
if #unavailable(iOS 17.0), traitCollection.horizontalSizeClass != previousTraitCollection?.horizontalSizeClass {
// iOS 17+ uses the trait registration API instead. (`registerForTraitChanges(_:handler:)`)
handleHorizontalSizeClassChange()
}
}

private func handleHorizontalSizeClassChange() {
// Check if the view is visible and the properties are initialized.
guard window != nil else { return }

configureFonts()

stackBottom.constant = traitCollection.horizontalSizeClass == .regular ? -48 : -12
Expand Down