✅[CHORE] : #139 코드 정리, 중복삭제

TeamChaRo · Oct 9, 2021 · 3602608 · 3602608
1 parent 1983ace
commit 3602608
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
     }
 
 }