venmo · eliperkins · Sep 4, 2015 · Sep 4, 2015
diff --git a/Example/Assets.xcassets/Contents.json b/Example/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Assets.xcassets/Settings.imageset/Contents.json b/Example/Assets.xcassets/Settings.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Settings.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Settings@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Settings@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Assets.xcassets/Settings.imageset/Settings.png b/Example/Assets.xcassets/Settings.imageset/Settings.png
diff --git a/Example/Assets.xcassets/Settings.imageset/Settings@2x.png b/Example/Assets.xcassets/Settings.imageset/Settings@2x.png
diff --git a/Example/Assets.xcassets/Settings.imageset/Settings@3x.png b/Example/Assets.xcassets/Settings.imageset/Settings@3x.png
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -29,6 +29,7 @@ class ViewController: TableViewController {
         dataSource.sections = [
             Section(header: "Styles", rows: [
                 Row(text: "Value 1", detailText: "Detail", cellClass: Value1Cell.self),
+                Row(text: "Value 1", detailText: "with an image", cellClass: Value1Cell.self, image: UIImage(named: "Settings")),
                 Row(text: "Value 2", detailText: "Detail", cellClass: Value2Cell.self),
                 Row(text: "Subtitle", detailText: "Detail", cellClass: SubtitleCell.self),
                 Row(text: "Button", detailText: "Detail", cellClass: ButtonCell.self, selection: { [unowned self] in

diff --git a/Static/CellType.swift b/Static/CellType.swift
@@ -10,6 +10,7 @@ extension CellType where Self: UITableViewCell {
     public func configure(row row: Row) {
         textLabel?.text = row.text
         detailTextLabel?.text = row.detailText
+        imageView?.image = row.image
         accessoryType = row.accessory.type
         accessoryView = row.accessory.view
     }

diff --git a/Static/Row.swift b/Static/Row.swift
@@ -99,6 +99,9 @@ public struct Row: Hashable, Equatable {
     /// Accessory for the row.
     public var accessory: Accessory
 
+    /// Image for the row
+    public var image: UIImage?
+
     /// Action to run when the row is selected.
     public var selection: Selection?
 
@@ -130,11 +133,13 @@ public struct Row: Hashable, Equatable {
 
     // MARK: - Initializers
 
-    public init(text: String? = nil, detailText: String? = nil, selection: Selection? = nil, accessory: Accessory = .None, cellClass: CellType.Type? = nil, context: Context? = nil, editActions: [EditAction] = [], UUID: String = NSUUID().UUIDString) {
+    public init(text: String? = nil, detailText: String? = nil, selection: Selection? = nil,
+        image: UIImage? = nil, accessory: Accessory = .None, cellClass: CellType.Type? = nil, context: Context? = nil, editActions: [EditAction] = [], UUID: String = NSUUID().UUIDString) {
         self.UUID = UUID
         self.text = text
         self.detailText = detailText
         self.selection = selection
+        self.image = image
         self.accessory = accessory
         self.cellClass = cellClass ?? Value1Cell.self
         self.context = context

diff --git a/Static/Tests/DataSourceTests.swift b/Static/Tests/DataSourceTests.swift
@@ -54,7 +54,7 @@ class DataSourceTests: XCTestCase {
         let cell = tableView.cellForRowAtIndexPath(NSIndexPath(forRow: 0, inSection: 0))!
         XCTAssertEqual("Merrily", cell.textLabel!.text!)
         XCTAssertEqual("merrily", cell.detailTextLabel!.text!)
-        XCTAssertEqual(.DisclosureIndicator, cell.accessoryType)
+        XCTAssertEqual(UITableViewCellAccessoryType.DisclosureIndicator, cell.accessoryType)
     }
 
     func testExtremityTitles() {

diff --git a/Static/Tests/RowTests.swift b/Static/Tests/RowTests.swift
@@ -5,15 +5,21 @@ class RowTests: XCTestCase {
 
     func testInit() {
         let selection: Selection = {}
-        let context = [
+        let context: Row.Context = [
             "Hello": "world"
         ]
 
         let row = Row(text: "Title", detailText: "Detail", selection: selection, cellClass: ButtonCell.self, context: context, UUID: "1234")
         XCTAssertEqual("1234", row.UUID)
         XCTAssertEqual("Title", row.text!)
         XCTAssertEqual("Detail", row.detailText!)
-        XCTAssertEqual(context["Hello"]!, row.context!["Hello"] as! String)
+        XCTAssertEqual("world", row.context?["Hello"] as? String)
+    }
+
+    func testInitWithImage() {
+        let image = UIImage(named: "Setting")
+        let row = Row(image: image)
+        XCTAssertEqual(row.image, image)
     }
 
     func testInitWithAccessoryType() {