renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3948 from vincode-io/theme_reloading_fix

Browse Source 
Theme reloading fix
This commit is contained in:
Brent Simmons
2023-05-13 17:03:26 -07:00
committed by GitHub
parent af1fdcd9db 3a2b05ca96
commit 889faee856
1 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Shared/ArticleStyles/ArticleThemesManager.swift
View File

@@ -6,7 +6,12 @@
// Copyright © 2015 Ranchero Software, LLC. All rights reserved.
//
import Foundation
#if os(macOS)
import AppKit
#else
import UIKit
#endif
import RSCore
public extension Notification.Name {
@@ -20,9 +25,7 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
public let folderPath: String
lazy var presentedItemOperationQueue = OperationQueue.main
var presentedItemURL: URL? {
return URL(fileURLWithPath: folderPath)
}
var presentedItemURL: URL?
var currentThemeName: String {
get {
@@ -33,6 +36,7 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
do {
currentTheme = try articleThemeWithThemeName(newValue)
AppDefaults.shared.currentThemeName = newValue
updateFilePresenter()
} catch {
logger.error("Unable to set new theme: \(error.localizedDescription, privacy: .public)")
}
@@ -71,19 +75,23 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
assertionFailure("Could not create folder for Themes.")
abort()
}
NSFileCoordinator.addFilePresenter(self)
#if os(macOS)
NotificationCenter.default.addObserver(self, selector: #selector(applicationDidBecomeActive(_:)), name: NSApplication.didBecomeActiveNotification, object: nil)
#else
NotificationCenter.default.addObserver(self, selector: #selector(applicationDidBecomeActive(_:)), name: UIApplication.didBecomeActiveNotification, object: nil)
#endif
updateFilePresenter()
}
func presentedSubitemDidChange(at url: URL) {
if url.lastPathComponent.localizedCaseInsensitiveContains("nnwtheme") {
themeNames = buildThemeNames()
do {
currentTheme = try articleThemeWithThemeName(currentThemeName)
} catch {
Task { @MainActor in
appDelegate.presentThemeImportError(error)
}
themeNames = buildThemeNames()
do {
currentTheme = try articleThemeWithThemeName(currentThemeName)
} catch {
Task { @MainActor in
appDelegate.presentThemeImportError(error)
}
}
}
@@ -105,6 +113,8 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
}
try FileManager.default.copyItem(atPath: filename, toPath: toFilename)
themeNames = buildThemeNames()
}
func articleThemeWithThemeName(_ themeName: String) throws -> ArticleTheme {
@@ -130,6 +140,7 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
func deleteTheme(themeName: String) {
if let filename = pathForThemeName(themeName, folder: folderPath) {
try? FileManager.default.removeItem(atPath: filename)
themeNames = buildThemeNames()
}
}
@@ -138,6 +149,19 @@ final class ArticleThemesManager: NSObject, NSFilePresenter, Logging {
// MARK : Private
private extension ArticleThemesManager {
@objc func applicationDidBecomeActive(_ note: Notification) {
themeNames = buildThemeNames()
}
func updateFilePresenter() {
guard let currentThemePath = currentTheme.path else {
return
}
NSFileCoordinator.removeFilePresenter(self)
presentedItemURL = URL(fileURLWithPath: currentThemePath)
NSFileCoordinator.addFilePresenter(self)
}
func buildThemeNames() -> [String] {
let appThemeFilenames = Bundle.main.paths(forResourcesOfType: ArticleTheme.nnwThemeSuffix, inDirectory: nil)