Add edit/done buttons to have a more discoverable way to remove tunnels.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-09-18 22:46:28 +02:00
parent 411c919cbf
commit c9974f9119
2 changed files with 51 additions and 5 deletions
@@ -24,6 +24,10 @@ class TunnelsTableViewController: UITableViewController {
var viewContext: NSManagedObjectContext!
@IBOutlet var settingsButton: UIBarButtonItem!
@IBOutlet var editButton: UIBarButtonItem!
@IBOutlet var doneButton: UIBarButtonItem!
private lazy var fetchedResultsController: FetchedResultsController<Tunnel> = {
let fetchRequest = NSFetchRequest<Tunnel>()
fetchRequest.entity = Tunnel.entity()
@@ -66,6 +70,26 @@ class TunnelsTableViewController: UITableViewController {
tableView.tableFooterView = UIView(frame: CGRect.zero)
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
updateBarButtons()
}
@IBAction func editTunnels(_ sender: Any) {
tableView.setEditing(!tableView.isEditing, animated: true)
updateBarButtons()
}
private func updateBarButtons() {
navigationController?.setToolbarHidden(tableView.isEditing, animated: true)
if tableView.isEditing {
self.navigationItem.setRightBarButtonItems([doneButton], animated: true)
} else {
self.navigationItem.setRightBarButtonItems([settingsButton, editButton], animated: true)
}
}
@IBAction func showSettings(_ sender: Any) {
delegate?.showSettings()
}
@@ -254,6 +278,11 @@ class TunnelTableViewCell: UITableViewCell {
tunnelSwitch.onTintColor = status == .invalid || status == .reasserting ? .gray : .green
tunnelSwitch.isEnabled = true
}
override func setEditing(_ editing: Bool, animated: Bool) {
super.setEditing(editing, animated: animated)
tunnelSwitch.isHidden = editing
}
}
extension TunnelTableViewCell: Identifyable {}