Add accessoryButtonAction to NavigationRow

Author: bcylin

Source/Rows/NavigationRow.swift

@@ -31,6 +31,28 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
 
   // MARK: - Initializer
 
+  #if os(iOS)
+
+  /// Initializes a `NavigationRow` with a text and a detail text.
+  /// The icon, customization, action and accessory button action closures are optional.
+  public init(
+    text: String,
+    detailText: DetailText,
+    icon: Icon? = nil,
+    customization: ((UITableViewCell, Row & RowStyle) -> Void)? = nil,
+    action: ((Row) -> Void)? = nil,
+    accessoryButtonAction: ((Row) -> Void)? = nil
+  ) {
+    self.text = text
+    self.detailText = detailText
+    self.icon = icon
+    self.customize = customization
+    self.action = action
+    self.accessoryButtonAction = accessoryButtonAction
+  }
+
+  #elseif os(tvOS)
+
   /// Initializes a `NavigationRow` with a text and a detail text.
   /// The icon, customization and action closures are optional.
   public init(
@@ -47,6 +69,8 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
     self.action = action
   }
 
+  #endif
+
   // MARK: - Row
 
   /// The text of the row.
@@ -58,6 +82,13 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
   /// A closure that will be invoked when the row is selected.
   public let action: ((Row) -> Void)?
 
+  #if os(iOS)
+
+  /// A closure that will be invoked when the accessory button is selected.
+  public let accessoryButtonAction: ((Row) -> Void)?
+
+  #endif
+
   // MARK: - RowStyle
 
   /// The type of the table view cell to display the row.
@@ -76,9 +107,19 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
   /// The icon of the row.
   public let icon: Icon?
 
-  /// Returns `.disclosureIndicator` when action is not nil, otherwise returns `.none`.
+  /// Returns the accessory type with the disclosure indicator when `action` is not nil,
+  /// and with the detail button when `accessoryButtonAction` is not nil.
   public var accessoryType: UITableViewCell.AccessoryType {
-    return (action == nil) ? .none : .disclosureIndicator
+    #if os(iOS)
+      switch (action, accessoryButtonAction) {
+      case (nil, nil):      return .none
+      case (.some, nil):    return .disclosureIndicator
+      case (nil, .some):    return .detailButton
+      case (.some, .some):  return .detailDisclosureButton
+      }
+    #elseif os(tvOS)
+      return (action == nil) ? .none : .disclosureIndicator
+    #endif
   }
 
   /// The `NavigationRow` is selectable when action is not nil.

Tests/Row/NavigationRowSpec.swift

@@ -31,6 +31,39 @@ import Quick
 internal final class NavigationRowSpec: QuickSpec {
 
   override func spec() {
+
+#if os(iOS)
+    describe("initialization") {
+      let detailText = DetailText.subtitle("subtitle")
+      let icon = Icon.named("icon")
+
+      var actionInvoked = false
+      var accessoryButtonActionInvoked = false
+
+      let row = NavigationRow(
+        text: "title",
+        detailText: detailText,
+        icon: icon,
+        action: { _ in actionInvoked = true },
+        accessoryButtonAction: { _ in accessoryButtonActionInvoked = true }
+      )
+
+      it("should initialize with given parameters") {
+        expect(row.text) == "title"
+        expect(row.detailText) == detailText
+        expect(row.icon) == icon
+        expect(row.cellReuseIdentifier) == "UITableViewCell.subtitle"
+
+        row.action?(row)
+        expect(actionInvoked) == true
+
+        row.accessoryButtonAction?(row)
+        expect(accessoryButtonActionInvoked) == true
+      }
+    }
+
+#elseif os(tvOS)
+
     describe("initialization") {
       let detailText = DetailText.subtitle("subtitle")
       let icon = Icon.named("icon")
@@ -53,6 +86,8 @@ internal final class NavigationRowSpec: QuickSpec {
       }
     }
 
+#endif
+
     describe("cellReuseIdentifier") {
       let a = NavigationRow(text: "", detailText: .none)
       let b = NavigationRow(text: "", detailText: .subtitle(""))
@@ -67,6 +102,36 @@ internal final class NavigationRowSpec: QuickSpec {
       }
     }
 
+    #if os(iOS)
+
+    describe("accessoryType") {
+      let a = NavigationRow(text: "", detailText: .none)
+      let b = NavigationRow(text: "", detailText: .none, action: { _ in })
+      let c = NavigationRow(text: "", detailText: .none, accessoryButtonAction: { _ in })
+      let d = NavigationRow(text: "", detailText: .none, action: { _ in }, accessoryButtonAction: { _ in })
+
+      it("should return the corresponding accessory type") {
+        expect(a.accessoryType) == UITableViewCell.AccessoryType.none
+        expect(b.accessoryType) == UITableViewCell.AccessoryType.disclosureIndicator
+        expect(c.accessoryType) == UITableViewCell.AccessoryType.detailButton
+        expect(d.accessoryType) == UITableViewCell.AccessoryType.detailDisclosureButton
+      }
+    }
+
+    #elseif os(iOS)
+
+    describe("accessoryType") {
+      let a = NavigationRow(text: "", detailText: .none)
+      let b = NavigationRow(text: "", detailText: .none, action: { _ in })
+
+      it("should return the the corresponding accessory type") {
+        expect(a.accessoryType) == UITableViewCell.AccessoryType.none
+        expect(b.accessoryType) == UITableViewCell.AccessoryType.disclosureIndicator
+      }
+    }
+
+    #endif
+
     describe("equatable") {
       let image = UIImage()
       let row = NavigationRow(text: "Same", detailText: .subtitle("Same"), icon: .image(image), action: nil)