Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/#5 font issue #6

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/#5 font issue #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f86fad9
Fix [#5] font 적용 안되는 문제 해결
chaentopia May 31, 2023
99943a5
Feat [#5] SceneDelegate 설정
chaentopia May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -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 */
Expand All @@ -40,8 +40,6 @@
C37605B929D2BF760051BA18 /* Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
C37605BB29D2BF7A0051BA18 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
C37605BD29D2BF7F0051BA18 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
C37605C329D2C4C60051BA18 /* NanumSquareR.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.ttf; sourceTree = "<group>"; };
C37605C429D2C4C70051BA18 /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = "<group>"; };
C37605C729D2C6E00051BA18 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
C37605C929D2CBF30051BA18 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
C37605CB29D543510051BA18 /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = "<group>"; };
Expand All @@ -56,6 +54,8 @@
C3B5535329CE8EE7002D3467 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
C3B5535629CE8EE7002D3467 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
C3B5535829CE8EE7002D3467 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C3D23E562A27B25100FBC019 /* NanumSquareR.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareR.ttf; sourceTree = "<group>"; };
C3D23E572A27B25100FBC019 /* NanumSquareB.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = NanumSquareB.otf; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
15 changes: 11 additions & 4 deletions BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {


func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
guard let _ = (scene as? UIWindowScene) else { return }

// 1.
guard let windowScene = (scene as? UIWindowScene) else { return }
// 2.
self.window = UIWindow(windowScene: windowScene)
// 3.
let navigationController = UINavigationController(rootViewController: ViewController())
self.window?.rootViewController = navigationController
// 4.
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.
Expand Down
6 changes: 3 additions & 3 deletions BiBaBoo-iOS/BiBaBoo-iOS/Common/Consts/Font.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions BiBaBoo-iOS/BiBaBoo-iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Regular.otf</string>
<string>NanumSquareR.ttf</string>
<string>NanumSquareB.otf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down