diff --git a/SignUp/.DS_Store b/SignUp/.DS_Store new file mode 100644 index 0000000..42a542b Binary files /dev/null and b/SignUp/.DS_Store differ diff --git a/SignUp/SignUp.xcodeproj/project.pbxproj b/SignUp/SignUp.xcodeproj/project.pbxproj index e987da9..9e869ca 100644 --- a/SignUp/SignUp.xcodeproj/project.pbxproj +++ b/SignUp/SignUp.xcodeproj/project.pbxproj @@ -14,13 +14,13 @@ B075D0F326119A7F00731DAC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B075D0F226119A7F00731DAC /* Assets.xcassets */; }; B075D0F626119A7F00731DAC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B075D0F426119A7F00731DAC /* LaunchScreen.storyboard */; }; B075D1012611BBC700731DAC /* TextFieldDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D1002611BBC700731DAC /* TextFieldDelegate.swift */; }; - B075D1042611BEB600731DAC /* Notification+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D1032611BEB600731DAC /* Notification+Extension.swift */; }; - B075D1072611D07800731DAC /* textFormError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D1062611D07800731DAC /* textFormError.swift */; }; B075D10B261207A600731DAC /* ComplianceChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D10A261207A600731DAC /* ComplianceChecker.swift */; }; B075D10E261209C300731DAC /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D10D261209C300731DAC /* UITextField+Extension.swift */; }; - B075D11126120A5900731DAC /* UILabel+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D11026120A5900731DAC /* UILabel+Extension.swift */; }; B075D1162612F4AD00731DAC /* UserInfomation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D1152612F4AD00731DAC /* UserInfomation.swift */; }; B075D11A261300FB00731DAC /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D119261300FB00731DAC /* NetworkManager.swift */; }; + B075D12026158BED00731DAC /* SignUpTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D11F26158BED00731DAC /* SignUpTextField.swift */; }; + B075D1262616003400731DAC /* ErrorCheckResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D1252616003400731DAC /* ErrorCheckResult.swift */; }; + B075D12B26195E2200731DAC /* Notification.name+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B075D12A26195E2100731DAC /* Notification.name+Extension.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -33,13 +33,13 @@ B075D0F526119A7F00731DAC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; B075D0F726119A7F00731DAC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B075D1002611BBC700731DAC /* TextFieldDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldDelegate.swift; sourceTree = ""; }; - B075D1032611BEB600731DAC /* Notification+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification+Extension.swift"; sourceTree = ""; }; - B075D1062611D07800731DAC /* textFormError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = textFormError.swift; sourceTree = ""; }; B075D10A261207A600731DAC /* ComplianceChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplianceChecker.swift; sourceTree = ""; }; B075D10D261209C300731DAC /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = ""; }; - B075D11026120A5900731DAC /* UILabel+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Extension.swift"; sourceTree = ""; }; B075D1152612F4AD00731DAC /* UserInfomation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfomation.swift; sourceTree = ""; }; B075D119261300FB00731DAC /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = ""; }; + B075D11F26158BED00731DAC /* SignUpTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpTextField.swift; sourceTree = ""; }; + B075D1252616003400731DAC /* ErrorCheckResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorCheckResult.swift; sourceTree = ""; }; + B075D12A26195E2100731DAC /* Notification.name+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification.name+Extension.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -86,13 +86,14 @@ B075D0FE26119C0200731DAC /* SignUpView */ = { isa = PBXGroup; children = ( + B075D11E26158BDA00731DAC /* View */, B075D0ED26119A7D00731DAC /* SignUpViewController.swift */, B075D0EF26119A7D00731DAC /* Main.storyboard */, B075D1002611BBC700731DAC /* TextFieldDelegate.swift */, - B075D1062611D07800731DAC /* textFormError.swift */, B075D10A261207A600731DAC /* ComplianceChecker.swift */, B075D119261300FB00731DAC /* NetworkManager.swift */, B075D1152612F4AD00731DAC /* UserInfomation.swift */, + B075D1252616003400731DAC /* ErrorCheckResult.swift */, ); path = SignUpView; sourceTree = ""; @@ -100,13 +101,20 @@ B075D1132612121800731DAC /* Extension */ = { isa = PBXGroup; children = ( - B075D1032611BEB600731DAC /* Notification+Extension.swift */, B075D10D261209C300731DAC /* UITextField+Extension.swift */, - B075D11026120A5900731DAC /* UILabel+Extension.swift */, + B075D12A26195E2100731DAC /* Notification.name+Extension.swift */, ); path = Extension; sourceTree = ""; }; + B075D11E26158BDA00731DAC /* View */ = { + isa = PBXGroup; + children = ( + B075D11F26158BED00731DAC /* SignUpTextField.swift */, + ); + path = View; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -180,14 +188,14 @@ B075D10B261207A600731DAC /* ComplianceChecker.swift in Sources */, B075D0EE26119A7D00731DAC /* SignUpViewController.swift in Sources */, B075D0EA26119A7D00731DAC /* AppDelegate.swift in Sources */, - B075D1072611D07800731DAC /* textFormError.swift in Sources */, + B075D12026158BED00731DAC /* SignUpTextField.swift in Sources */, + B075D12B26195E2200731DAC /* Notification.name+Extension.swift in Sources */, + B075D1262616003400731DAC /* ErrorCheckResult.swift in Sources */, B075D11A261300FB00731DAC /* NetworkManager.swift in Sources */, B075D1162612F4AD00731DAC /* UserInfomation.swift in Sources */, B075D1012611BBC700731DAC /* TextFieldDelegate.swift in Sources */, B075D10E261209C300731DAC /* UITextField+Extension.swift in Sources */, - B075D1042611BEB600731DAC /* Notification+Extension.swift in Sources */, B075D0EC26119A7D00731DAC /* SceneDelegate.swift in Sources */, - B075D11126120A5900731DAC /* UILabel+Extension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SignUp/SignUp.xcodeproj/project.xcworkspace/xcuserdata/idahun.xcuserdatad/UserInterfaceState.xcuserstate b/SignUp/SignUp.xcodeproj/project.xcworkspace/xcuserdata/idahun.xcuserdatad/UserInterfaceState.xcuserstate index 3fe5dbe..a0a88a0 100644 Binary files a/SignUp/SignUp.xcodeproj/project.xcworkspace/xcuserdata/idahun.xcuserdatad/UserInterfaceState.xcuserstate and b/SignUp/SignUp.xcodeproj/project.xcworkspace/xcuserdata/idahun.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SignUp/SignUp/AppDelegate.swift b/SignUp/SignUp/AppDelegate.swift index 8ea4529..952e98f 100644 --- a/SignUp/SignUp/AppDelegate.swift +++ b/SignUp/SignUp/AppDelegate.swift @@ -9,28 +9,10 @@ import UIKit @main class AppDelegate: UIResponder, UIApplicationDelegate { - - - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. - return true - } - - // MARK: UISceneSession Lifecycle - func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { // Called when a new scene session is being created. // Use this method to select a configuration to create the new scene with. return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) } - - func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { - // Called when the user discards a scene session. - // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. - // Use this method to release any resources that were specific to the discarded scenes, as they will not return. - } - - } diff --git a/SignUp/SignUp/Extension/Notification+Extension.swift b/SignUp/SignUp/Extension/Notification+Extension.swift deleted file mode 100644 index bc981d7..0000000 --- a/SignUp/SignUp/Extension/Notification+Extension.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// Notification+Extension.swift -// SignUp -// -// Created by 이다훈 on 2021/03/29. -// - -import Foundation - -extension Notification.Name { - static let idTextField = Notification.Name("idTextField") - static let pwTextField = Notification.Name("pwTextField") - static let pw2TextField = Notification.Name("pw2TextField") - static let nameTextField = Notification.Name("nameTextField") -} diff --git a/SignUp/SignUp/Extension/Notification.name+Extension.swift b/SignUp/SignUp/Extension/Notification.name+Extension.swift new file mode 100644 index 0000000..a8230ae --- /dev/null +++ b/SignUp/SignUp/Extension/Notification.name+Extension.swift @@ -0,0 +1,13 @@ +// +// Notification.name+Extension.swift +// SignUp +// +// Created by 이다훈 on 2021/04/04. +// + +import Foundation + +extension Notification.Name { + static let uiUpdate = Notification.Name.init("uiUpdate") + static let nextButtonEnableCheck = Notification.Name.init("nextButtonEnableCheck") +} diff --git a/SignUp/SignUp/Extension/UILabel+Extension.swift b/SignUp/SignUp/Extension/UILabel+Extension.swift deleted file mode 100644 index 11cf3c2..0000000 --- a/SignUp/SignUp/Extension/UILabel+Extension.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// UILabel+Extension.swift -// SignUp -// -// Created by 이다훈 on 2021/03/29. -// - -import UIKit - -extension UILabel { - func changeTextNColor(color : UIColor, text : String) { - self.textColor = color - self.text = text - } -} diff --git a/SignUp/SignUp/Extension/UITextField+Extension.swift b/SignUp/SignUp/Extension/UITextField+Extension.swift index c0af4dd..f58de61 100644 --- a/SignUp/SignUp/Extension/UITextField+Extension.swift +++ b/SignUp/SignUp/Extension/UITextField+Extension.swift @@ -8,7 +8,7 @@ import UIKit extension UITextField { - func changeBorderColor(color : CGColor) { + func changeBorder(color : CGColor) { self.layer.borderWidth = 1 self.layer.borderColor = color } diff --git a/SignUp/SignUp/SceneDelegate.swift b/SignUp/SignUp/SceneDelegate.swift index 714600d..5f903a7 100644 --- a/SignUp/SignUp/SceneDelegate.swift +++ b/SignUp/SignUp/SceneDelegate.swift @@ -8,45 +8,6 @@ import UIKit class SceneDelegate: UIResponder, UIWindowSceneDelegate { - var window: UIWindow? - - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). - } - - func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } - - } diff --git a/SignUp/SignUp/SignUpView/Base.lproj/Main.storyboard b/SignUp/SignUp/SignUpView/Base.lproj/Main.storyboard index a915d61..f9401c6 100644 --- a/SignUp/SignUp/SignUpView/Base.lproj/Main.storyboard +++ b/SignUp/SignUp/SignUpView/Base.lproj/Main.storyboard @@ -24,11 +24,11 @@ - + @@ -36,23 +36,23 @@ - + - + @@ -60,45 +60,45 @@ - + -