From f86fad9a21744b11c88282e1a2580f203f322e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=B1=84=EC=9D=80?= Date: Thu, 1 Jun 2023 02:03:52 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20[#5]=20font=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BiBaBoo-iOS.xcodeproj/project.pbxproj | 16 ++++++++-------- BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift | 6 +++--- BiBaBoo-iOS/BiBaBoo-iOS/Info.plist | 6 ++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj index 78fbf7e..512875b 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj +++ b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj @@ -17,8 +17,6 @@ C37605BA29D2BF760051BA18 /* Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605B929D2BF760051BA18 /* Image.swift */; }; C37605BC29D2BF7A0051BA18 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605BB29D2BF7A0051BA18 /* Color.swift */; }; C37605BE29D2BF7F0051BA18 /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605BD29D2BF7F0051BA18 /* Font.swift */; }; - C37605C529D2C4C70051BA18 /* NanumSquareR.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C37605C329D2C4C60051BA18 /* NanumSquareR.ttf */; }; - C37605C629D2C4C70051BA18 /* NanumSquareB.otf in Resources */ = {isa = PBXBuildFile; fileRef = C37605C429D2C4C70051BA18 /* NanumSquareB.otf */; }; C37605C829D2C6E00051BA18 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = C37605C729D2C6E00051BA18 /* Pretendard-Regular.otf */; }; C37605CA29D2CBF30051BA18 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C37605C929D2CBF30051BA18 /* Colors.xcassets */; }; C37605CC29D543510051BA18 /* UIViewController+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605CB29D543510051BA18 /* UIViewController+.swift */; }; @@ -31,6 +29,8 @@ C3B5534D29CE8EE3002D3467 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B5534C29CE8EE3002D3467 /* SceneDelegate.swift */; }; C3B5535429CE8EE7002D3467 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3B5535329CE8EE7002D3467 /* Assets.xcassets */; }; C3B5535729CE8EE7002D3467 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3B5535529CE8EE7002D3467 /* LaunchScreen.storyboard */; }; + C3D23E582A27B25100FBC019 /* NanumSquareR.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */; }; + C3D23E592A27B25100FBC019 /* NanumSquareB.otf in Resources */ = {isa = PBXBuildFile; fileRef = C3D23E572A27B25100FBC019 /* NanumSquareB.otf */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -40,8 +40,6 @@ C37605B929D2BF760051BA18 /* Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = ""; }; C37605BB29D2BF7A0051BA18 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; C37605BD29D2BF7F0051BA18 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = ""; }; - C37605C329D2C4C60051BA18 /* NanumSquareR.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.ttf; sourceTree = ""; }; - C37605C429D2C4C70051BA18 /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = ""; }; C37605C729D2C6E00051BA18 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = ""; }; C37605C929D2CBF30051BA18 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; C37605CB29D543510051BA18 /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = ""; }; @@ -56,6 +54,8 @@ C3B5535329CE8EE7002D3467 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C3B5535629CE8EE7002D3467 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; C3B5535829CE8EE7002D3467 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.ttf; sourceTree = ""; }; + C3D23E572A27B25100FBC019 /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -76,8 +76,8 @@ C37605B029D2BED00051BA18 /* Fonts */ = { isa = PBXGroup; children = ( - C37605C429D2C4C70051BA18 /* NanumSquareB.otf */, - C37605C329D2C4C60051BA18 /* NanumSquareR.ttf */, + C3D23E572A27B25100FBC019 /* NanumSquareB.otf */, + C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */, C37605C729D2C6E00051BA18 /* Pretendard-Regular.otf */, ); path = Fonts; @@ -291,11 +291,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C3D23E592A27B25100FBC019 /* NanumSquareB.otf in Resources */, C37605C829D2C6E00051BA18 /* Pretendard-Regular.otf in Resources */, C3B5535729CE8EE7002D3467 /* LaunchScreen.storyboard in Resources */, - C37605C629D2C4C70051BA18 /* NanumSquareB.otf in Resources */, C37605CA29D2CBF30051BA18 /* Colors.xcassets in Resources */, - C37605C529D2C4C70051BA18 /* NanumSquareR.ttf in Resources */, + C3D23E582A27B25100FBC019 /* NanumSquareR.ttf in Resources */, C3B5535429CE8EE7002D3467 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift b/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift index e3ef29b..d605ea9 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift @@ -18,15 +18,15 @@ extension UIFont { } class var title: UIFont { - return UIFont(name: "NanumSquareB", size: 18.0)! + return UIFont(name: "NanumSquareOTFB", size: 18.0)! } class var btn: UIFont { - return UIFont(name: "NanumSquareB", size: 14.0)! + return UIFont(name: "NanumSquareOTFB", size: 14.0)! } class var explain: UIFont { - return UIFont(name: "NanumSquareB", size: 16.0)! + return UIFont(name: "NanumSquareOTFB", size: 16.0)! } class var tabBarDefault: UIFont { diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist b/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist index 0eb786d..932b3df 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist @@ -2,6 +2,12 @@ + UIAppFonts + + Pretendard-Regular.otf + NanumSquareR.ttf + NanumSquareB.otf + UIApplicationSceneManifest UIApplicationSupportsMultipleScenes