mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2024-12-25 14:32:20 +01:00
Fix laggy Safari presenter
This commit is contained in:
parent
10946fef10
commit
60f8df9a04
@ -14,7 +14,7 @@ private struct SafariRouter: ViewModifier {
|
||||
@EnvironmentObject private var preferences: UserPreferences
|
||||
@EnvironmentObject private var routerPath: RouterPath
|
||||
|
||||
@State private var safari: SFSafariViewController?
|
||||
@State private var presentedURL: URL?
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
content
|
||||
@ -46,57 +46,28 @@ private struct SafariRouter: ViewModifier {
|
||||
return .systemAction
|
||||
}
|
||||
|
||||
let safari = SFSafariViewController(url: url)
|
||||
safari.preferredBarTintColor = UIColor(theme.primaryBackgroundColor)
|
||||
safari.preferredControlTintColor = UIColor(theme.tintColor)
|
||||
|
||||
self.safari = safari
|
||||
|
||||
presentedURL = url
|
||||
return .handled
|
||||
}
|
||||
}
|
||||
.background {
|
||||
SafariPresenter(safari: safari)
|
||||
}
|
||||
.sheet(item: $presentedURL, content: { url in
|
||||
SafariView(url: url)
|
||||
.edgesIgnoringSafeArea(.all)
|
||||
})
|
||||
}
|
||||
|
||||
struct SafariPresenter: UIViewRepresentable {
|
||||
var safari: SFSafariViewController?
|
||||
struct SafariView: UIViewControllerRepresentable {
|
||||
let url: URL
|
||||
|
||||
func makeUIView(context _: Context) -> UIView {
|
||||
let view = UIView(frame: .zero)
|
||||
view.isHidden = true
|
||||
view.isUserInteractionEnabled = false
|
||||
return view
|
||||
func makeUIViewController(context _: UIViewControllerRepresentableContext<SafariView>) -> SFSafariViewController {
|
||||
let safari = SFSafariViewController(url: url)
|
||||
safari.preferredBarTintColor = UIColor(Theme.shared.primaryBackgroundColor)
|
||||
safari.preferredControlTintColor = UIColor(Theme.shared.tintColor)
|
||||
return safari
|
||||
}
|
||||
|
||||
func updateUIView(_ uiView: UIView, context _: Context) {
|
||||
guard let safari = safari, let viewController = uiView.findTopViewController() else { return }
|
||||
viewController.present(safari, animated: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private extension UIView {
|
||||
func findTopViewController() -> UIViewController? {
|
||||
if let nextResponder = next as? UIViewController {
|
||||
return nextResponder.topViewController()
|
||||
} else if let nextResponder = next as? UIView {
|
||||
return nextResponder.findTopViewController()
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private extension UIViewController {
|
||||
func topViewController() -> UIViewController? {
|
||||
if let nvc = self as? UINavigationController {
|
||||
return nvc.visibleViewController?.topViewController()
|
||||
} else if let tbc = self as? UITabBarController, let selected = tbc.selectedViewController {
|
||||
return selected.topViewController()
|
||||
} else if let presented = presentedViewController {
|
||||
return presented.topViewController()
|
||||
}
|
||||
return self
|
||||
func updateUIViewController(_: SFSafariViewController, context _: UIViewControllerRepresentableContext<SafariView>) {}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user