renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite Add Feed and Add Folder to be separate dialogs

Browse Source
This commit is contained in:
Maurice Parker
2020-08-11 15:00:31 -05:00
parent 3188a80d25
commit 0ec250ec24
13 changed files with 152 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iOS/Add/AddFolderViewController.swift
View File

@@ -10,12 +10,15 @@ import UIKit
import Account
import RSCore
class AddFolderViewController: UITableViewController, AddContainerViewControllerChild {
class AddFolderViewController: UITableViewController {
@IBOutlet private weak var addButton: UIBarButtonItem!
@IBOutlet private weak var nameTextField: UITextField!
@IBOutlet private weak var accountLabel: UILabel!
@IBOutlet private weak var accountPickerView: UIPickerView!
static let preferredContentSizeForFormSheetDisplay = CGSize(width: 460.0, height: 400.0)
private var shouldDisplayPicker: Bool {
return accounts.count > 1
}
@@ -37,10 +40,7 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
}
}
weak var delegate: AddContainerViewControllerChildDelegate?
override func viewDidLoad() {
super.viewDidLoad()
accounts = AccountManager.shared
@@ -61,11 +61,9 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
accountPickerView.isHidden = true
}
// I couldn't figure out the gap at the top of the UITableView, so I took a hammer to it.
tableView.contentInset = UIEdgeInsets(top: -28, left: 0, bottom: 0, right: 0)
NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: nameTextField)
nameTextField.becomeFirstResponder()
}
private func didSelect(_ account: Account) {
@@ -73,26 +71,27 @@ class AddFolderViewController: UITableViewController, AddContainerViewController
selectedAccount = account
}
func cancel() {
delegate?.processingDidEnd()
@IBAction func cancel(_ sender: Any) {
dismiss(animated: true)
}
func add() {
@IBAction func add(_ sender: Any) {
guard let folderName = nameTextField.text else {
return
}
selectedAccount.addFolder(folderName) { result in
switch result {
case .success:
self.delegate?.processingDidEnd()
self.dismiss(animated: true)
case .failure(let error):
self.presentError(error)
self.dismiss(animated: true)
}
}
}
@objc func textDidChange(_ note: Notification) {
delegate?.readyToAdd(state: !(nameTextField.text?.isEmpty ?? false))
addButton.isEnabled = !(nameTextField.text?.isEmpty ?? false)
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {