Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use enum to manage events sent to web view

Browse Source
This commit is contained in:
Satindar Dhillon
2022-06-03 15:17:14 -07:00
parent c6ba1bee57
commit 2f95c02ad3
3 changed files with 101 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift
View File

@ -78,37 +78,37 @@ import WebKit
func updateUIView(_ webView: WKWebView, context: Context) {
if annotationSaveTransactionID != context.coordinator.lastSavedAnnotationID {
context.coordinator.lastSavedAnnotationID = annotationSaveTransactionID
(webView as? WebView)?.saveAnnotation(annotation: annotation)
(webView as? WebView)?.dispatchEvent(.saveAnnotation(annotation: annotation))
}
if increaseFontActionID != context.coordinator.previousIncreaseFontActionID {
context.coordinator.previousIncreaseFontActionID = increaseFontActionID
(webView as? WebView)?.increaseFontSize()
(webView as? WebView)?.updateFontSize()
}
if decreaseFontActionID != context.coordinator.previousDecreaseFontActionID {
context.coordinator.previousDecreaseFontActionID = decreaseFontActionID
(webView as? WebView)?.decreaseFontSize()
(webView as? WebView)?.updateFontSize()
}
if increaseMarginActionID != context.coordinator.previousIncreaseMarginActionID {
context.coordinator.previousIncreaseMarginActionID = increaseMarginActionID
(webView as? WebView)?.increaseMargin()
(webView as? WebView)?.updateMargin()
}
if decreaseMarginActionID != context.coordinator.previousDecreaseMarginActionID {
context.coordinator.previousDecreaseMarginActionID = decreaseMarginActionID
(webView as? WebView)?.decreaseMargin()
(webView as? WebView)?.updateMargin()
}
if increaseLineHeightActionID != context.coordinator.previousIncreaseLineHeightActionID {
context.coordinator.previousIncreaseLineHeightActionID = increaseLineHeightActionID
(webView as? WebView)?.increaseLineHeight()
(webView as? WebView)?.updateLineHeight()
}
if decreaseLineHeightActionID != context.coordinator.previousDecreaseLineHeightActionID {
context.coordinator.previousDecreaseLineHeightActionID = decreaseLineHeightActionID
(webView as? WebView)?.decreaseLineHeight()
(webView as? WebView)?.updateLineHeight()
}
if showNavBarActionID != context.coordinator.previousShowNavBarActionID {
@ -153,7 +153,7 @@ import WebKit
fontSize: fontSize(),
lineHeight: lineHeight(),
margin: margin(),
fontFamily: .merriweather
fontFamily: .inter // TODO: lookup from user defaults
)
.styledContent,
baseURL: ViewsPackage.bundleURL

6
apple/OmnivoreKit/Sources/Views/Article/WebAppView.swift
View File

@ -95,17 +95,17 @@ public enum WebViewManager {
if annotationSaveTransactionID != context.coordinator.lastSavedAnnotationID {
context.coordinator.lastSavedAnnotationID = annotationSaveTransactionID
(webView as? WebView)?.saveAnnotation(annotation: annotation)
(webView as? WebView)?.dispatchEvent(.saveAnnotation(annotation: annotation))
}
if sendIncreaseFontSignal {
sendIncreaseFontSignal = false
(webView as? WebView)?.increaseFontSize()
(webView as? WebView)?.updateFontSize()
}
if sendDecreaseFontSignal {
sendDecreaseFontSignal = false
(webView as? WebView)?.decreaseFontSize()
(webView as? WebView)?.updateFontSize()
}
}
}

137
apple/OmnivoreKit/Sources/Views/Article/WebView.swift
View File

