passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-01-17 22:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop OptionViewControllerDelegate, use blocks

Browse Source
This commit is contained in:
Davide De Rosa 2019-04-06 16:05:13 +02:00
parent 8fd5a74dc4
commit 03dd33852b
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Passepartout-iOS/Global/OptionViewController.swift
View File

@ -25,12 +25,6 @@
import UIKit
protocol OptionViewControllerDelegate: class {
func optionController<T: Hashable>(_: OptionViewController<T>, descriptionFor option: T) -> String
func optionController<T: Hashable>(_: OptionViewController<T>, didSelect option: T)
}
class OptionViewController<T: Hashable>: UIViewController, UITableViewDataSource, UITableViewDelegate {
private lazy var tableView = UITableView(frame: .zero, style: .grouped)
@ -42,8 +36,6 @@ class OptionViewController<T: Hashable>: UIViewController, UITableViewDataSource
var selectionBlock: ((T) -> Void)?
weak var delegate: OptionViewControllerDelegate?
override func viewDidLoad() {
super.viewDidLoad()
@ -63,13 +55,13 @@ class OptionViewController<T: Hashable>: UIViewController, UITableViewDataSource
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let opt = options[indexPath.row]
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = descriptionBlock?(opt) ?? delegate?.optionController(self, descriptionFor: opt)
cell.leftText = descriptionBlock?(opt)
cell.applyChecked(opt == selectedOption, Theme.current)
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let opt = options[indexPath.row]
selectionBlock?(opt) ?? delegate?.optionController(self, didSelect: opt)
selectionBlock?(opt)
}
}