macOS Multiplatform is building again

Multiplatform/Shared/AppAssets.swift

@@ -18,40 +18,53 @@ struct AppAssets {
 	}()
 	#endif
 	
+	static var accountBazQux: RSImage! = {
+		return RSImage(named: "accountBazQux")
+	}()
+	
+	
 	static var accountLocalMacImage: RSImage! = {
-		return RSImage(named: "AccountLocalMac")
+		return RSImage(named: "accountLocalMac")
 	}()
 
 	static var accountLocalPadImage: RSImage = {
-		return RSImage(named: "AccountLocalPad")!
+		return RSImage(named: "accountLocalPad")!
 	}()
 
 	static var accountLocalPhoneImage: RSImage = {
-		return RSImage(named: "AccountLocalPhone")!
+		return RSImage(named: "accountLocalPhone")!
 	}()
 
 	static var accountCloudKitImage: RSImage = {
-		return RSImage(named: "AccountCloudKit")!
+		return RSImage(named: "accountCloudKit")!
 	}()
 
 	static var accountFeedbinImage: RSImage = {
-		return RSImage(named: "AccountFeedbin")!
+		return RSImage(named: "accountFeedbin")!
 	}()
 
 	static var accountFeedlyImage: RSImage = {
-		return RSImage(named: "AccountFeedly")!
+		return RSImage(named: "accountFeedly")!
 	}()
 	
 	static var accountFeedWranglerImage: RSImage = {
-		return RSImage(named: "AccountFeedWrangler")!
+		return RSImage(named: "accountFeedWrangler")!
 	}()
 
 	static var accountFreshRSSImage: RSImage = {
-		return RSImage(named: "AccountFreshRSS")!
+		return RSImage(named: "accountFreshRSS")!
+	}()
+	
+	static var accountInoreader: RSImage! = {
+		return RSImage(named: "accountInoreader")
 	}()
 
 	static var accountNewsBlurImage: RSImage = {
-		return RSImage(named: "AccountNewsBlur")!
+		return RSImage(named: "accountNewsBlur")!
+	}()
+	
+	static var accountTheOldReader: RSImage! = {
+		return RSImage(named: "accountTheOldReader")
 	}()
 
 	static var addMenuImage: Image = {
@@ -325,6 +338,8 @@ struct AppAssets {
 				return AppAssets.accountLocalPhoneImage
 			}
 			#endif
+		case .bazQux:
+			return AppAssets.accountBazQux
 		case .cloudKit:
 			return AppAssets.accountCloudKitImage
 		case .feedbin:
@@ -337,6 +352,11 @@ struct AppAssets {
 			return AppAssets.accountFreshRSSImage
 		case .newsBlur:
 			return AppAssets.accountNewsBlurImage
+		case .inoreader:
+			return AppAssets.accountInoreader
+		case .theOldReader:
+			return AppAssets.accountTheOldReader
+			
 		}
 	}
 	

Multiplatform/Shared/Assets.xcassets/AccountCloudKit.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icloud.pdf",
+      "filename" : "icloud-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "icloud-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +20,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/AccountFeedWrangler.imageset/Contents.json

@@ -1,8 +1,52 @@
 {
   "images" : [
     {
-      "filename" : "outline-512.png",
+      "filename" : "feedwranger-any-slice.png",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark-slice.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "feedwranger-any-slice@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark-slice@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "feedwranger-any-slice@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark-slice@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
@@ -10,6 +54,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/AccountFeedbin.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "feedbin-logo.pdf",
+      "filename" : "feedbin-logo-filled.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedbin-logo-filled-1.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/AccountFeedly.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "accountFeedly.pdf",
+      "filename" : "feedly-logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedly-logo-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +20,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/AccountFreshRSS.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "accountFreshRSS.pdf",
+      "filename" : "FreshRSS.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/AccountNewsBlur.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "newsblur-512.png",
+      "filename" : "Newsblur-any.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/accountBazQux.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "mac.pdf",
+      "filename" : "bazqux-any.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,7 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
   }
 }

Multiplatform/Shared/Assets.xcassets/accountInoreader.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "inoreader_logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "inoreader_logo-dark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
+  }
+}

Multiplatform/Shared/Assets.xcassets/accountLocal.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "localAccountLight.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "localAccountDark-1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Multiplatform/Shared/Assets.xcassets/accountLocalMac.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "localAccountLight.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "localAccountDark-1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

