From 918fac10611c9ed30ee0100d55d8924f45bee420 Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 19 Nov 2021 22:39:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[CHORE]=20#71=20-=20=ED=8F=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 28 ++++++ NADA-iOS-forRelease/Info.plist | 10 ++ .../iconCards.imageset/Contents.json | 10 +- .../Extensions/UIFont+Extension.swift | 92 ++++++------------- .../Resouces/Storyboards/CardList.storyboard | 9 +- .../Resouces/Storyboards/Login.storyboard | 9 +- .../Storyboards/Main/Front.storyboard | 14 ++- .../Resouces/Storyboards/More/More.storyboard | 9 +- .../Sources/Cells/CardCell/BackCardCell.xib | 46 ++++++---- .../BackCardCreationCollectionViewCell.swift | 6 +- .../FrontCardCreationCollectionViewCell.swift | 10 +- .../RequiredFlavorCollectionViewCell.swift | 2 +- .../CardCreationViewController.swift | 8 +- 13 files changed, 142 insertions(+), 111 deletions(-) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 512d6515..755e3c4a 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -38,6 +38,11 @@ 39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39D88B632745FDD400A72164 /* TabBar.storyboard */; }; 39D88B662745FE5F00A72164 /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D88B652745FE5F00A72164 /* TabBarViewController.swift */; }; 39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */; }; + 39DA4D862747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */; }; + 39DA4D872747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */; }; + 39DA4D882747DAC00082D572 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */; }; + 39DA4D892747DAC00082D572 /* NotoSansCJKkr-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */; }; + 39DA4D8A2747DAC00082D572 /* NotoSansCJKkr-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */; }; 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; }; 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; @@ -123,6 +128,11 @@ 39D88B632745FDD400A72164 /* TabBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TabBar.storyboard; sourceTree = ""; }; 39D88B652745FE5F00A72164 /* TabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = ""; }; 39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonBottomSheetViewController.swift; sourceTree = ""; }; + 39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Spoqa Han Sans Neo Bold.otf"; path = "../../../../../NADA_fonts 2/Spoqa Han Sans Neo Bold.otf"; sourceTree = ""; }; + 39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Spoqa Han Sans Neo Regular.otf"; path = "../../../../../NADA_fonts 2/Spoqa Han Sans Neo Regular.otf"; sourceTree = ""; }; + 39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Medium.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Medium.otf"; sourceTree = ""; }; + 39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Bold.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Bold.otf"; sourceTree = ""; }; + 39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Regular.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Regular.otf"; sourceTree = ""; }; 39F5A3CE271461EA00191F94 /* BackCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCell.swift; sourceTree = ""; }; 39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = ""; }; 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -314,6 +324,18 @@ path = BottomSheet; sourceTree = ""; }; + 39DA4D7B2747D7060082D572 /* Font */ = { + isa = PBXGroup; + children = ( + 39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */, + 39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */, + 39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */, + 39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */, + 39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */, + ); + path = Font; + sourceTree = ""; + }; 4D28D444572353D68574D2B0 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -513,6 +535,7 @@ isa = PBXGroup; children = ( F857FC8A26C03A5C00A48D01 /* Assets */, + 39DA4D7B2747D7060082D572 /* Font */, F8FC43A326C01F420033E151 /* Constants */, F8FC43A426C01F5B0033E151 /* Extensions */, F8FC43A226C01F2B0033E151 /* Storyboards */, @@ -710,22 +733,27 @@ buildActionMask = 2147483647; files = ( F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */, + 39DA4D8A2747DAC00082D572 /* NotoSansCJKkr-Regular.otf in Resources */, 39D88B622745FBA900A72164 /* More.storyboard in Resources */, F82FF8262702000000E57F8B /* RequiredFlavorCollectionViewCell.xib in Resources */, F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */, F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */, + 39DA4D872747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf in Resources */, 3958F23C270FFBD500B100B2 /* Group.storyboard in Resources */, F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */, 394F314F27081B4C00C83291 /* Front.storyboard in Resources */, 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */, + 39DA4D862747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf in Resources */, F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */, 39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */, 39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */, F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */, + 39DA4D892747DAC00082D572 /* NotoSansCJKkr-Bold.otf in Resources */, F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */, 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */, 39523E0B270184B100536900 /* CardList.storyboard in Resources */, F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */, + 39DA4D882747DAC00082D572 /* NotoSansCJKkr-Medium.otf in Resources */, 392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */, 390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */, ); diff --git a/NADA-iOS-forRelease/Info.plist b/NADA-iOS-forRelease/Info.plist index 3cb4a541..baa72bcd 100644 --- a/NADA-iOS-forRelease/Info.plist +++ b/NADA-iOS-forRelease/Info.plist @@ -2,6 +2,16 @@ + UIAppFonts + + NotoSansCJKkr-Bold.otf + NotoSansCJKkr-Medium.otf + NotoSansCJKkr-Regular.otf + Spoqa Han Sans Neo Bold.otf + Spoqa Han Sans Neo Regular.otf + + LSApplicationCategoryType + NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json index aef2e6a5..92f2613a 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json @@ -1,19 +1,19 @@ { "images" : [ { - "scale" : "1x", "idiom" : "universal", - "filename" : "iconCards.png" + "filename" : "iconCards.png", + "scale" : "1x" }, { - "filename" : "iconCards@2x.png", "idiom" : "universal", + "filename" : "iconCards@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "iconCards@3x.png", - "scale" : "3x" + "scale" : "3x", + "filename" : "iconCards@3x.png" } ], "info" : { diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift index 986c82c0..c11243a7 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift @@ -10,96 +10,56 @@ import UIKit extension UIFont { - class var appname: UIFont { - return UIFont.systemFont(ofSize: 30.0, weight: .heavy) + class var title01: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Bold", size: 20.0)! } - class var menu: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 26.0)! + class var textRegular01: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Regular", size: 20.0)! } - class var cardName: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 24.0)! + class var title02: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Bold", size: 18.0)! } - class var modalName: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 22.0)! + class var textRegular02: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Regular", size: 18.0)! } - class var menuSub: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 20.0)! + class var button01: UIFont { + return UIFont(name: "NotoSansCJKKR-Bold", size: 16.0)! } - class var cardBQue: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 18.0)! + class var textBold01: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Bold", size: 16.0)! } - class var cardPart: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 18.0)! + class var textRegular03: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Regular", size: 16.0)! } - class var cardBAns: UIFont { - return UIFont(name: "AppleSDGothicNeo-Light", size: 18.0)! + class var textBold02: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Bold", size: 14.0)! } - class var cardMbti: UIFont { - return UIFont.systemFont(ofSize: 18.0, weight: .light) + class var button02: UIFont { + return UIFont(name: "NotoSansCJKKR-Medium", size: 14.0)! } - class var cardAge: UIFont { - return UIFont.systemFont(ofSize: 18.0, weight: .light) + class var button03: UIFont { + return UIFont(name: "NotoSansCJKKR-Regular", size: 14.0)! } - class var listName: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 16.0)! + class var textRegular04: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Regular", size: 14.0)! } - class var step: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 16.0)! + class var textBold03: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Bold", size: 12.0)! } - class var cardOpt: UIFont { - return UIFont.systemFont(ofSize: 16.0, weight: .bold) - } - - class var inputKor: UIFont { - return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)! - } - - class var hint: UIFont { - return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)! - } - - class var btn: UIFont { - return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)! - } - - class var inputEng: UIFont { - return UIFont.systemFont(ofSize: 16.0, weight: .medium) - } - - class var description: UIFont { - return UIFont(name: "AppleSDGothicNeo-Regular", size: 16.0)! - } - - class var cardOptText: UIFont { - return UIFont.systemFont(ofSize: 16.0, weight: .regular) - } - - class var cardTitle: UIFont { - return UIFont(name: "AppleSDGothicNeo-Light", size: 16.0)! - } - - class var login: UIFont { - return UIFont(name: "AppleSDGothicNeo-Bold", size: 14.0)! - } - - class var hint2: UIFont { - return UIFont(name: "AppleSDGothicNeo-Medium", size: 14.0)! - } - - class var listDate: UIFont { - return UIFont(name: "AppleSDGothicNeo-Light", size: 12.0)! + class var textRegular05: UIFont { + return UIFont(name: "SpoqaHanSansNeo-Regular", size: 12.0)! } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard index 61dc448d..b2e9a82a 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard @@ -9,6 +9,11 @@ + + + SpoqaHanSansNeo-Bold + + @@ -34,8 +39,8 @@ diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard index 95194504..09c52e5b 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard @@ -8,6 +8,11 @@ + + + NotoSansCJKkr-Regular + + @@ -28,7 +33,7 @@ - + @@ -50,7 +55,7 @@ - + - + - + - + - + - + - + - + @@ -190,7 +198,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift index 92296015..022d671f 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/BackCardCreationCollectionViewCell.swift @@ -65,11 +65,11 @@ extension BackCardCreationCollectionViewCell { // optionInfoView.backgroundColor = .stepBlack5 requiredInfoTextLabel.text = "1 필수 정보" - requiredInfoTextLabel.font = .step + // requiredInfoTextLabel.font = .step // requiredInfoTextLabel.textColor = .white1 optionalInfoTextLabel.text = "2 선택 정보" - optionalInfoTextLabel.font = .step + // optionalInfoTextLabel.font = .step // optionalInfoTextLabel.textColor = .white1 // firstQuestionTextField.attributedPlaceholder = NSAttributedString(string: "질문 1", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) @@ -78,7 +78,7 @@ extension BackCardCreationCollectionViewCell { // secondAnswerTextField.attributedPlaceholder = NSAttributedString(string: "대답 2", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) _ = textFieldList.map { - $0.font = .hint + // $0.font = .hint // $0.backgroundColor = .inputBlack2 // $0.textColor = .white1 $0.layer.cornerRadius = 5 diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index a0b4ccbd..2028fe98 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -65,15 +65,15 @@ extension FrontCardCreationCollectionViewCell { collectionViewLayout?.scrollDirection = .horizontal setBackgroundTextLabel.text = "1 배경 지정" - setBackgroundTextLabel.font = .step + // setBackgroundTextLabel.font = .step // setBackgroundTextLabel.textColor = .white1 requiredInfoTextLabel.text = "2 필수 정보" - requiredInfoTextLabel.font = .step + // requiredInfoTextLabel.font = .step // requiredInfoTextLabel.textColor = .white1 optionalInfoTextLabel.text = "3 선택 정보" - optionalInfoTextLabel.font = .step + // optionalInfoTextLabel.font = .step // optionalInfoTextLabel.textColor = .white1 // cardNameTextField.attributedPlaceholder = NSAttributedString(string: "명함이름", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) @@ -87,14 +87,14 @@ extension FrontCardCreationCollectionViewCell { // clubNameTextField.attributedPlaceholder = NSAttributedString(string: "동아리 기수 / 파트", attributes: [NSAttributedString.Key.foregroundColor: UIColor.hintGray1]) _ = requiredTextFieldList.map { - $0.font = .hint + // $0.font = .hint // $0.backgroundColor = .inputBlack2 // $0.textColor = .white1 $0.layer.cornerRadius = 5 $0.borderStyle = .none } _ = optionalTextFieldList.map { - $0.font = .hint + // $0.font = .hint // $0.backgroundColor = .inputBlack2 // $0.textColor = .white1 $0.layer.cornerRadius = 5 diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift index b483294b..e19859ec 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/RequiredFlavor/RequiredFlavorCollectionViewCell.swift @@ -27,7 +27,7 @@ extension RequiredFlavorCollectionViewCell { // bgView.backgroundColor = .inputBlack2 bgView.cornerRadius = 10 - flavorLabel.font = .hint + // flavorLabel.font = .hint // flavorLabel.textColor = .hintGray1 flavorLabel.lineBreakMode = .byTruncatingTail flavorLabel.textAlignment = .center diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index 8ed0757b..8caf9e15 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -118,21 +118,21 @@ extension CardCreationViewController { cardCreationCollectionView.isPagingEnabled = true creationTextLabel.text = "명함 생성" - creationTextLabel.font = .menu + // creationTextLabel.font = .menu // creationTextLabel.textColor = .white1 frontTextLabel.text = "앞면" - frontTextLabel.font = .menuSub + // frontTextLabel.font = .menuSub // frontTextLabel.textColor = .white1 backTextLabel.text = "뒷면" - backTextLabel.font = .menuSub + // backTextLabel.font = .menuSub // backTextLabel.textColor = .hintGray1 closeButton.setImage(UIImage(named: "closeBlack"), for: .normal) closeButton.setTitle("", for: .normal) - completeButton.titleLabel?.font = .btn + // completeButton.titleLabel?.font = .btn completeButton.layer.cornerRadius = 10 completeButton.isEnabled = false From 05ab486fea09f5a064023c2fa5429dfb73157a5d Mon Sep 17 00:00:00 2001 From: MinjaeLee <2alswo7@khu.ac.kr> Date: Fri, 19 Nov 2021 23:45:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[CHORE]=20UIFont+Extension=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=95=9E=EC=97=90=20@nonobjc=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/UIFont+Extension.swift | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift index c11243a7..04bc71f9 100644 --- a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift @@ -10,55 +10,55 @@ import UIKit extension UIFont { - class var title01: UIFont { + @nonobjc class var title01: UIFont { return UIFont(name: "SpoqaHanSansNeo-Bold", size: 20.0)! } - class var textRegular01: UIFont { + @nonobjc class var textRegular01: UIFont { return UIFont(name: "SpoqaHanSansNeo-Regular", size: 20.0)! } - class var title02: UIFont { + @nonobjc class var title02: UIFont { return UIFont(name: "SpoqaHanSansNeo-Bold", size: 18.0)! } - class var textRegular02: UIFont { + @nonobjc class var textRegular02: UIFont { return UIFont(name: "SpoqaHanSansNeo-Regular", size: 18.0)! } - class var button01: UIFont { + @nonobjc class var button01: UIFont { return UIFont(name: "NotoSansCJKKR-Bold", size: 16.0)! } - class var textBold01: UIFont { + @nonobjc class var textBold01: UIFont { return UIFont(name: "SpoqaHanSansNeo-Bold", size: 16.0)! } - class var textRegular03: UIFont { + @nonobjc class var textRegular03: UIFont { return UIFont(name: "SpoqaHanSansNeo-Regular", size: 16.0)! } - class var textBold02: UIFont { + @nonobjc class var textBold02: UIFont { return UIFont(name: "SpoqaHanSansNeo-Bold", size: 14.0)! } - class var button02: UIFont { + @nonobjc class var button02: UIFont { return UIFont(name: "NotoSansCJKKR-Medium", size: 14.0)! } - class var button03: UIFont { + @nonobjc class var button03: UIFont { return UIFont(name: "NotoSansCJKKR-Regular", size: 14.0)! } - class var textRegular04: UIFont { + @nonobjc class var textRegular04: UIFont { return UIFont(name: "SpoqaHanSansNeo-Regular", size: 14.0)! } - class var textBold03: UIFont { + @nonobjc class var textBold03: UIFont { return UIFont(name: "SpoqaHanSansNeo-Bold", size: 12.0)! } - class var textRegular05: UIFont { + @nonobjc class var textRegular05: UIFont { return UIFont(name: "SpoqaHanSansNeo-Regular", size: 12.0)! }