diff --git a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj index f205538..b541449 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj +++ b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj @@ -33,9 +33,9 @@ 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 */; }; - C3C19AEE2A24A5D10005984D /* NanumSquareB.otf in Resources */ = {isa = PBXBuildFile; fileRef = C3C19AED2A24A5D10005984D /* NanumSquareB.otf */; }; - C3C19AF02A24A5D60005984D /* NanumSquareR.otf in Resources */ = {isa = PBXBuildFile; fileRef = C3C19AEF2A24A5D60005984D /* NanumSquareR.otf */; }; DD462BC529F7915B0043F105 /* CategoryCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD462BC429F7915B0043F105 /* CategoryCollectionViewCell.swift */; }; + 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 */ @@ -63,8 +63,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 = ""; }; - C3C19AED2A24A5D10005984D /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = ""; }; - C3C19AEF2A24A5D60005984D /* NanumSquareR.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.otf; sourceTree = ""; }; + C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.ttf; sourceTree = ""; }; + C3D23E572A27B25100FBC019 /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = ""; }; DD462BC429F7915B0043F105 /* CategoryCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryCollectionViewCell.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -114,8 +114,8 @@ C37605B029D2BED00051BA18 /* Fonts */ = { isa = PBXGroup; children = ( - C3C19AED2A24A5D10005984D /* NanumSquareB.otf */, - C3C19AEF2A24A5D60005984D /* NanumSquareR.otf */, + C3D23E572A27B25100FBC019 /* NanumSquareB.otf */, + C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */, C37605C729D2C6E00051BA18 /* Pretendard-Regular.otf */, ); path = Fonts; @@ -346,10 +346,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C3D23E592A27B25100FBC019 /* NanumSquareB.otf in Resources */, C37605C829D2C6E00051BA18 /* Pretendard-Regular.otf in Resources */, C3C19AF02A24A5D60005984D /* NanumSquareR.otf in Resources */, C3B5535729CE8EE7002D3467 /* LaunchScreen.storyboard in Resources */, C37605CA29D2CBF30051BA18 /* Colors.xcassets in Resources */, + C3D23E582A27B25100FBC019 /* NanumSquareR.ttf in Resources */, C3B5535429CE8EE7002D3467 /* Assets.xcassets in Resources */, C3C19AEE2A24A5D10005984D /* NanumSquareB.otf in Resources */, ); diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift b/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift index 679519a..df1c840 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift @@ -24,6 +24,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { self.window?.makeKeyAndVisible() } + func sceneDidDisconnect(_ scene: UIScene) { // Called as the scene is being released by the system. // This occurs shortly after the scene enters the background, or when its session is discarded. diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift b/BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift index 6ef2283..1657094 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) ?? UIFont.boldSystemFont(ofSize: 18) + return UIFont(name: "NanumSquareOTFB", size: 18.0)! } class var btn: UIFont { - return UIFont(name: "NanumSquareB", size: 14.0) ?? UIFont.boldSystemFont(ofSize: 14) + return UIFont(name: "NanumSquareOTFB", size: 14.0)! } class var explain: UIFont { - return UIFont(name: "NanumSquareB", size: 16.0) ?? UIFont.boldSystemFont(ofSize: 16) + 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 dd97a62..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 @@ -19,11 +25,5 @@ - UIAppFonts - - NanumSquareR - NanumSquareB - Pretendard-Regular.otf -