Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>Smapp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>5</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "F9C468C1-6598-413A-AFA4-DCCCADF3D630"
type = "0"
version = "2.0">
</Bucket>
4 changes: 2 additions & 2 deletions Smapp/MyPage/SettingVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
20 changes: 13 additions & 7 deletions Smapp/Register/RegisterVC.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
}
}

Expand Down