Multiplatform/Shared/Assets.xcassets/accountTheOldReader.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "oldreader-icon-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "oldreader-icon-dark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
+  }
+}

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/AccountsPreferencesView.swift

@@ -30,9 +30,7 @@ struct AccountsPreferencesView: View {
 				content: {
 					switch viewModel.sheetToShow {
 					case .add:
-						AddAccountView(preferencesModel: viewModel)
+						AddAccountView()
-							.frame(width: 300, height: 200)
-							.padding()
 					case .credentials:
 						EditAccountCredentialsView(viewModel: viewModel)
 					case .none:

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountModel.swift

@@ -14,11 +14,7 @@ import RSCore
 
 class AddAccountModel: ObservableObject {
 	
-	#if DEBUG
+	let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .feedWrangler, .freshRSS, .cloudKit, .newsBlur, .bazQux, .inoreader, .theOldReader]
-	let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .feedWrangler, .freshRSS, .cloudKit, .newsBlur]
-	#else
-	let addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly]
-	#endif
 	
 	// Add Accounts
 	@Published var selectedAddAccount: AccountType = .onMyMac
@@ -56,8 +52,8 @@ class AddAccountModel: ObservableObject {
 			authenticateFeedbin()
 		case .feedWrangler:
 			authenticateFeedWrangler()
-		case .freshRSS:
+		case .freshRSS, .inoreader, .bazQux, .theOldReader:
-			authenticateFreshRSS()
+			authenticateReaderAccount(selectedAddAccount)
 		case .feedly:
 			authenticateFeedly()
 		case .newsBlur:
@@ -214,49 +210,94 @@ extension AddAccountModel {
 		
 	}
 	
-	private func authenticateFreshRSS() {
+	private func authenticateReaderAccount(_ accountType: AccountType) {
 		accountIsAuthenticating = true
 		let credentials = Credentials(type: .readerBasic, username: userName, secret: password)
 		
-		Account.validateCredentials(type: .freshRSS, credentials: credentials, endpoint: URL(string: apiUrl)!) { [weak self] result in
+		if accountType == .freshRSS {
-			
+			Account.validateCredentials(type: accountType, credentials: credentials, endpoint: URL(string: apiUrl)!) { [weak self] result in
-			guard let self = self else { return }
-			
-			self.accountIsAuthenticating = false
-			
-			switch result {
-			case .success(let validatedCredentials):
 				
-				guard let validatedCredentials = validatedCredentials else {
+				guard let self = self else { return }
-					self.addAccountError = .invalidUsernamePassword
-					return
-				}
 				
-				let account = AccountManager.shared.createAccount(type: .freshRSS)
+				self.accountIsAuthenticating = false
 				
-				do {
+				switch result {
-					try account.removeCredentials(type: .readerBasic)
+				case .success(let validatedCredentials):
-					try account.removeCredentials(type: .readerAPIKey)
-					try account.storeCredentials(credentials)
-					try account.storeCredentials(validatedCredentials)
-					self.accountAdded = true
-					account.refreshAll(completion: { result in
-						switch result {
-						case .success:
-							break
-						case .failure(let error):
-							self.addAccountError = .other(error: error)
-						}
-					})
 					
-				} catch {
+					guard let validatedCredentials = validatedCredentials else {
-					self.addAccountError = .keyChainError
+						self.addAccountError = .invalidUsernamePassword
+						return
+					}
+					
+					let account = AccountManager.shared.createAccount(type: .freshRSS)
+					
+					do {
+						try account.removeCredentials(type: .readerBasic)
+						try account.removeCredentials(type: .readerAPIKey)
+						try account.storeCredentials(credentials)
+						try account.storeCredentials(validatedCredentials)
+						self.accountAdded = true
+						account.refreshAll(completion: { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								self.addAccountError = .other(error: error)
+							}
+						})
+						
+					} catch {
+						self.addAccountError = .keyChainError
+					}
+					
+				case .failure:
+					self.addAccountError = .networkError
+				}
+			}
+		}	else {
+				
+				Account.validateCredentials(type: accountType, credentials: credentials) { [weak self] result in
+				
+				guard let self = self else { return }
+				
+				self.accountIsAuthenticating = false
+				
+				switch result {
+				case .success(let validatedCredentials):
+					
+					guard let validatedCredentials = validatedCredentials else {
+						self.addAccountError = .invalidUsernamePassword
+						return
+					}
+					
+					let account = AccountManager.shared.createAccount(type: .freshRSS)
+					
+					do {
+						try account.removeCredentials(type: .readerBasic)
+						try account.removeCredentials(type: .readerAPIKey)
+						try account.storeCredentials(credentials)
+						try account.storeCredentials(validatedCredentials)
+						self.accountAdded = true
+						account.refreshAll(completion: { result in
+							switch result {
+							case .success:
+								break
+							case .failure(let error):
+								self.addAccountError = .other(error: error)
+							}
+						})
+						
+					} catch {
+						self.addAccountError = .keyChainError
+					}
+					
+				case .failure:
+					self.addAccountError = .networkError
+				}
 				}
 				
-			case .failure:
-				self.addAccountError = .networkError
 			}
-		}
+		
 	}
 	
 	private func authenticateCloudKit() {

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountPickerRow.swift

@@ -27,6 +27,12 @@ struct AddAccountPickerRow: View {
 					Text(Account.defaultLocalAccountName)
 				case .cloudKit:
 					Text("iCloud")
+				case .inoreader:
+					Text("Inoreader")
+				case .theOldReader:
+					Text("The Old Reader")
+				case .bazQux:
+					Text("BazQux")
 				case .feedbin:
 					Text("Feedbin")
 				case .feedWrangler:

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift

@@ -1,150 +1,269 @@
 //
 //  AddAccountView.swift
-//  Multiplatform macOS
+//  NetNewsWire
 //
-//  Created by Stuart Breckenridge on 13/7/20.
+//  Created by Stuart Breckenridge on 28/10/20.
 //  Copyright © 2020 Ranchero Software. All rights reserved.
 //
 
 import SwiftUI
 import Account
 
+enum AddAccountSections: Int, CaseIterable {
+	case local = 0
+	case icloud
+	case web
+	case selfhosted
+	case allOrdered
+	
+	var sectionHeader: String {
+		switch self {
+		case .local:
+			return NSLocalizedString("Local", comment: "Local Account")
+		case .icloud:
+			return NSLocalizedString("iCloud", comment: "iCloud Account")
+		case .web:
+			return NSLocalizedString("Web", comment: "Web Account")
+		case .selfhosted:
+			return NSLocalizedString("Self-hosted", comment: "Self hosted Account")
+		case .allOrdered:
+			return ""
+		}
+	}
+	
+	var sectionFooter: String {
+		switch self {
+		case .local:
+			return NSLocalizedString("Local accounts do not sync subscriptions across devices.", comment: "Local Account")
+		case .icloud:
+			return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+		case .web:
+			return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+		case .selfhosted:
+			return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+		case .allOrdered:
+			return ""
+		}
+	}
+	
+	var sectionContent: [AccountType] {
+		switch self {
+		case .local:
+			return [.onMyMac]
+		case .icloud:
+			return [.cloudKit]
+		case .web:
+			#if DEBUG
+			return [.bazQux, .feedbin, .feedly, .feedWrangler, .inoreader, .newsBlur, .theOldReader]
+			#else
+			return [.bazQux, .feedbin, .feedly, .feedWrangler, .inoreader, .newsBlur, .theOldReader]
+			#endif
+		case .selfhosted:
+			return [.freshRSS]
+		case .allOrdered:
+			return AddAccountSections.local.sectionContent +
+			AddAccountSections.icloud.sectionContent +
+				AddAccountSections.web.sectionContent +
+				AddAccountSections.selfhosted.sectionContent
+		}
+	}
+}
+
 struct AddAccountView: View {
 	
-	@Environment(\.presentationMode) private var presentationMode
+	@State private var selectedAccount: AccountType = .onMyMac
-	@ObservedObject var preferencesModel: AccountsPreferencesModel
+	@Environment(\.presentationMode) var presentationMode
-	@StateObject private var viewModel = AddAccountModel()
+	
-
 	var body: some View {
+		VStack(alignment: .leading, spacing: 8) {
+			Text("Choose an account type to add...")
+				.font(.headline)
+				.padding()
 			
-		Form {
+			localAccount
-			Text("Add an Account").font(.headline)
+			icloudAccount
+			webAccounts
+			selfhostedAccounts
 			
-			Picker("Account Type",
+			HStack(spacing: 12) {
-					selection: $viewModel.selectedAddAccount,
-					content: {
-					ForEach(0..<viewModel.addableAccountTypes.count, content: { i in
-						AddAccountPickerRow(accountType: viewModel.addableAccountTypes[i]).tag(viewModel.addableAccountTypes[i])
-					})
-					}).pickerStyle(MenuPickerStyle())
-			
-			switch viewModel.selectedAddAccount {
-				case .onMyMac:
-					addLocalAccountView
-				case .cloudKit:
-					iCloudAccountView
-				case .feedbin:
-					userNameAndPasswordView
-				case .feedWrangler:
-					userNameAndPasswordView
-				case .freshRSS:
-					userNamePasswordAndAPIUrlView
-				case .feedly:
-					oAuthView
-				case .newsBlur:
-					userNameAndPasswordView
-			}
-			
-			Spacer()
-			HStack {
-				if viewModel.accountIsAuthenticating {
-					ProgressView("Adding Account")
-				}
 				Spacer()
-				Button(action: { presentationMode.wrappedValue.dismiss() }, label: {
+				if #available(OSX 11.0, *) {
-					Text("Cancel")
+					Button(action: {
-				})
+						presentationMode.wrappedValue.dismiss()
-				
+					}, label: {
-				switch viewModel.selectedAddAccount {
+						Text("Cancel")
-					case .onMyMac:
+							.frame(width: 80)
-						Button("Add Account", action: {
+					})
-							viewModel.authenticateAccount()
+					.help("Cancel")
-						})
+					.keyboardShortcut(.cancelAction)
-					case .feedly:
+					
-						Button("Authenticate", action: {
+				} else {
-							viewModel.authenticateAccount()
+					Button(action: {
-						})
+						presentationMode.wrappedValue.dismiss()
-					case .cloudKit:
+					}, label: {
-						Button("Add Account", action: {
+						Text("Cancel")
-							viewModel.authenticateAccount()
+							.frame(width: 80)
-						})
+					})
-					case .freshRSS:
+					.accessibility(label: Text("Add Account"))
-						Button("Add Account", action: {
+				}
-							viewModel.authenticateAccount()
+				if #available(OSX 11.0, *) {
-						})
+					Button(action: {
-						.disabled(viewModel.userName.count == 0 || viewModel.password.count == 0 || viewModel.apiUrl.count == 0)
+						//
-					default:
+						presentationMode.wrappedValue.dismiss()
-						Button("Add Account", action: {
+					}, label: {
-							viewModel.authenticateAccount()
+						Text("Continue")
-						})
+							.frame(width: 80)
-						.disabled(viewModel.userName.count == 0 || viewModel.password.count == 0)
+					})
+					.help("Add Account")
+					.keyboardShortcut(.defaultAction)
+					
+				} else {
+					Button(action: {
+						presentationMode.wrappedValue.dismiss()
+					}, label: {
+						Text("Continue")
+							.frame(width: 80)
+					})
 				}
 			}
+			.padding(.top, 12)
+			.padding(.bottom, 4)
 		}
+		.pickerStyle(RadioGroupPickerStyle())
+		.fixedSize(horizontal: false, vertical: true)
+		.frame(width: 420)
+		.padding()
+	}
+	
+	var localAccount: some View {
+		VStack(alignment: .leading) {
+			Text("Local")
+				.font(.headline)
+				.padding(.horizontal)
 			
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.local.sectionContent, id: \.self, content: { account in
+					HStack(alignment: .center) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.padding(.leading, 4)
+						Text(account.localizedAccountName())
+					}
+					.tag(account)
+				})
+			})
+			.pickerStyle(RadioGroupPickerStyle())
+			.offset(x: 7.5, y: 0)
+			
+			Text(AddAccountSections.local.sectionFooter).foregroundColor(.gray)
+				.font(.caption)
+				.padding(.horizontal)
 			
-		.onChange(of: viewModel.selectedAddAccount) { _ in
-			viewModel.resetUserEntries()
 		}
-		.onChange(of: viewModel.accountAdded) { value in
+		
-			if value == true {
+	}
-				preferencesModel.showAddAccountView = false
+	
-				presentationMode.wrappedValue.dismiss()
+	var icloudAccount: some View {
-			}
+		VStack(alignment: .leading) {
-		}
+			Text("iCloud")
-		.alert(isPresented: $viewModel.showError) {
+				.font(.headline)
-			Alert(title: Text("Error Adding Account"),
+				.padding(.horizontal)
-				  message: Text(viewModel.addAccountError.description),
+				.padding(.top, 8)
-				  dismissButton: .default(Text("Dismiss"),
+			
-										  action: {
+			Picker(selection: $selectedAccount, label: Text(""), content: {
-											viewModel.addAccountError = .none
+				ForEach(AddAccountSections.icloud.sectionContent, id: \.self, content: { account in
-										  }))
+					HStack(alignment: .center) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.padding(.leading, 4)
+						
+						Text(account.localizedAccountName())
+					}
+					.tag(account)
+				})
+			})
+			.offset(x: 7.5, y: 0)
+			.disabled(isCloudInUse())
+			
+			Text(AddAccountSections.icloud.sectionFooter).foregroundColor(.gray)
+				.font(.caption)
+				.padding(.horizontal)
 		}
 	}
 	
-	
+	var webAccounts: some View {
-	var addLocalAccountView: some View {
+		VStack(alignment: .leading) {
-		Group {
+			Text("Web")
-			TextField("Account Name", text: $viewModel.newLocalAccountName)
+				.font(.headline)
-			Text("This account stores all of its data on your device. It does not sync.")
+				.padding(.horizontal)
-				.foregroundColor(.secondary)
+				.padding(.top, 8)
-				.multilineTextAlignment(.leading)
+			
-		}.textFieldStyle(RoundedBorderTextFieldStyle())
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.web.sectionContent, id: \.self, content: { account in
+					
+					HStack(alignment: .center) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.padding(.leading, 4)
+							
+						Text(account.localizedAccountName())
+					}
+					.tag(account)
+					
+				})
+			})
+			.offset(x: 7.5, y: 0)
+			
+			Text(AddAccountSections.web.sectionFooter).foregroundColor(.gray)
+				.font(.caption)
+				.padding(.horizontal)
+		}
 	}
 	
-	var iCloudAccountView: some View {
+	var selfhostedAccounts: some View {
-		Group {
+		VStack(alignment: .leading) {
-			Text("This account syncs across your devices using your iCloud account.")
+			Text("Self-hosted")
-				.foregroundColor(.secondary)
+				.font(.headline)
-				.multilineTextAlignment(.leading)
+				.padding(.horizontal)
-		}.textFieldStyle(RoundedBorderTextFieldStyle())
+				.padding(.top, 8)
+			
+			Picker(selection: $selectedAccount, label: Text(""), content: {
+				ForEach(AddAccountSections.selfhosted.sectionContent, id: \.self, content: { account in
+					HStack(alignment: .center) {
+						account.image()
+							.resizable()
+							.aspectRatio(contentMode: .fit)
+							.frame(width: 25, height: 25, alignment: .center)
+							.padding(.leading, 4)
+			
+						Text(account.localizedAccountName())
+					}.tag(account)
+				})
+			})
+			.offset(x: 7.5, y: 0)
+			
+			Text(AddAccountSections.selfhosted.sectionFooter).foregroundColor(.gray)
+				.font(.caption)
+				.padding(.horizontal)
+		}
 	}
 	
-	var userNameAndPasswordView: some View {
+	private func isCloudInUse() -> Bool {
-		Group {
+		AccountManager.shared.accounts.contains(where: { $0.type == .cloudKit })
-			TextField("Email", text: $viewModel.userName)
-			SecureField("Password", text: $viewModel.password)
-		}.textFieldStyle(RoundedBorderTextFieldStyle())
 	}
 	
-	var userNamePasswordAndAPIUrlView: some View {
+	private func isRestricted(_ accountType: AccountType) -> Bool {
-		Group {
+		if AppDefaults.shared.isDeveloperBuild && (accountType == .feedly || accountType == .feedWrangler || accountType == .inoreader) {
-			TextField("Email", text: $viewModel.userName)
+			return true
-			SecureField("Password", text: $viewModel.password)
+		}
-			TextField("API URL", text: $viewModel.apiUrl)
+		return false
-		}.textFieldStyle(RoundedBorderTextFieldStyle())
-	}
-	
-	var oAuthView: some View {
-		Group {
-			Text("Click Authenticate")
-		}.textFieldStyle(RoundedBorderTextFieldStyle())
-	}
-	
-	
-}
-struct AddAccountView_Previews: PreviewProvider {
-	static var previews: some View {
-		AddAccountView(preferencesModel: AccountsPreferencesModel())
 	}
 }
+
+

Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Edit Account/EditAccountCredentialsModel.swift

@@ -42,9 +42,15 @@ class EditAccountCredentialsModel: ObservableObject {
 		case .feedly:
 			updateFeedly(account)
 		case .freshRSS:
-			updateFreshRSS(account)
+			updateReaderAccount(account)
 		case .newsBlur:
 			updateNewsblur(account)
+		case .inoreader:
+			updateReaderAccount(account)
+		case .bazQux:
+			updateReaderAccount(account)
+		case .theOldReader:
+			updateReaderAccount(account)
 		}
 	}
 	
@@ -168,11 +174,11 @@ extension EditAccountCredentialsModel {
 		MainThreadOperationQueue.shared.add(updateAccount)
 	}
 	
-	func updateFreshRSS(_ account: Account) {
+	func updateReaderAccount(_ account: Account) {
 		accountIsUpdatingCredentials = true
 		let credentials = Credentials(type: .readerBasic, username: userName, secret: password)
 		
-		Account.validateCredentials(type: .freshRSS, credentials: credentials) { [weak self] result in
+		Account.validateCredentials(type: account.type, credentials: credentials) { [weak self] result in
 			
 			guard let self = self else { return }
 			

NetNewsWire.xcodeproj/project.pbxproj

@@ -34,6 +34,8 @@
 		1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */; };
 		1729529724AA1CD000D65E66 /* MacPreferencePanes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529624AA1CD000D65E66 /* MacPreferencePanes.swift */; };
 		1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529A24AA1FD200D65E66 /* MacSearchField.swift */; };
+		17386B5E2577BC820014C8B2 /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; };
+		17386B6C2577BD820014C8B2 /* RSSparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 17386B6B2577BD820014C8B2 /* RSSparkle */; };
 		173A64172547BE0900267F6E /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; };
 		173A642C2547BE9600267F6E /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; };
 		175942AA24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
