From a45dcc374d25f7f984a3995ee0ac1543b5a3b3df Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Mon, 9 May 2022 16:58:51 +0900 Subject: [PATCH] =?UTF-8?q?[Refactor]=20#571=20-=20SendSparkButton=20?= =?UTF-8?q?=EC=9D=B4=EB=8B=88=EC=85=9C=EB=9D=BC=EC=9D=B4=EC=A0=80=EB=A5=BC?= =?UTF-8?q?=20=ED=99=9C=EC=9A=A9=ED=95=9C=20=EC=B4=88=EA=B8=B0=ED=99=94?= =?UTF-8?q?=EB=A1=9C=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 불필요한 오버라이드하던 생성자 삭제. - UI 가 변경되면서 사용하지 않던 isSelected 삭제. - didset property observer 를 통해서 content 설정 --- .../Source/Classes/SendSparkButton.swift | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/Spark-iOS/Spark-iOS/Source/Classes/SendSparkButton.swift b/Spark-iOS/Spark-iOS/Source/Classes/SendSparkButton.swift index 8008f854..7fbf02de 100644 --- a/Spark-iOS/Spark-iOS/Source/Classes/SendSparkButton.swift +++ b/Spark-iOS/Spark-iOS/Source/Classes/SendSparkButton.swift @@ -20,23 +20,23 @@ final class SendSparkButton: UIButton { // MARK: - Properties - var type: SendSparkStatus? + var type: SendSparkStatus { + didSet { + self.setContent() + } + } var content: String? // MARK: - Initialize - override init(frame: CGRect) { - super.init(frame: frame) - } - required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - public init(type: SendSparkStatus) { + init(type: SendSparkStatus) { + self.type = type super.init(frame: .zero) - - setUI(type) + setUI(self.type) } } @@ -53,8 +53,10 @@ extension SendSparkButton { self.titleLabel?.lineBreakMode = .byCharWrapping self.titleLabel?.textAlignment = .center self.type = type - - switch type { + } + + private func setContent() { + switch self.type { case .message: self.setTitle(""" 메시지 @@ -97,18 +99,4 @@ extension SendSparkButton { self.content = "👍얼마 안 남았어, 어서 하자!" } } - - public func isSelected(_ isSelected: Bool) { - if isSelected { - self.setTitleColor(.sparkDarkPinkred, for: .normal) - self.backgroundColor = .sparkMostLightPinkred - self.titleLabel?.backgroundColor = .sparkMostLightPinkred - self.layer.borderColor = UIColor.sparkDarkPinkred.cgColor - } else { - self.setTitleColor(.sparkLightPinkred, for: .normal) - self.backgroundColor = .sparkWhite - self.titleLabel?.backgroundColor = .sparkWhite - self.layer.borderColor = UIColor.sparkLightPinkred.cgColor - } - } }