Add SwiftUI account detail view

iOS/Settings/SettingsAddAccountView.swift

@@ -7,11 +7,12 @@
 //
 
 import SwiftUI
+import Account
 
 struct SettingsAddAccountView : View {
     var body: some View {
 		List {
-			PresentationButton(SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: "On My Device"),
+			PresentationButton(SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName),
 							   destination: SettingsLocalAccountView(name: "")).padding(.all, 4)
 			PresentationButton(SettingsAccountLabelView(accountImage: "accountFeedbin", accountLabel: "Feedbin"),
 							   destination: SettingsFeedbinAccountView(viewModel: SettingsFeedbinAccountView.ViewModel())).padding(.all, 4)

iOS/Settings/SettingsDetailAccountView.swift

@@ -0,0 +1,114 @@
+//
+//  SettingsDetailAccountView.swift
+//  NetNewsWire
+//
+//  Created by Maurice Parker on 6/13/19.
+//  Copyright © 2019 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+import Combine
+import Account
+
+struct SettingsDetailAccountView : View {
+	@ObjectBinding var viewModel: ViewModel
+	@State private var verifyDelete = false
+	
+    var body: some View {
+		List {
+			Section {
+				HStack {
+					Text("Name")
+					Divider()
+					TextField($viewModel.name, placeholder: Text("(Optional)"))
+				}
+				Toggle(isOn: $viewModel.isActive) {
+					Text("Active")
+				}
+			}
+			Section {
+				HStack {
+					Spacer()
+					Button(action: {
+						
+					}) {
+						Text("Credentials")
+					}
+					Spacer()
+				}
+			}
+			if viewModel.isDeletable {
+				Section {
+					HStack {
+						Spacer()
+						Button(action: {
+							self.verifyDelete = true
+						}) {
+							Text("Delete Account")
+								.foregroundColor(.red)
+						}
+						.presentation($verifyDelete) {
+							Alert(title: Text("Are you sure you want to delete \"\(viewModel.nameForDisplay)\"?"),
+								  primaryButton: Alert.Button.default(Text("Delete"), onTrigger: { self.viewModel.delete() }),
+								  secondaryButton: Alert.Button.cancel())
+						}
+						Spacer()
+					}
+				}
+			}
+		}
+		.listStyle(.grouped)
+		.navigationBarTitle(Text(verbatim: viewModel.nameForDisplay), displayMode: .inline)
+
+	}
+	
+	class ViewModel: BindableObject {
+		let didChange = PassthroughSubject<ViewModel, Never>()
+		let account: Account
+		
+		init(_ account: Account) {
+			self.account = account
+		}
+		
+		var nameForDisplay: String {
+			account.nameForDisplay
+		}
+		
+		var name: String {
+			get {
+				account.name ?? ""
+			}
+			set {
+				account.name = newValue.isEmpty ? nil : newValue
+				didChange.send(self)
+			}
+		}
+		
+		var isActive: Bool {
+			get {
+				account.isActive
+			}
+			set {
+				account.isActive = newValue
+				didChange.send(self)
+			}
+		}
+		
+		var isDeletable: Bool {
+			return AccountManager.shared.defaultAccount != account
+		}
+		
+		func delete() {
+			AccountManager.shared.deleteAccount(account)
+		}
+	}
+}
+
+#if DEBUG
+struct SettingsDetailAccountView_Previews : PreviewProvider {
+    static var previews: some View {
+		let viewModel = SettingsDetailAccountView.ViewModel(AccountManager.shared.defaultAccount)
+        return SettingsDetailAccountView(viewModel: viewModel)
+    }
+}
+#endif

iOS/Settings/SettingsLocalAccountView.swift

@@ -17,7 +17,7 @@ struct SettingsLocalAccountView : View {
 		NavigationView {
 			List {
 				Section(header:
-					SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: "On My Device").padding()
+					SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName).padding()
 				)  {
 					HStack {
 						Spacer()

iOS/Settings/SettingsView.swift

@@ -7,10 +7,11 @@
 //
 
 import SwiftUI
+import Combine
 import Account
 
 struct SettingsView : View {
-	@ObjectBinding var viewModel: SettingsViewModel
+	@ObjectBinding var viewModel: ViewModel
 	
     var body: some View {
 		NavigationView {
@@ -18,7 +19,9 @@ struct SettingsView : View {
 				
 				Section(header: Text("ACCOUNTS")) {
 					ForEach(viewModel.accounts.identified(by: \.self)) { account in
-						Text(verbatim: account.nameForDisplay)
+						NavigationButton(destination: SettingsDetailAccountView(viewModel: SettingsDetailAccountView.ViewModel(account)), isDetail: false) {
+							Text(verbatim: account.nameForDisplay)
+						}
 					}
 					NavigationButton(destination: SettingsAddAccountView(), isDetail: false) {
 						Text("Add Account")
@@ -83,12 +86,74 @@ struct SettingsView : View {
 
 		}
     }
+	
+	class ViewModel: BindableObject {
+		
+		let didChange = PassthroughSubject<ViewModel, Never>()
+		
+		init() {
+			NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange(_:)), name: .AccountsDidChange, object: nil)
+			NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange(_:)), name: .DisplayNameDidChange, object: nil)
+		}
+		
+		var accounts: [Account] {
+			get {
+				return AccountManager.shared.sortedAccounts
+			}
+			set {
+			}
+		}
+		
+		var sortOldestToNewest: Bool {
+			get {
+				return AppDefaults.timelineSortDirection == .orderedDescending
+			}
+			set {
+				if newValue == true {
+					AppDefaults.timelineSortDirection = .orderedDescending
+				} else {
+					AppDefaults.timelineSortDirection = .orderedAscending
+				}
+				didChange.send(self)
+			}
+		}
+		
+		var timelineNumberOfLines: Int {
+			get {
+				return AppDefaults.timelineNumberOfLines
+			}
+			set {
+				AppDefaults.timelineNumberOfLines = newValue
+				didChange.send(self)
+			}
+		}
+		
+		var refreshInterval: RefreshInterval {
+			get {
+				return AppDefaults.refreshInterval
+			}
+			set {
+				AppDefaults.refreshInterval = newValue
+				didChange.send(self)
+			}
+		}
+		
+		@objc func accountsDidChange(_ notification: Notification) {
+			didChange.send(self)
+		}
+		
+		@objc func displayNameDidChange(_ notification: Notification) {
+			didChange.send(self)
+		}
+		
+	}
+
 }
 
 #if DEBUG
 struct SettingsView_Previews : PreviewProvider {
     static var previews: some View {
-        SettingsView(viewModel: SettingsViewModel())
+        SettingsView(viewModel: SettingsView.ViewModel())
     }
 }
 #endif

iOS/Settings/SettingsViewModel.swift

@@ -1,68 +0,0 @@
-//
-//  SettingsViewModel.swift
-//  NetNewsWire-iOS
-//
-//  Created by Maurice Parker on 6/11/19.
-//  Copyright © 2019 Ranchero Software. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import Combine
-import Account
-
-class SettingsViewModel: BindableObject {
-	
-	let didChange = PassthroughSubject<SettingsViewModel, Never>()
-	
-	init() {
-		NotificationCenter.default.addObserver(self, selector: #selector(accountsDidChange(_:)), name: .AccountsDidChange, object: nil)
-	}
-	
-	var accounts: [Account] {
-		get {
-			return AccountManager.shared.accounts
-		}
-		set {
-		}
-	}
-	
-	var sortOldestToNewest: Bool {
-		get {
-			return AppDefaults.timelineSortDirection == .orderedDescending
-		}
-		set {
-			if newValue == true {
-				AppDefaults.timelineSortDirection = .orderedDescending
-			} else {
-				AppDefaults.timelineSortDirection = .orderedAscending
-			}
-			didChange.send(self)
-		}
-	}
-	
-	var timelineNumberOfLines: Int {
-		get {
-			return AppDefaults.timelineNumberOfLines
-		}
-		set {
-			AppDefaults.timelineNumberOfLines = newValue
-			didChange.send(self)
-		}
-	}
-	
-	var refreshInterval: RefreshInterval {
-		get {
-			return AppDefaults.refreshInterval
-		}
-		set {
-			AppDefaults.refreshInterval = newValue
-			didChange.send(self)
-		}
-	}
-	
-	@objc func accountsDidChange(_ notification: Notification) {
-		didChange.send(self)
-	}
-	
-}