Merge branch 'swiftui'

iOS/Add/AddFolderViewController.swift

@@ -22,7 +22,7 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
 	
 	private var accounts: [Account]! {
 		didSet {
-			if let predefinedAccount = accounts.first(where: { $0.accountID == AppDefaults.addFolderAccountID }) {
+			if let predefinedAccount = accounts.first(where: { $0.accountID == AppDefaults.shared.addFolderAccountID }) {
 				selectedAccount = predefinedAccount
 			} else {
 				selectedAccount = accounts[0]
@@ -69,7 +69,7 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
     }
 	
 	private func didSelect(_ account: Account) {
-		AppDefaults.addFolderAccountID = account.accountID
+		AppDefaults.shared.addFolderAccountID = account.accountID
 		selectedAccount = account
 	}
 

iOS/AppDefaults.swift

@@ -26,9 +26,12 @@ enum UserInterfaceColorPalette: Int, CustomStringConvertible, CaseIterable {
 	
 }
 
-struct AppDefaults {
+final class AppDefaults {
 
-	static var shared: UserDefaults = {
+	static let shared = AppDefaults()
+	private init() {}
+	
+	static var store: UserDefaults = {
 		let appIdentifierPrefix = Bundle.main.object(forInfoDictionaryKey: "AppIdentifierPrefix") as! String
 		let suiteName = "\(appIdentifierPrefix)group.\(Bundle.main.bundleIdentifier!)"
 		return UserDefaults.init(suiteName: suiteName)!
@@ -42,7 +45,7 @@ struct AppDefaults {
 		static let timelineGroupByFeed = "timelineGroupByFeed"
 		static let refreshClearsReadArticles = "refreshClearsReadArticles"
 		static let timelineNumberOfLines = "timelineNumberOfLines"
-		static let timelineIconSize = "timelineIconSize"
+		static let timelineIconDimension = "timelineIconSize"
 		static let timelineSortDirection = "timelineSortDirection"
 		static let articleFullscreenAvailable = "articleFullscreenAvailable"
 		static let articleFullscreenEnabled = "articleFullscreenEnabled"
@@ -53,15 +56,15 @@ struct AppDefaults {
 		static let addFolderAccountID = "addFolderAccountID"
 	}
 
-	static let isDeveloperBuild: Bool = {
+	let isDeveloperBuild: Bool = {
 		if let dev = Bundle.main.object(forInfoDictionaryKey: "DeveloperEntitlements") as? String, dev == "-dev" {
 			return true
 		}
 		return false
 	}()
 
-	static let isFirstRun: Bool = {
-		if let _ = AppDefaults.shared.object(forKey: Key.firstRunDate) as? Date {
+	let isFirstRun: Bool = {
+		if let _ = AppDefaults.store.object(forKey: Key.firstRunDate) as? Date {
 			return false
 		}
 		firstRunDate = Date()
@@ -80,34 +83,34 @@ struct AppDefaults {
 		}
 	}
 
-	static var addWebFeedAccountID: String? {
+	var addWebFeedAccountID: String? {
 		get {
-			return string(for: Key.addWebFeedAccountID)
+			return AppDefaults.string(for: Key.addWebFeedAccountID)
 		}
 		set {
-			setString(for: Key.addWebFeedAccountID, newValue)
+			AppDefaults.setString(for: Key.addWebFeedAccountID, newValue)
 		}
 	}
 	
-	static var addWebFeedFolderName: String? {
+	var addWebFeedFolderName: String? {
 		get {
-			return string(for: Key.addWebFeedFolderName)
+			return AppDefaults.string(for: Key.addWebFeedFolderName)
 		}
 		set {
-			setString(for: Key.addWebFeedFolderName, newValue)
+			AppDefaults.setString(for: Key.addWebFeedFolderName, newValue)
 		}
 	}
 	
-	static var addFolderAccountID: String? {
+	var addFolderAccountID: String? {
 		get {
-			return string(for: Key.addFolderAccountID)
+			return AppDefaults.string(for: Key.addFolderAccountID)
 		}
 		set {
-			setString(for: Key.addFolderAccountID, newValue)
+			AppDefaults.setString(for: Key.addFolderAccountID, newValue)
 		}
 	}
 	
-	static var activeExtensionPointIDs: [[AnyHashable : AnyHashable]]? {
+	var activeExtensionPointIDs: [[AnyHashable : AnyHashable]]? {
 		get {
 			return UserDefaults.standard.object(forKey: Key.activeExtensionPointIDs) as? [[AnyHashable : AnyHashable]]
 		}
@@ -116,94 +119,94 @@ struct AppDefaults {
 		}
 	}
 	
-	static var lastImageCacheFlushDate: Date? {
+	var lastImageCacheFlushDate: Date? {
 		get {
-			return date(for: Key.lastImageCacheFlushDate)
+			return AppDefaults.date(for: Key.lastImageCacheFlushDate)
 		}
 		set {
-			setDate(for: Key.lastImageCacheFlushDate, newValue)
+			AppDefaults.setDate(for: Key.lastImageCacheFlushDate, newValue)
 		}
 	}
 
-	static var timelineGroupByFeed: Bool {
+	var timelineGroupByFeed: Bool {
 		get {
-			return bool(for: Key.timelineGroupByFeed)
+			return AppDefaults.bool(for: Key.timelineGroupByFeed)
 		}
 		set {
-			setBool(for: Key.timelineGroupByFeed, newValue)
+			AppDefaults.setBool(for: Key.timelineGroupByFeed, newValue)
 		}
 	}
 
-	static var refreshClearsReadArticles: Bool {
+	var refreshClearsReadArticles: Bool {
 		get {
-			return bool(for: Key.refreshClearsReadArticles)
+			return AppDefaults.bool(for: Key.refreshClearsReadArticles)
 		}
 		set {
-			setBool(for: Key.refreshClearsReadArticles, newValue)
+			AppDefaults.setBool(for: Key.refreshClearsReadArticles, newValue)
 		}
 	}
 
-	static var timelineSortDirection: ComparisonResult {
+	var timelineSortDirection: ComparisonResult {
 		get {
-			return sortDirection(for: Key.timelineSortDirection)
+			return AppDefaults.sortDirection(for: Key.timelineSortDirection)
 		}
 		set {
-			setSortDirection(for: Key.timelineSortDirection, newValue)
+			AppDefaults.setSortDirection(for: Key.timelineSortDirection, newValue)
 		}
 	}
 
-	static var articleFullscreenAvailable: Bool {
+	var articleFullscreenAvailable: Bool {
 		get {
-			return bool(for: Key.articleFullscreenAvailable)
+			return AppDefaults.bool(for: Key.articleFullscreenAvailable)
 		}
 		set {
-			setBool(for: Key.articleFullscreenAvailable, newValue)
+			AppDefaults.setBool(for: Key.articleFullscreenAvailable, newValue)
 		}
 	}
 
-	static var articleFullscreenEnabled: Bool {
+	var articleFullscreenEnabled: Bool {
 		get {
-			return bool(for: Key.articleFullscreenEnabled)
+			return AppDefaults.bool(for: Key.articleFullscreenEnabled)
 		}
 		set {
-			setBool(for: Key.articleFullscreenEnabled, newValue)
+			AppDefaults.setBool(for: Key.articleFullscreenEnabled, newValue)
 		}
 	}
 
-	static var confirmMarkAllAsRead: Bool {
+	var confirmMarkAllAsRead: Bool {
 		get {
-			return bool(for: Key.confirmMarkAllAsRead)
+			return AppDefaults.bool(for: Key.confirmMarkAllAsRead)
 		}
 		set {
-			setBool(for: Key.confirmMarkAllAsRead, newValue)
+			AppDefaults.setBool(for: Key.confirmMarkAllAsRead, newValue)
 		}
 	}
 	
-	static var lastRefresh: Date? {
+	var lastRefresh: Date? {
 		get {
-			return date(for: Key.lastRefresh)
+			return AppDefaults.date(for: Key.lastRefresh)
 		}
 		set {
-			setDate(for: Key.lastRefresh, newValue)
+			AppDefaults.setDate(for: Key.lastRefresh, newValue)
 		}
 	}
 	
-	static var timelineNumberOfLines: Int {
+	var timelineNumberOfLines: Int {
 		get {
-			return int(for: Key.timelineNumberOfLines)
+			return AppDefaults.int(for: Key.timelineNumberOfLines)
 		}
 		set {
-			setInt(for: Key.timelineNumberOfLines, newValue)
+			AppDefaults.setInt(for: Key.timelineNumberOfLines, newValue)
 		}
 	}
 	
-	static var timelineIconSize: IconSize {
+	var timelineIconSize: IconSize {
 		get {
-			let rawValue = AppDefaults.shared.integer(forKey: Key.timelineIconSize)
+			let rawValue = AppDefaults.store.integer(forKey: Key.timelineIconDimension)
 			return IconSize(rawValue: rawValue) ?? IconSize.medium
 		}
 		set {
-			AppDefaults.shared.set(newValue.rawValue, forKey: Key.timelineIconSize)
+			AppDefaults.store.set(newValue.rawValue, forKey: Key.timelineIconDimension)
 		}
 	}
 	
@@ -212,12 +215,12 @@ struct AppDefaults {
 										Key.timelineGroupByFeed: false,
 										Key.refreshClearsReadArticles: false,
 										Key.timelineNumberOfLines: 2,
-										Key.timelineIconSize: IconSize.medium.rawValue,
+										Key.timelineIconDimension: IconSize.medium.rawValue,
 										Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue,
 										Key.articleFullscreenAvailable: false,
 										Key.articleFullscreenEnabled: false,
 										Key.confirmMarkAllAsRead: true]
-		AppDefaults.shared.register(defaults: defaults)
+		AppDefaults.store.register(defaults: defaults)
 	}
 
 }
@@ -242,27 +245,27 @@ private extension AppDefaults {
 	}
 
 	static func bool(for key: String) -> Bool {
-		return AppDefaults.shared.bool(forKey: key)
+		return AppDefaults.store.bool(forKey: key)
 	}
 
 	static func setBool(for key: String, _ flag: Bool) {
-		AppDefaults.shared.set(flag, forKey: key)
+		AppDefaults.store.set(flag, forKey: key)
 	}
 
 	static func int(for key: String) -> Int {
-		return AppDefaults.shared.integer(forKey: key)
+		return AppDefaults.store.integer(forKey: key)
 	}
 	
 	static func setInt(for key: String, _ x: Int) {
-		AppDefaults.shared.set(x, forKey: key)
+		AppDefaults.store.set(x, forKey: key)
 	}
 	
 	static func date(for key: String) -> Date? {
-		return AppDefaults.shared.object(forKey: key) as? Date
+		return AppDefaults.store.object(forKey: key) as? Date
 	}
 
 	static func setDate(for key: String, _ date: Date?) {
-		AppDefaults.shared.set(date, forKey: key)
+		AppDefaults.store.set(date, forKey: key)
 	}
 
 	static func sortDirection(for key:String) -> ComparisonResult {

iOS/AppDelegate.swift

@@ -73,7 +73,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 		AppDefaults.registerDefaults()
 
-		let isFirstRun = AppDefaults.isFirstRun
+		let isFirstRun = AppDefaults.shared.isFirstRun
 		if isFirstRun {
 			os_log("Is first run.", log: log, type: .info)
 		}
@@ -139,7 +139,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 	}
 	
 	@objc func accountRefreshDidFinish(_ note: Notification) {
-		AppDefaults.lastRefresh = Date()
+		AppDefaults.shared.lastRefresh = Date()
 	}
 	
 	// MARK: - API
@@ -170,7 +170,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		extensionFeedAddRequestFile.resume()
 		syncTimer?.update()
 
-		if let lastRefresh = AppDefaults.lastRefresh {
+		if let lastRefresh = AppDefaults.shared.lastRefresh {
 			if Date() > lastRefresh.addingTimeInterval(15 * 60) {
 				AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log)
 			} else {

iOS/Article/ArticleViewController.swift

@@ -132,7 +132,7 @@ class ArticleViewController: UIViewController {
 		articleExtractorButton.buttonState = controller.articleExtractorButtonState
 		
 		self.pageViewController.setViewControllers([controller], direction: .forward, animated: false, completion: nil)
-		if AppDefaults.articleFullscreenEnabled {
+		if AppDefaults.shared.articleFullscreenEnabled {
 			controller.hideBars()
 		}
 		
@@ -183,7 +183,7 @@ class ArticleViewController: UIViewController {
 		starBarButtonItem.isEnabled = true
 		
 		let permalinkPresent = article.preferredLink != nil
-		articleExtractorButton.isEnabled = permalinkPresent && !AppDefaults.isDeveloperBuild
+		articleExtractorButton.isEnabled = permalinkPresent && !AppDefaults.shared.isDeveloperBuild
 		actionBarButtonItem.isEnabled = permalinkPresent
 		
 		if article.status.read {
@@ -230,7 +230,7 @@ class ArticleViewController: UIViewController {
 	
 	@objc func willEnterForeground(_ note: Notification) {
 		// The toolbar will come back on you if you don't hide it again
-		if AppDefaults.articleFullscreenEnabled {
+		if AppDefaults.shared.articleFullscreenEnabled {
 			currentWebViewController?.hideBars()
 		}
 	}

iOS/Article/WebViewController.swift

@@ -37,7 +37,7 @@ class WebViewController: UIViewController {
 	
 	private lazy var contextMenuInteraction = UIContextMenuInteraction(delegate: self)
 	private var isFullScreenAvailable: Bool {
-		return AppDefaults.articleFullscreenAvailable && traitCollection.userInterfaceIdiom == .phone && coordinator.isRootSplitCollapsed
+		return AppDefaults.shared.articleFullscreenAvailable && traitCollection.userInterfaceIdiom == .phone && coordinator.isRootSplitCollapsed
 	}
 	private lazy var transition = ImageTransition(controller: self)
 	private var clickedImageCompletion: (() -> Void)?
@@ -169,7 +169,7 @@ class WebViewController: UIViewController {
 	}
 
 	func showBars() {
-		AppDefaults.articleFullscreenEnabled = false
+		AppDefaults.shared.articleFullscreenEnabled = false
 		coordinator.showStatusBar()
 		topShowBarsViewConstraint?.constant = 0
 		bottomShowBarsViewConstraint?.constant = 0
@@ -180,7 +180,7 @@ class WebViewController: UIViewController {
 		
 	func hideBars() {
 		if isFullScreenAvailable {
-			AppDefaults.articleFullscreenEnabled = true
+			AppDefaults.shared.articleFullscreenEnabled = true
 			coordinator.hideStatusBar()
 			topShowBarsViewConstraint?.constant = -44.0
 			bottomShowBarsViewConstraint?.constant = 44.0
@@ -632,7 +632,7 @@ private extension WebViewController {
 		topShowBarsView.translatesAutoresizingMaskIntoConstraints = false
 		view.addSubview(topShowBarsView)
 		
-		if AppDefaults.articleFullscreenEnabled {
+		if AppDefaults.shared.articleFullscreenEnabled {
 			topShowBarsViewConstraint = view.topAnchor.constraint(equalTo: topShowBarsView.bottomAnchor, constant: -44.0)
 		} else {
 			topShowBarsViewConstraint = view.topAnchor.constraint(equalTo: topShowBarsView.bottomAnchor, constant: 0.0)
@@ -652,7 +652,7 @@ private extension WebViewController {
 		topShowBarsView.backgroundColor = .clear
 		bottomShowBarsView.translatesAutoresizingMaskIntoConstraints = false
 		view.addSubview(bottomShowBarsView)
-		if AppDefaults.articleFullscreenEnabled {
+		if AppDefaults.shared.articleFullscreenEnabled {
 			bottomShowBarsViewConstraint = view.bottomAnchor.constraint(equalTo: bottomShowBarsView.topAnchor, constant: 44.0)
 		} else {
 			bottomShowBarsViewConstraint = view.bottomAnchor.constraint(equalTo: bottomShowBarsView.topAnchor, constant: 0.0)

iOS/MasterFeed/Cell/MasterFeedTableViewIdentifier.swift

@@ -58,39 +58,6 @@ final class MasterFeedTableViewIdentifier: NSObject, NSCopying {
 		return feedID.hashValue
 	}
 
-//	override func isEqual(_ object: Any?) -> Bool {
-//		guard let otherIdentifier = object as? MasterFeedTableViewIdentifier else { return false }
-//		if self === otherIdentifier { return true }
-//
-//		return feedID == otherIdentifier.feedID &&
-//			containerID == otherIdentifier.containerID &&
-//			parentContainerID == otherIdentifier.parentContainerID &&
-//			isEditable == otherIdentifier.isEditable &&
-//			isPsuedoFeed == otherIdentifier.isPsuedoFeed &&
-//			isFolder == otherIdentifier.isFolder &&
-//			isWebFeed == otherIdentifier.isWebFeed &&
-//			nameForDisplay == otherIdentifier.nameForDisplay &&
-//			url == otherIdentifier.url &&
-//			unreadCount == otherIdentifier.unreadCount &&
-//			childCount == otherIdentifier.childCount
-//	}
-//
-//	override var hash: Int {
-//		var hasher = Hasher()
-//		hasher.combine(feedID)
-//		hasher.combine(containerID)
-//		hasher.combine(parentContainerID)
-//		hasher.combine(isEditable)
-//		hasher.combine(isPsuedoFeed)
-//		hasher.combine(isFolder)
-//		hasher.combine(isWebFeed)
-//		hasher.combine(nameForDisplay)
-//		hasher.combine(url)
-//		hasher.combine(unreadCount)
-//		hasher.combine(childCount)
-//		return hasher.finalize()
-//	}
-//
 	func copy(with zone: NSZone? = nil) -> Any {
 		return self
 	}

iOS/MasterTimeline/MarkAsReadAlertController.swift

@@ -29,7 +29,7 @@ struct MarkAsReadAlertController {
 			return
 		}
 		
-		if AppDefaults.confirmMarkAllAsRead {
+		if AppDefaults.shared.confirmMarkAllAsRead {
 			let alertController = MarkAsReadAlertController.alert(coordinator: coordinator, confirmTitle: confirmTitle, cancelCompletion: cancelCompletion, sourceType: sourceType) { _ in
 				completion()
 			}

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -68,8 +68,8 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 		// Configure the table
 		tableView.dataSource = dataSource
-		numberOfTextLines = AppDefaults.timelineNumberOfLines
-		iconSize = AppDefaults.timelineIconSize
+		numberOfTextLines = AppDefaults.shared.timelineNumberOfLines
+		iconSize = AppDefaults.shared.timelineIconSize
 		resetEstimatedRowHeight()
 		
 		if let titleView = Bundle.main.loadNibNamed("MasterTimelineTitleView", owner: self, options: nil)?[0] as? MasterTimelineTitleView {
@@ -455,9 +455,9 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	}
 
 	@objc func userDefaultsDidChange(_ note: Notification) {
-		if numberOfTextLines != AppDefaults.timelineNumberOfLines || iconSize != AppDefaults.timelineIconSize {
-			numberOfTextLines = AppDefaults.timelineNumberOfLines
-			iconSize = AppDefaults.timelineIconSize
+		if numberOfTextLines != AppDefaults.shared.timelineNumberOfLines || iconSize != AppDefaults.shared.timelineIconSize {
+			numberOfTextLines = AppDefaults.shared.timelineNumberOfLines
+			iconSize = AppDefaults.shared.timelineIconSize
 			resetEstimatedRowHeight()
 			reloadAllVisibleCells()
 		}

iOS/Resources/Assets.xcassets/secondaryAccentColor.colorset/Contents.json

@@ -1,23 +1,18 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0x08",
           "alpha" : "1.000",
           "blue" : "0xEE",
-          "green" : "0x6A"
+          "green" : "0x6A",
+          "red" : "0x08"
         }
-      }
+      },
+      "idiom" : "universal"
     },
     {
-      "idiom" : "universal",
       "appearances" : [
         {
           "appearance" : "luminosity",
@@ -27,12 +22,17 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "0x5E",
           "alpha" : "1.000",
           "blue" : "0xF4",
-          "green" : "0x9E"
+          "green" : "0x9E",
+          "red" : "0x5E"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/starColor.colorset/Contents.json

@@ -1,20 +1,20 @@
 {
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
   "colors" : [
     {
-      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "red" : "249",
           "alpha" : "1.000",
           "blue" : "52",
-          "green" : "198"
+          "green" : "198",
+          "red" : "249"
         }
-      }
+      },
+      "idiom" : "universal"
     }
-  ]
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/SceneCoordinator.swift

@@ -87,7 +87,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	var isTimelineViewControllerPending = false
 	var isArticleViewControllerPending = false
 	
-	private(set) var sortDirection = AppDefaults.timelineSortDirection {
+	private(set) var sortDirection = AppDefaults.shared.timelineSortDirection {
 		didSet {
 			if sortDirection != oldValue {
 				sortParametersDidChange()
@@ -95,7 +95,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		}
 	}
 	
-	private(set) var groupByFeed = AppDefaults.timelineGroupByFeed {
+	private(set) var groupByFeed = AppDefaults.shared.timelineGroupByFeed {
 		didSet {
 			if groupByFeed != oldValue {
 				sortParametersDidChange()
@@ -546,8 +546,8 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	}
 	
 	@objc func userDefaultsDidChange(_ note: Notification) {
-		self.sortDirection = AppDefaults.timelineSortDirection
-		self.groupByFeed = AppDefaults.timelineGroupByFeed
+		self.sortDirection = AppDefaults.shared.timelineSortDirection
+		self.groupByFeed = AppDefaults.shared.timelineGroupByFeed
 	}
 	
 	@objc func accountDidDownloadArticles(_ note: Notification) {
@@ -582,7 +582,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		if isReadFeedsFiltered {
 			rebuildBackingStores()
 		}
-		if isReadArticlesFiltered && (AppDefaults.refreshClearsReadArticles || !conditional) {
+		if isReadArticlesFiltered && (AppDefaults.shared.refreshClearsReadArticles || !conditional) {
 			refreshTimeline(resetScroll: false)
 		}
 	}

iOS/Settings/AddAccountViewController.swift

@@ -152,7 +152,7 @@ private extension AddAccountViewController {
 			}
 		}
 		
-		if AppDefaults.isDeveloperBuild {
+		if AppDefaults.shared.isDeveloperBuild {
 			removeAccountType(.cloudKit)
 			removeAccountType(.feedly)
 			removeAccountType(.feedWrangler)

iOS/Settings/SettingsViewController.swift

@@ -46,31 +46,31 @@ class SettingsViewController: UITableViewController {
 	override func viewWillAppear(_ animated: Bool) {
 		super.viewWillAppear(animated)
 		
-		if AppDefaults.timelineSortDirection == .orderedAscending {
+		if AppDefaults.shared.timelineSortDirection == .orderedAscending {
 			timelineSortOrderSwitch.isOn = true
 		} else {
 			timelineSortOrderSwitch.isOn = false
 		}
 
-		if AppDefaults.timelineGroupByFeed {
+		if AppDefaults.shared.timelineGroupByFeed {
 			groupByFeedSwitch.isOn = true
 		} else {
 			groupByFeedSwitch.isOn = false
 		}
 
-		if AppDefaults.refreshClearsReadArticles {
+		if AppDefaults.shared.refreshClearsReadArticles {
 			refreshClearsReadArticlesSwitch.isOn = true
 		} else {
 			refreshClearsReadArticlesSwitch.isOn = false
 		}
 
-		if AppDefaults.confirmMarkAllAsRead {
+		if AppDefaults.shared.confirmMarkAllAsRead {
 			confirmMarkAllAsReadSwitch.isOn = true
 		} else {
 			confirmMarkAllAsReadSwitch.isOn = false
 		}
 
-		if AppDefaults.articleFullscreenAvailable {
+		if AppDefaults.shared.articleFullscreenAvailable {
 			showFullscreenArticlesSwitch.isOn = true
 		} else {
 			showFullscreenArticlesSwitch.isOn = false
@@ -286,41 +286,41 @@ class SettingsViewController: UITableViewController {
 	
 	@IBAction func switchTimelineOrder(_ sender: Any) {
 		if timelineSortOrderSwitch.isOn {
-			AppDefaults.timelineSortDirection = .orderedAscending
+			AppDefaults.shared.timelineSortDirection = .orderedAscending
 		} else {
-			AppDefaults.timelineSortDirection = .orderedDescending
+			AppDefaults.shared.timelineSortDirection = .orderedDescending
 		}
 	}
 	
 	@IBAction func switchGroupByFeed(_ sender: Any) {
 		if groupByFeedSwitch.isOn {
-			AppDefaults.timelineGroupByFeed = true
+			AppDefaults.shared.timelineGroupByFeed = true
 		} else {
-			AppDefaults.timelineGroupByFeed = false
+			AppDefaults.shared.timelineGroupByFeed = false
 		}
 	}
 	
 	@IBAction func switchClearsReadArticles(_ sender: Any) {
 		if refreshClearsReadArticlesSwitch.isOn {
-			AppDefaults.refreshClearsReadArticles = true
+			AppDefaults.shared.refreshClearsReadArticles = true
 		} else {
-			AppDefaults.refreshClearsReadArticles = false
+			AppDefaults.shared.refreshClearsReadArticles = false
 		}
 	}
 	
 	@IBAction func switchConfirmMarkAllAsRead(_ sender: Any) {
 		if confirmMarkAllAsReadSwitch.isOn {
-			AppDefaults.confirmMarkAllAsRead = true
+			AppDefaults.shared.confirmMarkAllAsRead = true
 		} else {
-			AppDefaults.confirmMarkAllAsRead = false
+			AppDefaults.shared.confirmMarkAllAsRead = false
 		}
 	}
 	
 	@IBAction func switchFullscreenArticles(_ sender: Any) {
 		if showFullscreenArticlesSwitch.isOn {
-			AppDefaults.articleFullscreenAvailable = true
+			AppDefaults.shared.articleFullscreenAvailable = true
 		} else {
-			AppDefaults.articleFullscreenAvailable = false
+			AppDefaults.shared.articleFullscreenAvailable = false
 		}
 	}
 	

iOS/Settings/TimelineCustomizerViewController.swift

@@ -27,11 +27,11 @@ class TimelineCustomizerViewController: UIViewController {
         super.viewDidLoad()
 
 		iconSizeSliderContainerView.layer.cornerRadius = 10
-		iconSizeSlider.value = Float(AppDefaults.timelineIconSize.rawValue)
+		iconSizeSlider.value = Float(AppDefaults.shared.timelineIconSize.rawValue)
 		iconSizeSlider.addTickMarks()
 
 		numberOfLinesSliderContainerView.layer.cornerRadius = 10
-		numberOfLinesSlider.value = Float(AppDefaults.timelineNumberOfLines)
+		numberOfLinesSlider.value = Float(AppDefaults.shared.timelineNumberOfLines)
 		numberOfLinesSlider.addTickMarks()
     }
 	
@@ -48,12 +48,12 @@ class TimelineCustomizerViewController: UIViewController {
 
 	@IBAction func iconSizeChanged(_ sender: Any) {
 		guard let iconSize = IconSize(rawValue: Int(iconSizeSlider.value.rounded())) else { return }
-		AppDefaults.timelineIconSize = iconSize
+		AppDefaults.shared.timelineIconSize = iconSize
 		updatePreview()
 	}
 	
 	@IBAction func numberOfLinesChanged(_ sender: Any) {
-		AppDefaults.timelineNumberOfLines = Int(numberOfLinesSlider.value.rounded())
+		AppDefaults.shared.timelineNumberOfLines = Int(numberOfLinesSlider.value.rounded())
 		updatePreview()
 	}
 	

iOS/Settings/TimelinePreviewTableViewController.swift

@@ -71,7 +71,7 @@ private extension TimelinePreviewTableViewController {
 		
 		let iconImage = IconImage(AppAssets.faviconTemplateImage.withTintColor(AppAssets.secondaryAccentColor))
 		
-		return MasterTimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Feed Name", byline: nil, iconImage: iconImage, showIcon: true, featuredImage: nil, numberOfLines: AppDefaults.timelineNumberOfLines, iconSize: AppDefaults.timelineIconSize)
+		return MasterTimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Feed Name", byline: nil, iconImage: iconImage, showIcon: true, featuredImage: nil, numberOfLines: AppDefaults.shared.timelineNumberOfLines, iconSize: AppDefaults.shared.timelineIconSize)
 	}
 		
 }

iOS/ShareExtension/ShareDefaultContainer.swift

@@ -12,8 +12,8 @@ struct ShareDefaultContainer {
 	
 	static func defaultContainer(containers: ExtensionContainers) -> ExtensionContainer? {
 		
-		if let accountID = AppDefaults.addWebFeedAccountID, let account = containers.accounts.first(where: { $0.accountID == accountID }) {
-			if let folderName = AppDefaults.addWebFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) {
+		if let accountID = AppDefaults.shared.addWebFeedAccountID, let account = containers.accounts.first(where: { $0.accountID == accountID }) {
+			if let folderName = AppDefaults.shared.addWebFeedFolderName, let folder = account.folders.first(where: { $0.name == folderName }) {
 				return folder
 			} else {
 				return substituteContainerIfNeeded(account: account)
@@ -27,11 +27,11 @@ struct ShareDefaultContainer {
 	}
 	
 	static func saveDefaultContainer(_ container: ExtensionContainer) {
-		AppDefaults.addWebFeedAccountID = container.accountID
+		AppDefaults.shared.addWebFeedAccountID = container.accountID
 		if let folder = container as? ExtensionFolder {
-			AppDefaults.addWebFeedFolderName = folder.name
+			AppDefaults.shared.addWebFeedFolderName = folder.name
 		} else {
-			AppDefaults.addWebFeedFolderName = nil
+			AppDefaults.shared.addWebFeedFolderName = nil
 		}
 	}