diff --git a/Evergreen/AppDefaults.swift b/Evergreen/AppDefaults.swift index a45b1f21f..362fccd4c 100644 --- a/Evergreen/AppDefaults.swift +++ b/Evergreen/AppDefaults.swift @@ -20,13 +20,10 @@ final class AppDefaults { static let shared = AppDefaults() private struct Key { - static let firstRunDate = "firstRunDate" - static let sidebarFontSize = "sidebarFontSize" static let timelineFontSize = "timelineFontSize" static let detailFontSize = "detailFontSize" - static let openInBrowserInBackground = "openInBrowserInBackground" } diff --git a/Evergreen/ArticleStyles/ArticleStylesManager.swift b/Evergreen/ArticleStyles/ArticleStylesManager.swift index fadadf226..87eac91ac 100644 --- a/Evergreen/ArticleStyles/ArticleStylesManager.swift +++ b/Evergreen/ArticleStyles/ArticleStylesManager.swift @@ -21,9 +21,9 @@ private let nnwStyleSuffix = ".nnwstyle" private let cssStyleSuffix = ".css" private let styleSuffixes = [styleSuffix, nnwStyleSuffix, cssStyleSuffix]; -public final class ArticleStylesManager { +final class ArticleStylesManager { - static let sharedInstance = ArticleStylesManager() + static let shared = ArticleStylesManager() private let folderPath = RSDataSubfolder(nil, stylesFolderName)! var currentStyleName: String { diff --git a/Evergreen/Browser.swift b/Evergreen/Browser.swift index f5df40be3..7f53aef80 100644 --- a/Evergreen/Browser.swift +++ b/Evergreen/Browser.swift @@ -14,8 +14,7 @@ import RSWeb func openInBrowser(_ urlString: String) { // Opens according to prefs. - let openInBackground = UserDefaults.standard.bool(forKey: OpenInBrowserInBackgroundKey) - openInBrowser(urlString, inBackground: openInBackground) + openInBrowser(urlString, inBackground: AppDefaults.shared.openInBrowserInBackground) } func openInBrowser(_ urlString: String, inBackground: Bool) { diff --git a/Evergreen/MainWindow/Detail/DetailViewController.swift b/Evergreen/MainWindow/Detail/DetailViewController.swift index 6b4c5d687..2835eebb2 100644 --- a/Evergreen/MainWindow/Detail/DetailViewController.swift +++ b/Evergreen/MainWindow/Detail/DetailViewController.swift @@ -72,7 +72,7 @@ class DetailViewController: NSViewController, WKNavigationDelegate, WKUIDelegate private func reloadHTML() { if let article = article { - let articleRenderer = ArticleRenderer(article: article, style: ArticleStylesManager.sharedInstance.currentStyle) + let articleRenderer = ArticleRenderer(article: article, style: ArticleStylesManager.shared.currentStyle) webview.loadHTMLString(articleRenderer.html, baseURL: articleRenderer.baseURL) } else {