diff --git a/Pods/Pods.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
index 0ab68ced..604a5870 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Pods/Pods.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,77 +7,77 @@
Alamofire.xcscheme_^#shared#^_
orderHint
- 3
+ 11
AppAuth.xcscheme_^#shared#^_
orderHint
- 4
+ 8
Firebase.xcscheme_^#shared#^_
orderHint
- 5
+ 10
FirebaseAnalytics.xcscheme_^#shared#^_
orderHint
- 13
+ 2
FirebaseAuth.xcscheme_^#shared#^_
orderHint
- 14
+ 0
FirebaseCore.xcscheme_^#shared#^_
orderHint
- 12
+ 9
FirebaseCoreDiagnostics.xcscheme_^#shared#^_
orderHint
- 20
+ 3
FirebaseDatabase.xcscheme_^#shared#^_
orderHint
- 22
+ 16
FirebaseInstallations.xcscheme_^#shared#^_
orderHint
- 17
+ 13
FirebaseMessaging.xcscheme_^#shared#^_
orderHint
- 9
+ 14
FirebaseStorage.xcscheme_^#shared#^_
orderHint
- 2
+ 19
GTMAppAuth.xcscheme_^#shared#^_
orderHint
- 10
+ 22
GTMSessionFetcher.xcscheme_^#shared#^_
orderHint
- 23
+ 6
GoogleAppMeasurement.xcscheme_^#shared#^_
orderHint
- 19
+ 4
GoogleDataTransport.xcscheme_^#shared#^_
orderHint
- 15
+ 1
GoogleSignIn-GoogleSignIn.xcscheme_^#shared#^_
@@ -87,37 +87,37 @@
GoogleSignIn.xcscheme_^#shared#^_
orderHint
- 0
+ 17
GoogleUtilities.xcscheme_^#shared#^_
orderHint
- 8
+ 12
ObjectMapper.xcscheme_^#shared#^_
orderHint
- 1
+ 15
Pods-Smapp.xcscheme_^#shared#^_
orderHint
- 21
+ 18
PromisesObjC.xcscheme_^#shared#^_
orderHint
- 6
+ 21
leveldb-library.xcscheme_^#shared#^_
orderHint
- 11
+ 23
nanopb.xcscheme_^#shared#^_
orderHint
- 16
+ 20
diff --git a/Smapp.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist b/Smapp.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
index 79005c52..62f0b088 100644
--- a/Smapp.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Smapp.xcodeproj/xcuserdata/gimseongbin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
Smapp.xcscheme_^#shared#^_
orderHint
- 18
+ 5
diff --git a/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/UserInterfaceState.xcuserstate b/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/UserInterfaceState.xcuserstate
index 78ba4c15..fe0833ee 100644
Binary files a/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/UserInterfaceState.xcuserstate and b/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 00000000..8e044ad1
--- /dev/null
+++ b/Smapp.xcworkspace/xcuserdata/gimseongbin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+
+
+
diff --git a/Smapp/MyPage/SettingVC.swift b/Smapp/MyPage/SettingVC.swift
index c97f292c..9642b3be 100644
--- a/Smapp/MyPage/SettingVC.swift
+++ b/Smapp/MyPage/SettingVC.swift
@@ -35,9 +35,9 @@ class SettingVC: UIViewController {
let LoginViewController = storyboard.instantiateViewController(identifier: "LoginViewController")
(UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate)?.changeRootViewController(LoginViewController)
}
- let cancle = UIAlertAction(title: "취소", style: .default, handler: nil)
+ let cancel = UIAlertAction(title: "취소", style: .default, handler: nil)
- alert.addAction(cancle)
+ alert.addAction(cancel)
alert.addAction(ok)
present(alert, animated: true, completion: nil)
}
diff --git a/Smapp/Register/RegisterVC.swift b/Smapp/Register/RegisterVC.swift
index 5d58221a..b45a45d9 100644
--- a/Smapp/Register/RegisterVC.swift
+++ b/Smapp/Register/RegisterVC.swift
@@ -37,7 +37,19 @@ class RegisterVC: UIViewController {
@IBAction func nameClicked(_ sender: UIButton) {
- if (nameTextField.text != "") || (idTextField.text != "") {
+ if (nameTextField.text == "") || (idTextField.text == ""){
+ let warning = UIAlertController(title: "이름/학번설정", message: "이름/학번을 입력하시오.", preferredStyle: UIAlertController.Style.alert)
+ let yes = UIAlertAction(title: "확인", style: .default, handler: nil)
+
+ warning.addAction(yes)
+ present(warning, animated: true, completion: nil)
+ } else if (idTextField.text?.count != 8) {
+ let warning = UIAlertController(title: "이름/학번설정", message: "학번 8자리 기입하시오.", preferredStyle: UIAlertController.Style.alert)
+ let yes = UIAlertAction(title: "확인", style: .default, handler: nil)
+
+ warning.addAction(yes)
+ present(warning, animated: true, completion: nil)
+ } else {
//경고창
let alert = UIAlertController(title: "이름 변경이 불가능합니다.", message: "계속 진행하시겠습니까?", preferredStyle: UIAlertController.Style.alert)
@@ -55,12 +67,6 @@ class RegisterVC: UIViewController {
alert.addAction(cancel)
alert.addAction(ok)
present(alert, animated: true, completion: nil)
- } else {
- let warning = UIAlertController(title: "이름/학번설정", message: "이름/학번을 입력하시오.", preferredStyle: UIAlertController.Style.alert)
- let yes = UIAlertAction(title: "확인", style: .default, handler: nil)
-
- warning.addAction(yes)
- present(warning, animated: true, completion: nil)
}
}