From 2a959ee91a1b6d80202efb08fcc3dd35c692e241 Mon Sep 17 00:00:00 2001 From: qodhrkawk Date: Fri, 27 Nov 2020 11:35:51 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mongle/Mongle.xcodeproj/project.pbxproj | 12 +- .../Resource/Storyboard/LogIn.storyboard | 4 + Mongle/Mongle/Source/VCs/LogInVC.swift | 119 ++++++++++++++++++ 3 files changed, 129 insertions(+), 6 deletions(-) diff --git a/Mongle/Mongle.xcodeproj/project.pbxproj b/Mongle/Mongle.xcodeproj/project.pbxproj index 1a2fa23..398f498 100644 --- a/Mongle/Mongle.xcodeproj/project.pbxproj +++ b/Mongle/Mongle.xcodeproj/project.pbxproj @@ -1307,14 +1307,14 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4YXV56BSN6; + DEVELOPMENT_TEAM = 6ZTQ76LJPZ; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.08; - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; + MARKETING_VERSION = 1.09; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -1327,14 +1327,14 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4YXV56BSN6; + DEVELOPMENT_TEAM = 6ZTQ76LJPZ; INFOPLIST_FILE = Mongle/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.08; - PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle; + MARKETING_VERSION = 1.09; + PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; diff --git a/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard b/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard index e3a3e41..d71f04b 100644 --- a/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard +++ b/Mongle/Mongle/Resource/Storyboard/LogIn.storyboard @@ -91,6 +91,7 @@ + @@ -108,6 +109,9 @@ + + + diff --git a/Mongle/Mongle/Source/VCs/LogInVC.swift b/Mongle/Mongle/Source/VCs/LogInVC.swift index c888fbd..7da8c61 100644 --- a/Mongle/Mongle/Source/VCs/LogInVC.swift +++ b/Mongle/Mongle/Source/VCs/LogInVC.swift @@ -90,6 +90,48 @@ class LogInVC: UIViewController { $0.image = UIImage(named: "loginPopupBg") } + + let copyButton = UIButton().then{ + $0.setTitle("메일 복사", for: .normal) + $0.setTitleColor(.white, for: .normal) + $0.backgroundColor = .softGreen + $0.makeRounded(cornerRadius: 19) + $0.setBorder(borderColor: .softGreen, borderWidth: 1.0) + $0.addTarget(self, action: #selector(mailCopyButton), for: .touchUpInside) + $0.titleLabel?.font = $0.titleLabel?.font.withSize(13) + + } + + let mailNoButton = UIButton().then{ + $0.setTitle("아니요", for: .normal) + $0.setTitleColor(.softGreen, for: .normal) + $0.backgroundColor = .white + $0.makeRounded(cornerRadius: 19) + $0.setBorder(borderColor: .softGreen, borderWidth: 1.0) + $0.addTarget(self, action: #selector(mailNobuttonAction), for: .touchUpInside) + $0.titleLabel?.font = $0.titleLabel?.font.withSize(13) + + } + let mailAlertLabel = UILabel().then { + $0.text = "몽글에 메일로 문의하시겠어요?" + $0.font = $0.font.withSize(15) + $0.textColor = .black + + } + + let subMailAlertLabel = UILabel().then { + $0.text = "mongle.official@gmail.com 으로\n문의 주시면 계정을 찾아드릴게요! " + $0.font = $0.font.withSize(13) + $0.textColor = .brownGreyThree + $0.numberOfLines = 0 + $0.textAlignment = .center + + } + + + + + var runCount = 0 var runCountForSplash = 0 var shouldBeDismissed = false @@ -185,6 +227,22 @@ class LogInVC: UIViewController { } + @objc func mailCopyButton(){ + + UIPasteboard.general.string = "mongle.official@gmail.com" + blurView.removeFromSuperview() + alertView.removeFromSuperview() + + + + } + + @objc func mailNobuttonAction(){ + blurView.removeFromSuperview() + alertView.removeFromSuperview() + + } + func animate1(){ self.monglesImageView.transform = CGAffineTransform(translationX: 0, y: -50) @@ -597,6 +655,67 @@ class LogInVC: UIViewController { } + @IBAction func findIDButtonAction(_ sender: Any) { + showMailPopUp() + + } + + @IBAction func findPWButtonAction(_ sender: Any) { + showMailPopUp() + + } + + func showMailPopUp(){ + + self.view.addSubview(blurView) + self.view.addSubview(alertView) + + + alertView.addSubview(alertImageView) + alertView.addSubview(mailAlertLabel) + alertView.addSubview(subMailAlertLabel) + alertView.addSubview(copyButton) + alertView.addSubview(mailNoButton) + + blurView.snp.makeConstraints{ + $0.leading.trailing.top.bottom.equalToSuperview() + } + + alertView.snp.makeConstraints{ + $0.width.equalTo(304) + $0.height.equalTo(233) + $0.center.equalToSuperview() + } + alertImageView.snp.makeConstraints{ + $0.leading.trailing.top.bottom.equalToSuperview() + } + + mailAlertLabel.snp.makeConstraints{ + $0.top.equalToSuperview().offset(84) + $0.centerX.equalToSuperview() + } + + subMailAlertLabel.snp.makeConstraints{ + $0.top.equalToSuperview().offset(112) + $0.centerX.equalToSuperview() + } + + copyButton.snp.makeConstraints{ + $0.width.equalTo(127) + $0.height.equalTo(37) + $0.leading.equalToSuperview().offset(20) + $0.bottom.equalToSuperview().offset(-25) + } + + mailNoButton.snp.makeConstraints{ + $0.width.equalTo(127) + $0.height.equalTo(37) + $0.trailing.equalToSuperview().offset(-16) + $0.bottom.equalToSuperview().offset(-25) + } + + + } }