Merge branch 'master' of github.com:danielsaidi/Sheeeeeeeeet

Author: danielsaidi

Sheeeeeeeeet/Appearance/Items/ActionSheetSelectItemAppearance.swift

@@ -39,6 +39,7 @@ open class ActionSheetSelectItemAppearance: ActionSheetItemAppearance {
         selectedTextColor = copy?.selectedTextColor ?? selectedTextColor
         selectedTintColor = copy?.selectedTintColor ?? selectedTintColor
         selectedIconTintColor = copy?.selectedIconTintColor ?? selectedTintColor
+        unselectedIcon = copy?.unselectedIcon
     }
 
 
@@ -48,4 +49,5 @@ open class ActionSheetSelectItemAppearance: ActionSheetItemAppearance {
     public var selectedIconTintColor: UIColor?
     public var selectedTextColor: UIColor?
     public var selectedTintColor: UIColor?
+    public var unselectedIcon: UIImage?
 }

Sheeeeeeeeet/Items/ActionSheetItem.swift

@@ -46,6 +46,7 @@ open class ActionSheetItem: NSObject {
         self.tapBehavior = tapBehavior
         self.appearance = ActionSheetItemAppearance(copy: appearance)
         super.init()
+        if subtitle != nil { self.cellStyle = .value1}
     }
 
 

Sheeeeeeeeet/Items/Items/ActionSheetMultiSelectItem.swift

@@ -32,12 +32,14 @@ open class ActionSheetMultiSelectItem: ActionSheetSelectItem {
 
     public init(
         title: String,
+        subtitle: String? = nil,
         isSelected: Bool,
         group: String = "",
         value: Any? = nil,
         image: UIImage? = nil) {
         super.init(
             title: title,
+            subtitle: subtitle,
             isSelected: isSelected,
             group: group,
             value: value,

Sheeeeeeeeet/Items/Items/ActionSheetSelectItem.swift

@@ -33,6 +33,7 @@ open class ActionSheetSelectItem: ActionSheetItem {
 
     public init(
         title: String,
+        subtitle: String? = nil,
         isSelected: Bool,
         group: String = "",
         value: Any? = nil,
@@ -42,6 +43,7 @@ open class ActionSheetSelectItem: ActionSheetItem {
         self.group = group
         super.init(
             title: title,
+            subtitle: subtitle,
             value: value,
             image: image,
             tapBehavior: tapBehavior)
@@ -69,7 +71,8 @@ open class ActionSheetSelectItem: ActionSheetItem {
     open override func applyAppearance(to cell: UITableViewCell) {
         super.applyAppearance(to: cell)
         guard let appearance = selectAppearance else { return }
-        cell.accessoryView = isSelected ? UIImageView(image: appearance.selectedIcon) : nil
+        let accessoryImage = isSelected ? appearance.selectedIcon : appearance.unselectedIcon
+        cell.accessoryView = UIImageView(image: accessoryImage)
         cell.accessoryView?.tintColor = isSelected ? appearance.selectedIconTintColor : appearance.tintColor
         cell.tintColor = isSelected ? appearance.selectedTintColor : appearance.tintColor
         cell.textLabel?.textColor = isSelected ? appearance.selectedTextColor : appearance.textColor

SheeeeeeeeetExample/AppDelegate+Appearance.swift

@@ -54,16 +54,15 @@ extension AppDelegate {
         appearance.sectionMargin.height = 20
 
         appearance.selectItem.selectedIcon = UIImage(named: "ic_checkmark")
+        appearance.selectItem.unselectedIcon = UIImage(named: "ic_empty")
         appearance.selectItem.selectedTintColor = blue
         appearance.selectItem.selectedTextColor = green
         appearance.selectItem.selectedIconTintColor = purple
 
-        appearance.singleSelectItem.selectedIcon = UIImage(named: "ic_checkmark")
         appearance.singleSelectItem.selectedTintColor = green
         appearance.singleSelectItem.selectedTextColor = purple
         appearance.singleSelectItem.selectedIconTintColor = blue
 
-        appearance.multiSelectItem.selectedIcon = UIImage(named: "ic_checkmark")
         appearance.multiSelectItem.selectedTintColor = purple
         appearance.multiSelectItem.selectedTextColor = blue
         appearance.multiSelectItem.selectedIconTintColor = green

SheeeeeeeeetExample/Assets/Assets.xcassets/ic_empty.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_empty.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

SheeeeeeeeetExample/Assets/Assets.xcassets/ic_empty.imageset/ic_empty.png

@@ -74,8 +74,8 @@ class ActionSheetItemTests: QuickSpec {
 
     override func spec() {
 
-        func createItem() -> MockActionSheetItem {
-            return MockActionSheetItem(title: "foo", subtitle: "bar", value: true, image: UIImage())
+        func createItem(subtitle: String? = nil) -> MockActionSheetItem {
+            return MockActionSheetItem(title: "foo", subtitle: subtitle, value: true, image: UIImage())
 
         }
 
@@ -125,10 +125,15 @@ class ActionSheetItemTests: QuickSpec {
 
         describe("cell style") {
 
-            it("is default") {
-                let item = createItem()
+            it("is default if no subtitle is set") {
+                let item = createItem(subtitle: nil)
                 expect(item.cellStyle).to(equal(.default))
             }
+            
+            it("is value1 if subtitle is set") {
+                let item = createItem(subtitle: "bar")
+                expect(item.cellStyle).to(equal(.value1))
+            }
         }
 
         describe("custom appearance") {