@ -1,3 +1,4 @@
import Utils
import WebKit
/// Describes actions that can be sent from the WebView back to native views.
@ -26,41 +27,30 @@ public final class WebView: WKWebView {
fatalError("init(coder:) has not been implemented")
}
public func increaseFontSize() {
dispatchEvent("increaseFontSize")
public func updateFontSize() {
if let fontSize = UserDefaults.standard.value(forKey: UserDefaultKey.preferredWebFontSize.rawValue) as? Int {
dispatchEvent(.updateFontSize(size: fontSize))
}
}
public func decreaseFontSize() {
dispatchEvent("decreaseFontSize")
public func updateMargin() {
if let margin = UserDefaults.standard.value(forKey: UserDefaultKey.preferredWebMargin.rawValue) as? Int {
dispatchEvent(.updateMargin(width: margin))
}
}
public func increaseMargin() {
print("increase margin")
dispatchEvent("increaseMargin")
}
public func decreaseMargin() {
print("decrease margin")
dispatchEvent("decreaseMargin")
}
public func increaseLineHeight() {
print("increase line height")
dispatchEvent("increaseLineHeight")
}
public func decreaseLineHeight() {
print("decrease line height")
dispatchEvent("decreaseLineHeight")
public func updateLineHeight() {
if let height = UserDefaults.standard.value(forKey: UserDefaultKey.preferredWebLineSpacing.rawValue) as? Int {
dispatchEvent(.updateLineHeight(height: height))
}
}
public func shareOriginalItem() {
dispatchEvent("share")
dispatchEvent(.share)
}
func dispatchEvent(_ name: String) {
let dispatch = "document.dispatchEvent(new Event('\(name)'));"
evaluateJavaScript(dispatch) { obj, err in
public func dispatchEvent(_ event: WebViewDispatchEvent) {
evaluateJavaScript(event.script) { obj, err in
if let err = err { print(err) }
if let obj = obj { print(obj) }
}
@ -70,12 +60,7 @@ public final class WebView: WKWebView {
override public func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
guard previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle else { return }
if traitCollection.userInterfaceStyle == .dark {
dispatchEvent("switchToDarkMode")
} else {
dispatchEvent("switchToLightMode")
}
dispatchEvent(.updateColorMode(isDark: traitCollection.userInterfaceStyle == .dark))
}
#elseif os(macOS)
@ -169,28 +154,28 @@ public final class WebView: WKWebView {
}
@objc private func annotateSelection() {
dispatchEvent("annotate")
dispatchEvent(.annotate)
hideMenu()
}
@objc private func highlightSelection() {
dispatchEvent("highlight")
dispatchEvent(.highlight)
hideMenu()
}
@objc private func shareSelection() {
dispatchEvent("share")
dispatchEvent(.share)
hideMenu()
}
@objc private func removeSelection() {
dispatchEvent("remove")
dispatchEvent(.remove)
hideMenu()
}
@objc override public func copy(_ sender: Any?) {
super.copy(sender)
dispatchEvent("copyHighlight")
dispatchEvent(.copyHighlight)
hideMenu()
}
@ -209,7 +194,7 @@ public final class WebView: WKWebView {
private func hideMenuAndDismissHighlight() {
hideMenu()
dispatchEvent("dismissHighlight")
dispatchEvent(.dismissHighlight)
}
private func showHighlightMenu(_ rect: CGRect) {
@ -233,14 +218,72 @@ public final class WebView: WKWebView {
UIMenuController.shared.showMenu(from: self, rect: rect)
}
public func saveAnnotation(annotation: String) {
// swiftlint:disable:next line_length
let dispatch = "var event = new Event('saveAnnotation');event.annotation = '\(annotation)';document.dispatchEvent(event);"
evaluateJavaScript(dispatch) { obj, err in
if let err = err { print(err) }
if let obj = obj { print(obj) }
}
}
}
#endif
public enum WebViewDispatchEvent {
case updateLineHeight(height: Int)
case updateMargin(width: Int)
case updateFontSize(size: Int)
case updateColorMode(isDark: Bool)
case updateFontFamily(family: String)
case saveAnnotation(annotation: String)
case annotate
case highlight
case share
case remove
case copyHighlight
case dismissHighlight
var script: String {
"var event = new Event('\(eventName)');\(scriptPropertyLine)document.dispatchEvent(event);"
}
private var eventName: String {
switch self {
case .updateLineHeight:
return "updateLineHeight"
case .updateMargin:
return "updateMargin"
case .updateFontSize:
return "updateFontSize"
case .updateColorMode:
return "updateColorMode"
case .updateFontFamily:
return "updateFontFamily"
case .saveAnnotation:
return "saveAnnotation"
case .annotate:
return "annotate"
case .highlight:
return "highlight"
case .share:
return "share"
case .remove:
return "remove"
case .copyHighlight:
return "copyHighlight"
case .dismissHighlight:
return "dismissHighlight"
}
}
private var scriptPropertyLine: String {
switch self {
case let .updateLineHeight(height: height):
return "event.lineHeight = '\(height)';"
case let .updateMargin(width: width):
return "event.margin = '\(width)';"
case let .updateFontSize(size: size):
return "event.fontSize = '\(size)';"
case let .updateColorMode(isDark: isDark):
return "event.isDarkMode = '\(isDark)';"
case let .updateFontFamily(family: family):
return "event.fontFamily = '\(family)';"
case let .saveAnnotation(annotation: annotation):
return "event.annotation = '\(annotation)';"
case .annotate, .highlight, .share, .remove, .copyHighlight, .dismissHighlight:
return ""
}
}
}