From 23a03e4aa2b4be15ba427ff0cd9fd674a2fb372a Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Tue, 28 Jun 2022 15:17:50 -0700 Subject: [PATCH] rename WebView to OmnivoreWebView to avaoid clash with AppKit class --- .../App/Views/WebReader/WebReader.swift | 14 ++++++------- .../{WebView.swift => OmnivoreWebView.swift} | 4 ++-- .../Sources/Views/Article/WebAppView.swift | 20 +++++++++---------- .../Sources/Views/Web/BasicWebAppView.swift | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) rename apple/OmnivoreKit/Sources/Views/Article/{WebView.swift => OmnivoreWebView.swift} (98%) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index 2c8757026..bafbaf6d1 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -77,32 +77,32 @@ import WebKit func updateUIView(_ webView: WKWebView, context: Context) { if annotationSaveTransactionID != context.coordinator.lastSavedAnnotationID { context.coordinator.lastSavedAnnotationID = annotationSaveTransactionID - (webView as? WebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) + (webView as? OmnivoreWebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) } if updateFontFamilyActionID != context.coordinator.previousUpdateFontFamilyActionID { context.coordinator.previousUpdateFontFamilyActionID = updateFontFamilyActionID - (webView as? WebView)?.updateFontFamily() + (webView as? OmnivoreWebView)?.updateFontFamily() } if updateFontActionID != context.coordinator.previousUpdateFontActionID { context.coordinator.previousUpdateFontActionID = updateFontActionID - (webView as? WebView)?.updateFontSize() + (webView as? OmnivoreWebView)?.updateFontSize() } if updateTextContrastActionID != context.coordinator.previousUpdateTextContrastActionID { context.coordinator.previousUpdateTextContrastActionID = updateTextContrastActionID - (webView as? WebView)?.updateTextContrast() + (webView as? OmnivoreWebView)?.updateTextContrast() } if updateMaxWidthActionID != context.coordinator.previousUpdateMaxWidthActionID { context.coordinator.previousUpdateMaxWidthActionID = updateMaxWidthActionID - (webView as? WebView)?.updateMaxWidthPercentage() + (webView as? OmnivoreWebView)?.updateMaxWidthPercentage() } if updateLineHeightActionID != context.coordinator.previousUpdateLineHeightActionID { context.coordinator.previousUpdateLineHeightActionID = updateLineHeightActionID - (webView as? WebView)?.updateLineHeight() + (webView as? OmnivoreWebView)?.updateLineHeight() } if showNavBarActionID != context.coordinator.previousShowNavBarActionID { @@ -112,7 +112,7 @@ import WebKit if shareActionID != context.coordinator.previousShareActionID { context.coordinator.previousShareActionID = shareActionID - (webView as? WebView)?.shareOriginalItem() + (webView as? OmnivoreWebView)?.shareOriginalItem() } // If the webview had been terminated `needsReload` will have been set to true diff --git a/apple/OmnivoreKit/Sources/Views/Article/WebView.swift b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift similarity index 98% rename from apple/OmnivoreKit/Sources/Views/Article/WebView.swift rename to apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift index 3828ea872..bc27bcbb4 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/WebView.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift @@ -8,7 +8,7 @@ public enum WebViewAction: String, CaseIterable { case readingProgressUpdate } -public final class WebView: WKWebView { +public final class OmnivoreWebView: WKWebView { #if os(iOS) private var panGestureRecognizer: UIPanGestureRecognizer? private var tapGestureRecognizer: UITapGestureRecognizer? @@ -95,7 +95,7 @@ public final class WebView: WKWebView { } #if os(iOS) - extension WebView: UIGestureRecognizerDelegate, WKScriptMessageHandler { + extension OmnivoreWebView: UIGestureRecognizerDelegate, WKScriptMessageHandler { func initNativeIOSMenus() { isUserInteractionEnabled = true diff --git a/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift b/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift index 6aa5e1803..bb390ac1b 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift @@ -20,12 +20,12 @@ enum WebViewConfigurationManager { public enum WebViewManager { public static let sharedView = create() - public static func shared() -> WebView { + public static func shared() -> OmnivoreWebView { sharedView } - public static func create() -> WebView { - WebView(frame: CGRect.zero, configuration: WebViewConfigurationManager.create()) + public static func create() -> OmnivoreWebView { + OmnivoreWebView(frame: CGRect.zero, configuration: WebViewConfigurationManager.create()) } } @@ -95,17 +95,17 @@ public enum WebViewManager { if annotationSaveTransactionID != context.coordinator.lastSavedAnnotationID { context.coordinator.lastSavedAnnotationID = annotationSaveTransactionID - (webView as? WebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) + (webView as? OmnivoreWebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) } if sendIncreaseFontSignal { sendIncreaseFontSignal = false - (webView as? WebView)?.updateFontSize() + (webView as? OmnivoreWebView)?.updateFontSize() } if sendDecreaseFontSignal { sendDecreaseFontSignal = false - (webView as? WebView)?.updateFontSize() + (webView as? OmnivoreWebView)?.updateFontSize() } } } @@ -135,7 +135,7 @@ public enum WebViewManager { func makeNSView(context: Context) -> WKWebView { let contentController = WKUserContentController() - let webView = WebView(frame: CGRect.zero) + let webView = OmnivoreWebView(frame: CGRect.zero) webView.navigationDelegate = context.coordinator webView.configuration.userContentController = contentController @@ -170,17 +170,17 @@ public enum WebViewManager { if annotationSaveTransactionID != context.coordinator.lastSavedAnnotationID { context.coordinator.lastSavedAnnotationID = annotationSaveTransactionID - (webView as? WebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) + (webView as? OmnivoreWebView)?.dispatchEvent(.saveAnnotation(annotation: annotation)) } if sendIncreaseFontSignal { sendIncreaseFontSignal = false - (webView as? WebView)?.updateFontSize() + (webView as? OmnivoreWebView)?.updateFontSize() } if sendDecreaseFontSignal { sendDecreaseFontSignal = false - (webView as? WebView)?.updateFontSize() + (webView as? OmnivoreWebView)?.updateFontSize() } } } diff --git a/apple/OmnivoreKit/Sources/Views/Web/BasicWebAppView.swift b/apple/OmnivoreKit/Sources/Views/Web/BasicWebAppView.swift index d03d5c58f..1baaf13d0 100644 --- a/apple/OmnivoreKit/Sources/Views/Web/BasicWebAppView.swift +++ b/apple/OmnivoreKit/Sources/Views/Web/BasicWebAppView.swift @@ -47,7 +47,7 @@ import WebKit } public func makeNSView(context _: Context) -> WKWebView { - let webView = WebView(frame: CGRect.zero) + let webView = OmnivoreWebView(frame: CGRect.zero) if let url = request.url { // Dark mode is still rendering a white background on mac for some reason. // Forcing light mode for now until we figure out a fix