From e7d70c0c8d102a5ecd4d804c7ec61698028dbf7d Mon Sep 17 00:00:00 2001 From: Jen Date: Sat, 25 Jun 2022 07:27:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FEAT]=20=EC=95=BD=EA=B4=80=EB=8F=99?= =?UTF-8?q?=EC=9D=98=20=EB=B2=84=ED=8A=BC=20=EB=B7=B0=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Shared/Component/JoinAgreeButton.swift | 44 ++++++++----------- .../Source/Views/VCs/SignScene/JoinVC.swift | 4 +- .../Views/VCs/SignScene/SNSLoginVC.swift | 4 +- .../SignScene/Views/JoinContractView.swift | 4 +- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/Shared/Component/JoinAgreeButton.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/Shared/Component/JoinAgreeButton.swift index 318321c0..f0e4c29d 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/Shared/Component/JoinAgreeButton.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/Shared/Component/JoinAgreeButton.swift @@ -9,7 +9,23 @@ import UIKit class JoinAgreeButton: UIButton { - var Agreed = false + var agreed: Bool = false { + willSet(newVal) { + if isBig { + if newVal { + self.setBackgroundImage(UIImage(named: "icSignupAgreeBig"), for: .normal) + } else { + self.setBackgroundImage(UIImage(named: "icSignupDisagreeBig"), for: .normal) + } + } else { + if newVal { + self.setBackgroundImage(UIImage(named: "icSignupAgreeSmall"), for: .normal) + } else { + self.setBackgroundImage(UIImage(named: "icSignupDisagreeSmall"), for: .normal) + } + } + } + } var isBig = false override init(frame: CGRect) { @@ -32,34 +48,10 @@ class JoinAgreeButton: UIButton { } self.addTarget(self, action: #selector(buttonClicked), for: .touchUpInside) - - } @objc func buttonClicked() { - - switch isBig { - case true: - Agreed = !Agreed - if Agreed { - self.setBackgroundImage(UIImage(named: "icSignupAgreeBig"), for: .normal) - } else { - self.setBackgroundImage(UIImage(named: "icSignupDisagreeBig"), for: .normal) - } - - case false: - Agreed = !Agreed - if Agreed { - self.setBackgroundImage(UIImage(named: "icSignupAgreeSmall"), for: .normal) - } else { - self.setBackgroundImage(UIImage(named: "icSignupDisagreeSmall"), for: .normal) - } - } - - + agreed.toggle() } - - - } diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift index 6f40b341..8844d0f7 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift @@ -122,8 +122,8 @@ class JoinVC: UIViewController { let password = self.passwordView.passwordInputView.secondTextField.text let nickname = self.profileView.nicknameView.inputTextField?.text let image = self.profileView.profileView.profileImageView.image - let marketingPush = self.contractView.agreePushButton.Agreed - let marketingEmail = self.contractView.agreeEmailButton.Agreed + let marketingPush = self.contractView.agreePushButton.agreed + let marketingEmail = self.contractView.agreeEmailButton.agreed self.postJoin(userEmail: userEmail!, diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift index 42ee7a8e..54dd030a 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/SNSLoginVC.swift @@ -217,8 +217,8 @@ class SNSLoginVC: UIViewController { self.navigationController?.pushViewController(nextVC, animated: true) nextVC.contractView.nextButton.nextPageClosure = { - let isPushAgree = nextVC.contractView.agreePushButton.Agreed - let isEmailAgree = nextVC.contractView.agreeEmailButton.Agreed + let isPushAgree = nextVC.contractView.agreePushButton.agreed + let isEmailAgree = nextVC.contractView.agreeEmailButton.agreed switch self.socialType { case .apple: diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinContractView.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinContractView.swift index 77f19c22..58ba38f4 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinContractView.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinContractView.swift @@ -97,8 +97,8 @@ class JoinContractView: UIView { } @objc func allButtonClicked() { - agreePushButton.buttonClicked() - agreeEmailButton.buttonClicked() + agreePushButton.agreed = agreeAllButton.agreed + agreeEmailButton.agreed = agreeAllButton.agreed } //MARK: - configure 함수 From c04be621553819676be30574e7fbbe97b9f14df0 Mon Sep 17 00:00:00 2001 From: Jen Date: Sat, 25 Jun 2022 07:34:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FEAT]=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=88=98=EC=A0=95=20=ED=82=A4=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EB=82=B4=EB=A6=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChaRo-iOS/Source/Views/VCs/SignScene/FindPasswordVC.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/FindPasswordVC.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/FindPasswordVC.swift index 26b32ae4..517363a0 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/FindPasswordVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/FindPasswordVC.swift @@ -48,6 +48,9 @@ final class FindPasswordVC: UIViewController { } //MARK: - configure 함수 + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + self.navigationView.endEditing(true) + } private func configureDelegate() { emailInputView.inputTextField?.delegate = self }