diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 2d5d4a0f..6944c4c7 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -41,7 +41,6 @@ F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC438726C01CDD0033E151 /* SceneDelegate.swift */; }; F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8FC438E26C01CDE0033E151 /* Assets.xcassets */; }; F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */; }; - F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43A826C0207F0033E151 /* TempFont.swift */; }; F8FC43AD26C020940033E151 /* TempClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43AC26C020940033E151 /* TempClass.swift */; }; F8FC43AF26C0209A0033E151 /* TempModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43AE26C0209A0033E151 /* TempModel.swift */; }; F8FC43B126C020A70033E151 /* TempNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43B026C020A70033E151 /* TempNetwork.swift */; }; @@ -92,7 +91,6 @@ F8FC438E26C01CDE0033E151 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; F8FC439126C01CDE0033E151 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; F8FC439326C01CDE0033E151 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - F8FC43A826C0207F0033E151 /* TempFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempFont.swift; sourceTree = ""; }; F8FC43AC26C020940033E151 /* TempClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempClass.swift; sourceTree = ""; }; F8FC43AE26C0209A0033E151 /* TempModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempModel.swift; sourceTree = ""; }; F8FC43B026C020A70033E151 /* TempNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempNetwork.swift; sourceTree = ""; }; @@ -282,7 +280,6 @@ F857FC8A26C03A5C00A48D01 /* Assets */, F8FC43A326C01F420033E151 /* Constants */, F8FC43A426C01F5B0033E151 /* Extensions */, - F8FC43A526C01F630033E151 /* Fonts */, F8FC43A226C01F2B0033E151 /* Storyboards */, ); path = Resouces; @@ -402,14 +399,6 @@ path = Extensions; sourceTree = ""; }; - F8FC43A526C01F630033E151 /* Fonts */ = { - isa = PBXGroup; - children = ( - F8FC43A826C0207F0033E151 /* TempFont.swift */, - ); - path = Fonts; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -579,7 +568,6 @@ F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */, F822E7A92709CEB60020452C /* Notification.swift in Sources */, - F8FC43A926C0207F0033E151 /* TempFont.swift in Sources */, F8FC438626C01CDD0033E151 /* AppDelegate.swift in Sources */, F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */, ); diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift index 73970b68..986c82c0 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift @@ -15,7 +15,7 @@ extension UIFont { } class var menu: UIFont { - return UIFont(name: "AppleSDGothicNeo-ExtraBold", size: 26.0)! + return UIFont(name: "AppleSDGothicNeo-Bold", size: 26.0)! } class var cardName: UIFont { @@ -23,7 +23,7 @@ extension UIFont { } class var modalName: UIFont { - return UIFont(name: "AppleSDGothicNeo-ExtraBold", size: 22.0)! + return UIFont(name: "AppleSDGothicNeo-Bold", size: 22.0)! } class var menuSub: UIFont { @@ -91,7 +91,7 @@ extension UIFont { } class var login: UIFont { - return UIFont(name: "AppleSDGothicNeo-ExtraBold", size: 14.0)! + return UIFont(name: "AppleSDGothicNeo-Bold", size: 14.0)! } class var hint2: UIFont { diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift index 2dff1555..0b929e6f 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIViewController+Extension.swift @@ -20,7 +20,7 @@ extension UIViewController { alertViewController.setTitle(font: UIFont.boldSystemFont(ofSize: 17), color: UIColor.white) alertViewController.setMessage(font: UIFont.systemFont(ofSize: 13), color: UIColor.white) - alertViewController.setTint(color: Colors.mainBlue.color) + alertViewController.setTint(color: .mainBlue) alertViewController.view.subviews.first?.subviews.first?.subviews.first?.backgroundColor = UIColor(red: 30/255, green: 30/255, blue: 30/255, alpha: 3/4) diff --git a/NADA-iOS-forRelease/Resouces/Fonts/TempFont.swift b/NADA-iOS-forRelease/Resouces/Fonts/TempFont.swift deleted file mode 100644 index 4c016878..00000000 --- a/NADA-iOS-forRelease/Resouces/Fonts/TempFont.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// TempFont.swift -// NADA-iOS-forRelease -// -// Created by kimhyungyu on 2021/08/08. -// - -import Foundation diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift index 2a6fa4b3..ef9a1607 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift @@ -46,29 +46,29 @@ extension BackCardCreationCollectionViewCell { private func setUI() { initUITextFieldList() scrollView.indicatorStyle = .white - scrollView.backgroundColor = Colors.black.color - bgView.backgroundColor = Colors.black.color - requiredCollectionView.backgroundColor = Colors.step.color - requiredInfoView.backgroundColor = Colors.step.color - optionInfoView.backgroundColor = Colors.step.color + scrollView.backgroundColor = .black1 + bgView.backgroundColor = .black1 + requiredCollectionView.backgroundColor = .stepBlack5 + requiredInfoView.backgroundColor = .stepBlack5 + optionInfoView.backgroundColor = .stepBlack5 requiredInfoTextLabel.text = "1 필수 정보" - requiredInfoTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 16) - requiredInfoTextLabel.textColor = Colors.white.color + requiredInfoTextLabel.font = .step + requiredInfoTextLabel.textColor = .white1 optionalInfoTextLabel.text = "2 선택 정보" - optionalInfoTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 16) - optionalInfoTextLabel.textColor = Colors.white.color + optionalInfoTextLabel.font = .step + optionalInfoTextLabel.textColor = .white1 - firstQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 1", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - firstAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 1", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - secondQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 2", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - secondAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 2", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) + firstQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + firstAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + secondQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + secondAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) _ = optionalInfoList.map { - $0.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 16) - $0.backgroundColor = Colors.inputBlack.color - $0.textColor = Colors.white.color + $0.font = .hint + $0.backgroundColor = .inputBlack2 + $0.textColor = .white1 $0.layer.cornerRadius = 5 } } @@ -142,7 +142,7 @@ extension BackCardCreationCollectionViewCell: UITextFieldDelegate { func textFieldDidBeginEditing(_ textField: UITextField) { textField.becomeFirstResponder() textField.borderWidth = 1 - textField.borderColor = Colors.white.color + textField.borderColor = .white1 } func textFieldDidEndEditing(_ textField: UITextField) { textField.borderWidth = 0 diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index 87d35a3d..774c3216 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -52,50 +52,50 @@ class FrontCardCreationCollectionViewCell: UICollectionViewCell { extension FrontCardCreationCollectionViewCell { private func setUI() { initUITextFieldList() - cardBackgroundSettingCollectionView.showsVerticalScrollIndicator = false + cardBackgroundSettingCollectionView.showsHorizontalScrollIndicator = false scrollView.indicatorStyle = .white - scrollView.backgroundColor = Colors.black.color - bgView.backgroundColor = Colors.black.color - setBackgroundView.backgroundColor = Colors.step.color - requiredInfoView.backgroundColor = Colors.step.color - optionalInfoView.backgroundColor = Colors.step.color - cardBackgroundSettingCollectionView.backgroundColor = Colors.step.color + scrollView.backgroundColor = .black1 + bgView.backgroundColor = .black1 + setBackgroundView.backgroundColor = .stepBlack5 + requiredInfoView.backgroundColor = .stepBlack5 + optionalInfoView.backgroundColor = .stepBlack5 + cardBackgroundSettingCollectionView.backgroundColor = .stepBlack5 let collectionViewLayout = cardBackgroundSettingCollectionView.collectionViewLayout as? UICollectionViewFlowLayout collectionViewLayout?.scrollDirection = .horizontal setBackgroundTextLabel.text = "1 배경 지정" - setBackgroundTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 16) - setBackgroundTextLabel.textColor = Colors.white.color + setBackgroundTextLabel.font = .step + setBackgroundTextLabel.textColor = .white1 requiredInfoTextLabel.text = "2 필수 정보" - requiredInfoTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 16) - requiredInfoTextLabel.textColor = Colors.white.color + requiredInfoTextLabel.font = .step + requiredInfoTextLabel.textColor = .white1 optionalInfoTextLabel.text = "3 선택 정보" - optionalInfoTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 16) - optionalInfoTextLabel.textColor = Colors.white.color + optionalInfoTextLabel.font = .step + optionalInfoTextLabel.textColor = .white1 - cardNameTextField.attributedPlaceholder = NSAttributedString(string: "명함이름", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - userNameTextField.attributedPlaceholder = NSAttributedString(string: "이름", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - birthTextField.attributedPlaceholder = NSAttributedString(string: "생년월일", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - mbtiTextField.attributedPlaceholder = NSAttributedString(string: "MBTI", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) + cardNameTextField.attributedPlaceholder = NSAttributedString(string: "명함이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + userNameTextField.attributedPlaceholder = NSAttributedString(string: "이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + birthTextField.attributedPlaceholder = NSAttributedString(string: "생년월일", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + mbtiTextField.attributedPlaceholder = NSAttributedString(string: "MBTI", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) - instagramTextField.attributedPlaceholder = NSAttributedString(string: "Instagram", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - linkNameTextField.attributedPlaceholder = NSAttributedString(string: "링크 이름", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - linkURLTextField.attributedPlaceholder = NSAttributedString(string: "링크", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) - clubNameTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트", attributes: [NSAttributedString.Key.foregroundColor: Colors.hint.color]) + instagramTextField.attributedPlaceholder = NSAttributedString(string: "Instagram", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + linkNameTextField.attributedPlaceholder = NSAttributedString(string: "링크 이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + linkURLTextField.attributedPlaceholder = NSAttributedString(string: "링크", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) + clubNameTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) _ = requiredInfoList.map { - $0.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 16) - $0.backgroundColor = Colors.inputBlack.color - $0.textColor = Colors.white.color + $0.font = .hint + $0.backgroundColor = .inputBlack2 + $0.textColor = .white1 $0.layer.cornerRadius = 5 } _ = optionalInfoList.map { - $0.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 16) - $0.backgroundColor = Colors.inputBlack.color - $0.textColor = Colors.white.color + $0.font = .hint + $0.backgroundColor = .inputBlack2 + $0.textColor = .white1 $0.layer.cornerRadius = 5 } } @@ -168,7 +168,7 @@ extension FrontCardCreationCollectionViewCell: UITextFieldDelegate { func textFieldDidBeginEditing(_ textField: UITextField) { textField.becomeFirstResponder() textField.borderWidth = 1 - textField.borderColor = Colors.white.color + textField.borderColor = .white1 } func textFieldDidEndEditing(_ textField: UITextField) { if cardNameTextField.hasText && userNameTextField.hasText && birthTextField.hasText && mbtiTextField.hasText { diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift index 70881c13..ffb29845 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift @@ -24,11 +24,11 @@ class RequiredFlavorCollectionViewCell: UICollectionViewCell { extension RequiredFlavorCollectionViewCell { private func setUI() { - bgView.backgroundColor = Colors.inputBlack.color + bgView.backgroundColor = .inputBlack2 bgView.cornerRadius = 10 - flavorLabel.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 16) - flavorLabel.textColor = Colors.hint.color + flavorLabel.font = .hint + flavorLabel.textColor = .hintGray1 } func initCell(flavor: String) { flavorLabel.text = flavor diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index ebca7354..79f9b381 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -53,30 +53,30 @@ class CardCreationViewController: UIViewController { extension CardCreationViewController { private func setUI() { - view.backgroundColor = Colors.black.color - statusMovedView.backgroundColor = Colors.white.color - cardCreationCollectionView.backgroundColor = Colors.black.color + view.backgroundColor = .black1 + statusMovedView.backgroundColor = .white1 + cardCreationCollectionView.backgroundColor = .black1 cardCreationCollectionView.isPagingEnabled = true creationTextLabel.text = "명함 생성" - creationTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 26) - creationTextLabel.textColor = Colors.white.color + creationTextLabel.font = .menu + creationTextLabel.textColor = .white1 frontTextLabel.text = "앞면" - frontTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 20) - frontTextLabel.textColor = Colors.white.color + frontTextLabel.font = .menuSub + frontTextLabel.textColor = .white1 backTextLabel.text = "뒷면" - backTextLabel.font = UIFont(name: "AppleSDGothicNeo-Bold", size: 20) - backTextLabel.textColor = Colors.hint.color + backTextLabel.font = .menuSub + backTextLabel.textColor = .hintGray1 - closeButton.setImage(UIImage(named: "closeBlack24Dp"), for: .normal) + closeButton.setImage(UIImage(named: "closeBlack"), for: .normal) closeButton.setTitle("", for: .normal) completeButton.setTitle("완료", for: .normal) - completeButton.titleLabel?.font = UIFont(name: "AppleSDGothicNeo-Medium", size: 16) - completeButton.setTitleColor(Colors.hint.color, for: .normal) - completeButton.backgroundColor = Colors.inputBlack.color + completeButton.titleLabel?.font = .btn + completeButton.setTitleColor(.hintGray1, for: .normal) + completeButton.backgroundColor = .inputBlack2 completeButton.layer.cornerRadius = 10 completeButton.isUserInteractionEnabled = false @@ -121,12 +121,12 @@ extension CardCreationViewController { } // if frontCardIsEmpty == true && backCardIsEmpty == true { if frontCardIsEmpty == true { - completeButton.backgroundColor = Colors.inputBlack.color - completeButton.setTitleColor(Colors.hint.color, for: .normal) + completeButton.backgroundColor = .inputBlack2 + completeButton.setTitleColor(.hintGray1, for: .normal) completeButton.isUserInteractionEnabled = false } else { - completeButton.backgroundColor = Colors.mainBlue.color - completeButton.setTitleColor(Colors.white.color, for: .normal) + completeButton.backgroundColor = .mainBlue + completeButton.setTitleColor(.white1, for: .normal) completeButton.isUserInteractionEnabled = true } } @@ -158,14 +158,14 @@ extension CardCreationViewController { @objc private func dragToBack() { let indexPath = IndexPath(item: 1, section: 0) - cardCreationCollectionView.scrollToItem(at: indexPath, at: .left, animated: true) + cardCreationCollectionView.scrollToItem(at: indexPath, at: .right, animated: true) if currentIndex == 0 { - UIView.animate(withDuration: 0.2) { + UIView.animate(withDuration: 0.3) { self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x + 5, y: 0) } currentIndex = 1 - self.frontTextLabel.textColor = Colors.hint.color - self.backTextLabel.textColor = Colors.white.color + self.frontTextLabel.textColor = .hintGray1 + self.backTextLabel.textColor = .white1 } } @objc @@ -173,12 +173,12 @@ extension CardCreationViewController { if currentIndex == 1 { let indexPath = IndexPath(item: 0, section: 0) cardCreationCollectionView.scrollToItem(at: indexPath, at: .left, animated: true) - UIView.animate(withDuration: 0.2) { + UIView.animate(withDuration: 0.3) { self.statusMovedView.transform = .identity } currentIndex = 0 - self.frontTextLabel.textColor = Colors.white.color - self.backTextLabel.textColor = Colors.hint.color + self.frontTextLabel.textColor = .white1 + self.backTextLabel.textColor = .hintGray1 } } } @@ -193,15 +193,15 @@ extension CardCreationViewController: UICollectionViewDelegate { self.statusMovedView.transform = CGAffineTransform(translationX: self.backTextLabel.frame.origin.x - self.statusMovedView.frame.origin.x + 5, y: 0) } currentIndex = 1 - self.frontTextLabel.textColor = Colors.hint.color - self.backTextLabel.textColor = Colors.white.color + self.frontTextLabel.textColor = .hintGray1 + self.backTextLabel.textColor = .white } else if targetIndex == 0 && currentIndex == 1 { UIView.animate(withDuration: 0.2) { self.statusMovedView.transform = .identity } currentIndex = 0 - self.frontTextLabel.textColor = Colors.white.color - self.backTextLabel.textColor = Colors.hint.color + self.frontTextLabel.textColor = .white1 + self.backTextLabel.textColor = .hintGray1 } } }