@@ -1980,6 +1982,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				17386B6C2577BD820014C8B2 /* RSSparkle in Frameworks */,
 				516B695B24D2F28600B5702F /* Account in Frameworks */,
 				51E498B124A806A400B667CB /* CloudKit.framework in Frameworks */,
 				51E498B324A806AA00B667CB /* WebKit.framework in Frameworks */,
@@ -3662,6 +3665,7 @@
 			name = "Multiplatform macOS";
 			packageProductDependencies = (
 				516B695A24D2F28600B5702F /* Account */,
+				17386B6B2577BD820014C8B2 /* RSSparkle */,
 			);
 			productName = macOS;
 			productReference = 51C0514424A77DF800194D5E /* NetNewsWire.app */;
@@ -4653,6 +4657,7 @@
 				51B54B6724B6A7960014348B /* WebStatusBarView.swift in Sources */,
 				51E4993E24A870F900B667CB /* UserNotificationManager.swift in Sources */,
 				51E4992E24A8676300B667CB /* FetchRequestQueue.swift in Sources */,
+				17386B5E2577BC820014C8B2 /* AccountType+Helpers.swift in Sources */,
 				51E498CF24A8085D00B667CB /* SmartFeed.swift in Sources */,
 				51E4990724A808C300B667CB /* AuthorAvatarDownloader.swift in Sources */,
 				51E4997424A8784400B667CB /* DefaultFeedsImporter.swift in Sources */,
@@ -5829,6 +5834,11 @@
 			package = 17192AD82567B3D500AAEACA /* XCRemoteSwiftPackageReference "Sparkle-Binary" */;
 			productName = RSSparkle;
 		};
+		17386B6B2577BD820014C8B2 /* RSSparkle */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 17192AD82567B3D500AAEACA /* XCRemoteSwiftPackageReference "Sparkle-Binary" */;
+			productName = RSSparkle;
+		};
 		17A1597B24E3DEDD005DA32A /* RSCore */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */;