Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover

# Conflicts:
#	iOS/Settings/AddLocalAccountViewController.swift
#	iOS/Settings/DetailAccountViewController.swift
#	iOS/Settings/Settings.storyboard
This commit is contained in:
Phil Viso
2019-05-19 19:03:50 -05:00
8 changed files with 338 additions and 15 deletions

View File

@@ -14,13 +14,15 @@ class AddLocalAccountViewController: UIViewController {
@IBOutlet private weak var localAccountNameLabel: UILabel!
@IBOutlet weak var nameTextField: UITextField!
weak var delegate: AddAccountDismissDelegate?
override func viewDidLoad() {
super.viewDidLoad()
localAccountNameLabel.text = Account.defaultLocalAccountName
nameTextField.delegate = self
}
@IBAction func cancel(_ sender: Any) {
dismiss(animated: true)
}
@@ -29,6 +31,7 @@ class AddLocalAccountViewController: UIViewController {
let account = AccountManager.shared.createAccount(type: .onMyMac)
account.name = nameTextField.text
dismiss(animated: true)
delegate?.dismiss()
}
}