FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-24 16:10:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Copy the theme if the user requests it to be installed

Browse Source
This commit is contained in:
Maurice Parker 2021-09-08 05:47:57 -05:00
parent b568f03edc
commit e66344694e
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Mac/AppDelegate.swift
View File

@ -835,9 +835,31 @@ private extension AppDelegate {
alert.beginSheetModal(for: window) { [weak self] result in
if result == NSApplication.ModalResponse.alertFirstButtonReturn {
guard let self = self else { return }
do {
try ArticleThemesManager.shared.importTheme(filename: filename)
self.confirmImportSuccess(themeName: theme.name)
} catch {
NSApplication.shared.presentError(error)
}
}
}
}
func confirmImportSuccess(themeName: String) {
guard let window = mainWindowController?.window else { return }
let alert = NSAlert()
alert.alertStyle = .informational
alert.messageText = NSLocalizedString("Theme installed", comment: "Theme installed")
let localizedInformativeText = NSLocalizedString("The theme “%@” has been installed", comment: "Theme installed")
alert.informativeText = NSString.localizedStringWithFormat(localizedInformativeText as NSString, themeName) as String
alert.addButton(withTitle: NSLocalizedString("OK", comment: "OK"))
alert.beginSheetModal(for: window)
}
}
/*

31
Shared/ArticleStyles/ArticleThemesManager.swift
View File

@ -67,16 +67,33 @@ final class ArticleThemesManager {
#endif
}
// MARK: API
func importTheme(filename: String) throws {
let filenameLastPathComponent = (filename as NSString).lastPathComponent
let toFilename = (folderPath as NSString).appendingPathComponent(filenameLastPathComponent)
if FileManager.default.fileExists(atPath: toFilename) {
try FileManager.default.removeItem(atPath: toFilename)
}
try FileManager.default.copyItem(atPath: filename, toPath: toFilename)
}
// MARK: Notifications
@objc dynamic func applicationDidBecomeActive(_ note: Notification) {
updateThemeNames()
updateCurrentTheme()
}
}
// MARK : Internal
// MARK : Private
private func updateThemeNames() {
private extension ArticleThemesManager {
func updateThemeNames() {
let updatedThemeNames = allThemePaths(folderPath).map { ArticleTheme.themeNameForPath($0) }
if updatedThemeNames != themeNames {
@ -84,7 +101,7 @@ final class ArticleThemesManager {
}
}
private func articleThemeWithThemeName(_ themeName: String) -> ArticleTheme? {
func articleThemeWithThemeName(_ themeName: String) -> ArticleTheme? {
if themeName == AppDefaults.defaultThemeName {
return ArticleTheme.defaultTheme
}
@ -96,11 +113,11 @@ final class ArticleThemesManager {
return ArticleTheme(path: path)
}
private func defaultArticleTheme() -> ArticleTheme {
func defaultArticleTheme() -> ArticleTheme {
return articleThemeWithThemeName(AppDefaults.defaultThemeName)!
}
private func updateCurrentTheme() {
func updateCurrentTheme() {
var themeName = currentThemeName
if !themeNames.contains(themeName) {
themeName = AppDefaults.defaultThemeName
@ -118,12 +135,12 @@ final class ArticleThemesManager {
}
}
private func allThemePaths(_ folder: String) -> [String] {
func allThemePaths(_ folder: String) -> [String] {
let filepaths = FileManager.default.filePaths(inFolder: folder)
return filepaths?.filter { $0.hasSuffix(ArticleTheme.nnwThemeSuffix) } ?? []
}
private func pathForThemeName(_ themeName: String, folder: String) -> String? {
func pathForThemeName(_ themeName: String, folder: String) -> String? {
for onePath in allThemePaths(folder) {
if ArticleTheme.pathIsPathForThemeName(themeName, path: onePath) {
return onePath