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

render correct color mode in privacy and term web embeds [apple]

Browse Source
This commit is contained in:
Satindar Dhillon
2022-02-24 14:18:51 -08:00
parent cf627e53cb
commit c73d4dc64a
7 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/Views/Article/WebAppViewCoordinator.swift
View File

@ -126,7 +126,7 @@ extension WKWebView {
}
}
private func injectCookie(cookieString: String?, url: URL) {
func injectCookie(cookieString: String?, url: URL) {
if let cookieString = cookieString {
for cookie in HTTPCookie.cookies(withResponseHeaderFields: ["Set-Cookie": cookieString], for: url) {
configuration.websiteDataStore.httpCookieStore.setCookie(cookie) {}

13
apple/OmnivoreKit/Sources/Views/Web/BasicWebAppView.swift
View File

@ -18,6 +18,10 @@ import WebKit
webView.scrollView.isScrollEnabled = true
webView.isOpaque = false
webView.backgroundColor = UIColor.clear
if let url = request.url {
let themeID = UITraitCollection.current.userInterfaceStyle == .dark ? "Gray" : "LightGray"
webView.injectCookie(cookieString: "theme=\(themeID); Max-Age=31536000;", url: url)
}
return webView
}
@ -43,7 +47,14 @@ import WebKit
}
public func makeNSView(context _: Context) -> WKWebView {
WebView(frame: CGRect.zero)
let webView = WebView(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
let themeID = "LightGray" // NSApp.effectiveAppearance.name == NSAppearance.Name.darkAqua ? "Gray" : "LightGray"
webView.injectCookie(cookieString: "theme=\(themeID); Max-Age=31536000;", url: url)
}
return webView
}
public func updateNSView(_ webView: WKWebView, context: Context) {