diff --git a/1stWeek/.DS_Store b/1stWeek/.DS_Store index ef57eb9..d027eb7 100644 Binary files a/1stWeek/.DS_Store and b/1stWeek/.DS_Store differ diff --git a/1stWeek/Seminar/Seminar.xcodeproj/project.xcworkspace/xcuserdata/shinjiwon.xcuserdatad/UserInterfaceState.xcuserstate b/1stWeek/Seminar/Seminar.xcodeproj/project.xcworkspace/xcuserdata/shinjiwon.xcuserdatad/UserInterfaceState.xcuserstate index 940b357..fd900fe 100644 Binary files a/1stWeek/Seminar/Seminar.xcodeproj/project.xcworkspace/xcuserdata/shinjiwon.xcuserdatad/UserInterfaceState.xcuserstate and b/1stWeek/Seminar/Seminar.xcodeproj/project.xcworkspace/xcuserdata/shinjiwon.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/2ndWeek/Assignment/Assignment/ThirdViewController.swift b/2ndWeek/Assignment/Assignment/ThirdViewController.swift index 57f6c64..853d307 100644 --- a/2ndWeek/Assignment/Assignment/ThirdViewController.swift +++ b/2ndWeek/Assignment/Assignment/ThirdViewController.swift @@ -72,7 +72,7 @@ class ThirdViewController: UIViewController { guard let nickname = nicknameTextField.text else { return } firstVC.nickname = nickname - self.present(firstVC, animated: true) + self.present(firstVC, animated: false) } @objc func textFieldStartChange() { diff --git a/2ndWeek/Assignment/Assignment/ViewController.swift b/2ndWeek/Assignment/Assignment/ViewController.swift index a0722be..6645448 100644 --- a/2ndWeek/Assignment/Assignment/ViewController.swift +++ b/2ndWeek/Assignment/Assignment/ViewController.swift @@ -199,7 +199,7 @@ class ViewController: UIViewController, UIViewControllerTransitioningDelegate { clearButton.isHidden = false eyeButton.isHidden = false } - else if !passwordTextField.hasText { + else { clearButton.isHidden = true eyeButton.isHidden = true } @@ -224,6 +224,9 @@ class ViewController: UIViewController, UIViewControllerTransitioningDelegate { self.passwordTextField.text = "" clearButton.isHidden.toggle() eyeButton.isHidden.toggle() + loginButton.layer.backgroundColor = UIColor.label.cgColor + loginButton.layer.borderColor = UIColor.tvingGray4.cgColor + loginButton.setTitleColor(.tvingGray2, for: .normal) } @objc func eyeBtnTapped() {