[#6] checkBox, radioButton tintColor 커스텀 추가

Handy/Handy-Storybook/Atom/CheckBoxViewController.swift

@@ -11,6 +11,7 @@ final class CheckBoxViewController: BaseViewController {
 
     let checkBox: HandyCheckBox = {
         let checkBox = HandyCheckBox()
+        checkBox.setTintColor = .red
         return checkBox
     }()
 

Handy/Handy-Storybook/Atom/RadioButtonViewController.swift

@@ -11,6 +11,7 @@ final class RadioButtonViewController: BaseViewController {
 
     let radioButton: HandyRadioButton = {
         let checkBox = HandyRadioButton()
+        checkBox.isSelected = true
         return checkBox
     }()
 
@@ -23,6 +24,7 @@ final class RadioButtonViewController: BaseViewController {
     let disabledRadioButton: HandyRadioButton = {
         let checkBox = HandyRadioButton()
         checkBox.isDisabled = true
+        checkBox.text = "RadioButton"
         return checkBox
     }()
 

Handy/Handy/Source/Atom/HandyCheckBox.swift

@@ -45,6 +45,15 @@ public class HandyCheckBox: UIButton {
         }
     }
 
+    /**
+     체크박스의 tintColor를 설정할 때 사용합니다.
+     */
+    public var setTintColor: UIColor = HandySemantic.checkboxSelected {
+        didSet {
+            setConfiguration()
+        }
+    }
+
     // MARK: - 외부에서 접근할 수 있는 enum
 
     /**
@@ -94,34 +103,62 @@ public class HandyCheckBox: UIButton {
     private func setConfiguration() {
         var configuration = UIButton.Configuration.plain()
         configuration.baseBackgroundColor = .clear
+        configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
+        self.configuration = configuration
+
+        setTitle()
+        setImage()
+        setColor()
+        updateState()
+    }
 
+    private func setTitle() {
+        guard var configuration = self.configuration else { return }
         configuration.attributedTitle = AttributedString(text ?? "")
         configuration.attributedTitle?.font = size.font
+        self.configuration = configuration
+    }
+
+    private func setImage() {
+        guard var configuration = self.configuration else { return }
 
         configuration.imagePadding = 8
         configuration.imagePlacement = .leading
 
-        configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
+        let image: UIImage
+        if isDisabled || isSelected {
+            image = HandyIcon.checkBoxFilled
+        } else {
+            image = HandyIcon.checkBoxLine
+        }
+        configuration.image = image.resize(to: size.iconSize)
+
+        self.configuration = configuration
+    }
 
-        switch (isDisabled, isSelected) {
-        case (true, _):
-            configuration.image = HandyIcon.checkBoxDisabled.resize(to: size.iconSize)
-            configuration.baseBackgroundColor = HandySemantic.textBasicPrimary
 
-        case (false, true):
-            configuration.image = HandyIcon.checkBoxSelected.resize(to: size.iconSize)
-            configuration.baseForegroundColor = HandySemantic.textBasicPrimary
+    private func setColor() {
+        guard var configuration = self.configuration else { return }
 
-        case (false, false):
-            configuration.image = HandyIcon.checkBoxUnSelected.resize(to: size.iconSize)
-            configuration.baseForegroundColor = HandySemantic.textBasicPrimary
+        if isSelected {
+            configuration.image = configuration.image?.withTintColor(setTintColor)
         }
 
+
+        self.configuration = configuration
+    }
+
+
+    private func updateState() {
+        guard var configuration = self.configuration else { return }
+
+        configuration.baseForegroundColor = HandySemantic.textBasicPrimary
         self.isEnabled = !isDisabled
 
         self.configuration = configuration
     }
 
+
     private func registerTapAction() {
         self.addTarget(self,
                        action: #selector(checkboxDidTap(_:)),

Handy/Handy/Source/Atom/HandyRadioButton.swift

@@ -45,6 +45,15 @@ public class HandyRadioButton: UIButton {
         }
     }
 
+    /**
+     라디오버튼의 tintColor를 설정할 때 사용합니다.
+     */
+    public var setTintColor: UIColor = HandySemantic.checkboxSelected {
+        didSet {
+            setConfiguration()
+        }
+    }
+
     // MARK: - 외부에서 접근할 수 있는 enum
 
     /**
@@ -94,44 +103,66 @@ public class HandyRadioButton: UIButton {
     private func setConfiguration() {
         var configuration = UIButton.Configuration.plain()
         configuration.baseBackgroundColor = .clear
+        configuration.imagePadding = 8
+        configuration.imagePlacement = .leading
+        configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
+        self.configuration = configuration
 
+        setTitle()
+        setImage()
+        setColor()
+        updateState()
+    }
+
+    private func setTitle() {
+        guard var configuration = self.configuration else { return }
         configuration.attributedTitle = AttributedString(text ?? "")
         configuration.attributedTitle?.font = size.font
+        self.configuration = configuration
+    }
 
-        configuration.imagePadding = 8
-        configuration.imagePlacement = .leading
-
-        configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0)
+    private func setImage() {
+        guard var configuration = self.configuration else { return }
 
-        switch (isDisabled, isSelected) {
-        case (true, _):
+        if isDisabled {
             configuration.image = HandyIcon.radioButtonDisabled.resize(to: size.iconSize)
-            configuration.baseBackgroundColor = HandySemantic.textBasicPrimary
+        } else {
+            configuration.image = HandyIcon.radioButtonLine.resize(to: size.iconSize)
+        }
+
+        self.configuration = configuration
+    }
 
-        case (false, true):
-            configuration.image = HandyIcon.radioButtonSelected.resize(to: size.iconSize)
-            configuration.baseForegroundColor = HandySemantic.textBasicPrimary
+    private func setColor() {
+        guard var configuration = self.configuration else { return }
 
-        case (false, false):
-            configuration.image = HandyIcon.radioButtonUnselected.resize(to: size.iconSize)
-            configuration.baseForegroundColor = HandySemantic.textBasicPrimary
+        if isSelected {
+            configuration.image = configuration.image?.withTintColor(setTintColor)
         }
 
+        self.configuration = configuration
+    }
+
+
+    private func updateState() {
+        guard var configuration = self.configuration else { return }
+
+        configuration.baseForegroundColor = HandySemantic.textBasicPrimary
         self.isEnabled = !isDisabled
 
         self.configuration = configuration
     }
 
+
     private func registerTapAction() {
         self.addTarget(self,
-                       action: #selector(checkboxDidTap(_:)),
+                       action: #selector(radioButtonDidtap(_:)),
                        for: .touchUpInside
         )
     }
 
     @objc
-    private func checkboxDidTap(_ sender: UIControl) {
+    private func radioButtonDidtap(_ sender: UIControl) {
         self.isSelected = !isSelected
     }
 }
-

Handy/Handy/Source/Foundation/Asset/HandyIcon.xcassets/radioButton/radioButtonDisabled.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "radioButtonDisabled.svg",
+      "filename" : "RadioButtonDisable.svg",
       "idiom" : "universal"
     }
   ],

Handy/Handy/Source/Foundation/HandyIcon.swift

@@ -11,11 +11,9 @@ public enum HandyIcon {
     public static var icCancelFilled: UIImage { .load(name: "icCancelFilled") }
     public static var icCancelLine: UIImage { .load(name: "icCancelLine") }
 
-    public static var checkBoxUnSelected: UIImage { .load(name: "checkBoxUnSelected") }
-    public static var checkBoxSelected: UIImage { .load(name: "checkBoxSelected") }
-    public static var checkBoxDisabled: UIImage { .load(name: "checkBoxDisabled") }
-    public static var radioButtonUnselected: UIImage { .load(name: "radioButtonUnselected") }
-    public static var radioButtonSelected: UIImage { .load(name: "radioButtonSelected") }
+    public static var checkBoxFilled: UIImage { .load(name: "checkBoxFilled") }
+    public static var checkBoxLine: UIImage { .load(name: "checkBoxLine") }
+    public static var radioButtonLine: UIImage { .load(name: "radioButtonLine") }
     public static var radioButtonDisabled: UIImage { .load(name: "radioButtonDisabled") }
 }