FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed disclosure icon so that it only works on node that can have child nodes.

Browse Source
This commit is contained in:
Maurice Parker 2019-04-17 14:29:52 -05:00
parent 7e14f8bcd3
commit 48ab0cd733
2 changed files with 9 additions and 4 deletions

8
iOS/Master/Cell/MasterTableViewCell.swift

@ -17,9 +17,8 @@ protocol MasterTableViewCellDelegate: class {
class MasterTableViewCell : UITableViewCell { class MasterTableViewCell : UITableViewCell {
private var accessoryButton: UIButton?
weak var delegate: MasterTableViewCellDelegate? weak var delegate: MasterTableViewCellDelegate?
var allowDisclosureSelection = false
override var accessibilityLabel: String? { override var accessibilityLabel: String? {
set {} set {}
@ -93,6 +92,7 @@ class MasterTableViewCell : UITableViewCell {
private let unreadCountView = MasterUnreadCountView(frame: CGRect.zero) private let unreadCountView = MasterUnreadCountView(frame: CGRect.zero)
private var showingEditControl = false private var showingEditControl = false
private var accessoryButton: UIButton?
required init?(coder: NSCoder) { required init?(coder: NSCoder) {
super.init(coder: coder) super.init(coder: coder)
@ -112,6 +112,10 @@ class MasterTableViewCell : UITableViewCell {
@objc func buttonPressed(_ sender: UIButton) { @objc func buttonPressed(_ sender: UIButton) {
guard allowDisclosureSelection else {
return
}
if sender.imageView?.image == AppAssets.chevronRightImage { if sender.imageView?.image == AppAssets.chevronRightImage {
sender.setImage(AppAssets.chevronDownImage, for: .normal) sender.setImage(AppAssets.chevronDownImage, for: .normal)
delegate?.disclosureSelected(self, expanding: true) delegate?.disclosureSelected(self, expanding: true)

1
iOS/Master/MasterViewController.swift

@ -303,6 +303,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
func configure(_ cell: MasterTableViewCell, _ node: Node) { func configure(_ cell: MasterTableViewCell, _ node: Node) {
cell.delegate = self cell.delegate = self
cell.allowDisclosureSelection = node.canHaveChildNodes
cell.name = nameFor(node) cell.name = nameFor(node)
configureUnreadCount(cell, node) configureUnreadCount(cell, node)
configureFavicon(cell, node) configureFavicon(cell, node)