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

Fix issue with changing system colormode causing the incorrect theme to be applied

Browse Source
This commit is contained in:
Jackson Harper
2023-04-07 11:13:43 +08:00
parent da90b53057
commit 522ea0a3c3
5 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift
View File

@ -105,11 +105,7 @@ struct WebReaderContent {
// swiftlint:disable line_length function_body_length
static func emptyContent(isDark: Bool) -> String {
let themeKey = isDark ? "Dark" : "Light"
// let savedAt = "new Date(\(item.unwrappedSavedAt.timeIntervalSince1970 * 1000)).toISOString()"
// let createdAt = "new Date(\(item.unwrappedCreatedAt.timeIntervalSince1970 * 1000)).toISOString()"
// let publishedAt = item.publishDate != nil ? "new Date(\(item.publishDate!.timeIntervalSince1970 * 1000)).toISOString()" : "undefined"
let themeKey = ThemeManager.currentTheme.themeKey
return """
<!DOCTYPE html>
<html>

30
apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift
View File

@ -44,9 +44,7 @@ public final class OmnivoreWebView: WKWebView {
public func updateTheme() {
do {
if let themeName = UserDefaults.standard.value(forKey: UserDefaultKey.themeName.rawValue) as? String {
try dispatchEvent(.updateTheme(themeName: themeName))
}
try dispatchEvent(.updateTheme(themeName: ThemeManager.currentTheme.themeKey))
} catch {
showErrorInSnackbar("Error updating theme")
}
@ -177,28 +175,19 @@ public final class OmnivoreWebView: WKWebView {
super.traitCollectionDidChange(previousTraitCollection)
guard previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle else { return }
do {
try dispatchEvent(.updateColorMode(isDark: traitCollection.userInterfaceStyle == .dark))
if ThemeManager.currentTheme == .system {
try dispatchEvent(.updateTheme(themeName: ThemeManager.currentTheme.themeKey))
}
} catch {
showErrorInSnackbar("Error updating theme")
showErrorInSnackbar("Error updating theme due to colormode change")
}
}
#elseif os(macOS)
override public func viewDidChangeEffectiveAppearance() {
super.viewDidChangeEffectiveAppearance()
switch effectiveAppearance.bestMatch(from: [.aqua, .darkAqua]) {
case .some(.darkAqua):
do {
try dispatchEvent(.updateColorMode(isDark: true))
} catch {
showErrorInSnackbar("Error updating theme")
}
default:
do {
try dispatchEvent(.updateColorMode(isDark: false))
} catch {
showErrorInSnackbar("Error updating theme")
}
if ThemeManager.currentTheme == .system {
try dispatchEvent(.updateTheme(themeName: ThemeManager.currentTheme.themeKey))
}
}
#endif
@ -426,7 +415,6 @@ public enum WebViewDispatchEvent {
case updateLineHeight(height: Int)
case updateMaxWidthPercentage(maxWidthPercentage: Int)
case updateFontSize(size: Int)
case updateColorMode(isDark: Bool)
case updateFontFamily(family: String)
case updateTheme(themeName: String)
case updateJustifyText(justify: Bool)
@ -461,8 +449,6 @@ public enum WebViewDispatchEvent {
return "updateMaxWidthPercentage"
case .updateFontSize:
return "updateFontSize"
case .updateColorMode:
return "updateColorMode"
case .updateFontFamily:
return "updateFontFamily"
case .updateTheme:
@ -514,8 +500,6 @@ public enum WebViewDispatchEvent {
return "event.fontSize = '\(size)';"
case let .updateJustifyText(justify: justify):
return "event.justifyText = \(justify);"
case let .updateColorMode(isDark: isDark):
return "event.isDark = '\(isDark)';"
case let .updateFontFamily(family: family):
return "event.fontFamily = '\(family)';"
case let .updateLabels(labels):

2
apple/OmnivoreKit/Sources/Views/Resources/bundle.js
View File

File diff suppressed because one or more lines are too long

1
apple/OmnivoreKit/Sources/Views/Theme.swift
View File

@ -15,7 +15,6 @@ public enum Theme: String, CaseIterable {
case sepia = "Sepia"
case apollo = "Apollo"
case dark = "Black"
// case dark = "Dark"
public var bgColor: Color {
switch self {

1
packages/web/components/templates/article/ArticleContainer.tsx
View File

@ -216,6 +216,7 @@ export function ArticleContainer(props: ArticleContainerProps): JSX.Element {
const handleThemeChange = async (event: UpdateThemeEvent) => {
const newTheme = event.themeName
console.log('handling theme change: ', newTheme)
if (newTheme) {
updateTheme(newTheme)
}