Skip to content

fix: adopt scene-aware UIWindow lookup for UIScene lifecycle #18

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

Merged
OS-ruimoreiramendes merged 1 commit into from
Jul 30, 2026
Merged

fix: adopt scene-aware UIWindow lookup for UIScene lifecycle #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Sources/IONCameraLib/Extensions/UIApplication+Window.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import UIKit

extension UIApplication {
/// The application's main window.
static var firstKeyWindowForConnectedScenes: UIWindow? {
UIApplication
.shared
.connectedScenes
.flatMap { ($0 as? UIWindowScene)?.windows ?? [] }
.last { $0.isKeyWindow }
}
}
2 changes: 1 addition & 1 deletion Sources/IONCameraLib/Interfaces/Editor/IONCAMRImageEditorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct IONCAMRImageEditorView: View {
.padding()
}
.onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
guard isPortrait != UIApplication.shared.windows.first?.windowScene?.interfaceOrientation.isPortrait else { return }
guard isPortrait != UIApplication.firstKeyWindowForConnectedScenes?.windowScene?.interfaceOrientation.isPortrait else { return }
isPortrait.toggle()
croppingOffset = .init(width: 0.0, height: 0.0)
croppingWidthMagnification = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Sources/IONCameraLib/Interfaces/IONCAMREditorBehaviour.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ final class IONCAMREditorBehaviour: NSObject, IONCAMREditorDelegate {

func editPicture(_ image: UIImage, _ handler: @escaping (UIViewController) -> Void) {
DispatchQueue.main.async {
let isPortrait = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation.isPortrait ?? false
let isPortrait = UIApplication.firstKeyWindowForConnectedScenes?.windowScene?.interfaceOrientation.isPortrait ?? false
let imageEditorView = IONCAMRImageEditorView(delegate: self, image: image, isPortrait: isPortrait)
let viewController = UIHostingController(rootView: imageEditorView)
viewController.modalPresentationStyle = .fullScreen
Expand Down
Loading