From 3602608c52a56feac489fd849adc7ed1408931c3 Mon Sep 17 00:00:00 2001 From: Jen Date: Sun, 10 Oct 2021 03:52:01 +0900 Subject: [PATCH] =?UTF-8?q?=E2=9C=85[CHORE]=20:=20#139=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC,=20=EC=A4=91=EB=B3=B5=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Source/Views/VCs/SignScene/JoinVC.swift | 19 +++---------------- .../SignScene/Views/JoinContractView.swift | 5 ----- .../VCs/SignScene/Views/JoinEmailView.swift | 4 ++++ .../SignScene/Views/JoinPasswordView.swift | 4 ++++ 4 files changed, 11 insertions(+), 21 deletions(-) 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 a2907348..3faf5fbd 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/JoinVC.swift @@ -86,29 +86,23 @@ class JoinVC: UIViewController { private func configureClosure() { emailView.nextButton.nextPageClosure = { - if self.emailView.DuplicateCheck && self.emailView.ValidateCheck { self.showView(number: 2) self.moveCar(toPage: 2) - } } + emailView.stickyNextButton.nextPageClosure = { - if self.emailView.DuplicateCheck && self.emailView.ValidateCheck { self.showView(number: 2) self.moveCar(toPage: 2) - } } passwordView.nextButton.nextPageClosure = { - if self.passwordView.passwordInputView.isFirstPassed && self.passwordView.passwordInputView.isSecondPassed { self.showView(number: 3) self.moveCar(toPage: 3) - } } + passwordView.stickyNextButton.nextPageClosure = { - if self.passwordView.passwordInputView.isFirstPassed && self.passwordView.passwordInputView.isSecondPassed { self.showView(number: 3) self.moveCar(toPage: 3) - } } profileView.nextButton.nextPageClosure = { @@ -117,14 +111,12 @@ class JoinVC: UIViewController { } profileView.stickyNextButton.nextPageClosure = { - if self.profileView.isNicknamePassed { self.showView(number: 4) self.moveCar(toPage: 4) - } } contractView.nextButton.nextPageClosure = { - + //회원가입 요청 let userEmail = self.emailView.emailInputView.inputTextField?.text let password = self.passwordView.passwordInputView.secondTextField.text let nickname = self.profileView.nicknameView.inputTextField?.text @@ -139,13 +131,8 @@ class JoinVC: UIViewController { marketingPush: marketingPush, marketingEmail: marketingEmail, image: (image ?? UIImage(named: "icProfile"))!) - - } - contractView.stickyNextButton.nextPageClosure = { - self.navigationController?.popViewController(animated: true) - } } //MARK: - Custom 함수 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 86f63ffb..055f5120 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 @@ -33,7 +33,6 @@ class JoinContractView: UIView { var agreeEmailButton = JoinAgreeButton(isBig: false) let nextButton = NextButton(isSticky: false, isTheLast: true) - let stickyNextButton = NextButton(isSticky: true, isTheLast: true) //MARK: - Life Cycle @@ -53,16 +52,12 @@ class JoinContractView: UIView { private func makeButtonBlue() { self.nextButton.backgroundColor = .mainBlue - self.stickyNextButton.backgroundColor = .mainBlue nextButton.isEnabled = true - stickyNextButton.isEnabled = true } private func makeButtonsGray() { nextButton.backgroundColor = .gray30 - stickyNextButton.backgroundColor = .gray30 nextButton.isEnabled = false - stickyNextButton.isEnabled = false } diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinEmailView.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinEmailView.swift index f77406a6..0d2e74b3 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinEmailView.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinEmailView.swift @@ -123,11 +123,15 @@ class JoinEmailView: UIView, UITextFieldDelegate { private func makeButtonsBlue() { nextButton.backgroundColor = .mainBlue stickyNextButton.backgroundColor = .mainBlue + nextButton.isEnabled = true + stickyNextButton.isEnabled = true } private func makeButtonsGray() { nextButton.backgroundColor = .gray30 stickyNextButton.backgroundColor = .gray30 + nextButton.isEnabled = false + stickyNextButton.isEnabled = false } diff --git a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinPasswordView.swift b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinPasswordView.swift index 48ce675b..8ac80689 100644 --- a/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinPasswordView.swift +++ b/ChaRo-iOS/ChaRo-iOS/Source/Views/VCs/SignScene/Views/JoinPasswordView.swift @@ -83,11 +83,15 @@ class JoinPasswordView: UIView { private func makeButtonsBlue() { nextButton.backgroundColor = .mainBlue stickyNextButton.backgroundColor = .mainBlue + nextButton.isEnabled = true + stickyNextButton.isEnabled = true } private func makeButtonsGray() { nextButton.backgroundColor = .gray30 stickyNextButton.backgroundColor = .gray30 + nextButton.isEnabled = false + stickyNextButton.isEnabled = false } }