From 7b8d0868e0c62d05e80de3c8053947280c8f77c8 Mon Sep 17 00:00:00 2001 From: Jeongyeon Yang Date: Wed, 12 Apr 2023 14:43:40 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Create=20=F0=9F=AA=81-issue-template.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../\360\237\252\201-issue-template.md" | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 ".github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" diff --git "a/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" "b/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" new file mode 100644 index 0000000..3b33521 --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" @@ -0,0 +1,15 @@ +--- +name: "\U0001FA81 issue template" +about: kite의 새로운 이슈 추가 +title: "[Feat] description" +labels: "\U0001F49B 정연" +assignees: jeongkite + +--- + +## 💡 About + + + +## 📝 To Do +- [ ] task From abc17bc2691a4ce638db29864e0e59bcffc920fc Mon Sep 17 00:00:00 2001 From: Jeongyeon Yang Date: Wed, 12 Apr 2023 14:44:52 +0900 Subject: [PATCH 2/8] =?UTF-8?q?Update=20=F0=9F=AA=81-issue-template.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ".github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" "b/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" index 3b33521..cfa3759 100644 --- "a/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" +++ "b/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" @@ -2,7 +2,7 @@ name: "\U0001FA81 issue template" about: kite의 새로운 이슈 추가 title: "[Feat] description" -labels: "\U0001F49B 정연" +labels: "정연 👻" assignees: jeongkite --- From 380d2bb85aaf07815ddaebd50f2945e138dbb83a Mon Sep 17 00:00:00 2001 From: Jeongyeon Yang Date: Wed, 12 Apr 2023 14:45:06 +0900 Subject: [PATCH 3/8] =?UTF-8?q?Rename=20=F0=9F=AA=81-issue-template.md=20t?= =?UTF-8?q?o=20=F0=9F=91=BB-issue-template.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ".github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" => ".github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" (100%) diff --git "a/.github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" "b/.github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" similarity index 100% rename from ".github/ISSUE_TEMPLATE/\360\237\252\201-issue-template.md" rename to ".github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" From 24b2c9ca85827bc2679d178cf0c5e21ed51283a5 Mon Sep 17 00:00:00 2001 From: Jeongyeon Yang Date: Wed, 12 Apr 2023 14:45:40 +0900 Subject: [PATCH 4/8] =?UTF-8?q?Update=20=F0=9F=91=BB-issue-template.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ".github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/.github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" "b/.github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" index cfa3759..7d65f7e 100644 --- "a/.github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" +++ "b/.github/ISSUE_TEMPLATE/\360\237\221\273-issue-template.md" @@ -1,5 +1,5 @@ --- -name: "\U0001FA81 issue template" +name: "👻 issue template" about: kite의 새로운 이슈 추가 title: "[Feat] description" labels: "정연 👻" From 870e58aa18dfbf1b3dbea54ae942e9ec679b54cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=B1=84=EC=9D=80?= Date: Wed, 12 Apr 2023 18:57:12 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Add=20Home=20Request=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj | 12 ++++++++++++ BiBaBoo-iOS/BiBaBoo-iOS/Data/Home/HomeRequest.swift | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 BiBaBoo-iOS/BiBaBoo-iOS/Data/Home/HomeRequest.swift diff --git a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj index 698c5bd..00e8dfa 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj +++ b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ C37605D029D5442F0051BA18 /* BaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605CF29D5442F0051BA18 /* BaseNavigationController.swift */; }; C37605D329D544620051BA18 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605D229D544620051BA18 /* BaseViewController.swift */; }; C37605D529D544C90051BA18 /* GeneralResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = C37605D429D544C90051BA18 /* GeneralResponse.swift */; }; + C3B0BE6029E6B7DD00BF613A /* HomeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B0BE5F29E6B7DD00BF613A /* HomeRequest.swift */; }; C3B5534B29CE8EE3002D3467 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B5534A29CE8EE3002D3467 /* AppDelegate.swift */; }; C3B5534D29CE8EE3002D3467 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B5534C29CE8EE3002D3467 /* SceneDelegate.swift */; }; C3B5535429CE8EE7002D3467 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3B5535329CE8EE7002D3467 /* Assets.xcassets */; }; @@ -48,6 +49,7 @@ C37605CF29D5442F0051BA18 /* BaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNavigationController.swift; sourceTree = ""; }; C37605D229D544620051BA18 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; C37605D429D544C90051BA18 /* GeneralResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralResponse.swift; sourceTree = ""; }; + C3B0BE5F29E6B7DD00BF613A /* HomeRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeRequest.swift; sourceTree = ""; }; C3B5534729CE8EE3002D3467 /* BiBaBoo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BiBaBoo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; C3B5534A29CE8EE3002D3467 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C3B5534C29CE8EE3002D3467 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -131,6 +133,7 @@ C37605C229D2BFE50051BA18 /* Data */ = { isa = PBXGroup; children = ( + C3B0BE6129E6B7E200BF613A /* Home */, ); path = Data; sourceTree = ""; @@ -144,6 +147,14 @@ path = Base; sourceTree = ""; }; + C3B0BE6129E6B7E200BF613A /* Home */ = { + isa = PBXGroup; + children = ( + C3B0BE5F29E6B7DD00BF613A /* HomeRequest.swift */, + ); + path = Home; + sourceTree = ""; + }; C3B5533E29CE8EE3002D3467 = { isa = PBXGroup; children = ( @@ -302,6 +313,7 @@ C309F87E29DAB285007BAF98 /* adjust+.swift in Sources */, C37605D329D544620051BA18 /* BaseViewController.swift in Sources */, C37605CC29D543510051BA18 /* UIViewController+.swift in Sources */, + C3B0BE6029E6B7DD00BF613A /* HomeRequest.swift in Sources */, C37605B629D2BF650051BA18 /* Const.swift in Sources */, C37605BE29D2BF7F0051BA18 /* Font.swift in Sources */, C37605B829D2BF700051BA18 /* String.swift in Sources */, diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Data/Home/HomeRequest.swift b/BiBaBoo-iOS/BiBaBoo-iOS/Data/Home/HomeRequest.swift new file mode 100644 index 0000000..0b16d90 --- /dev/null +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Data/Home/HomeRequest.swift @@ -0,0 +1,8 @@ +// +// HomeRequest.swift +// BiBaBoo-iOS +// +// Created by 정채은 on 2023/04/12. +// + +import Foundation From c96d2e1a098667336e7943da7ec7302881426fd9 Mon Sep 17 00:00:00 2001 From: Jeongyeon Yang Date: Wed, 12 Apr 2023 21:35:43 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Chore=20info=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD,=20info=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Main=20SB=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj | 6 ++---- BiBaBoo-iOS/BiBaBoo-iOS/{Resource => }/Info.plist | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) rename BiBaBoo-iOS/BiBaBoo-iOS/{Resource => }/Info.plist (90%) diff --git a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj index 00e8dfa..78fbf7e 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj +++ b/BiBaBoo-iOS/BiBaBoo-iOS.xcodeproj/project.pbxproj @@ -174,6 +174,7 @@ C3B5534929CE8EE3002D3467 /* BiBaBoo-iOS */ = { isa = PBXGroup; children = ( + C3B5535829CE8EE7002D3467 /* Info.plist */, C3B5535F29CE8F4E002D3467 /* Storyboard */, C3B5535E29CE8F23002D3467 /* Application */, C3B5536029CE8F64002D3467 /* Resource */, @@ -208,7 +209,6 @@ C37605B029D2BED00051BA18 /* Fonts */, C3B5535329CE8EE7002D3467 /* Assets.xcassets */, C37605C929D2CBF30051BA18 /* Colors.xcassets */, - C3B5535829CE8EE7002D3467 /* Info.plist */, ); path = Resource; sourceTree = ""; @@ -459,12 +459,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = Q827V73L8U; + DEVELOPMENT_TEAM = Z429BM88YZ; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "BiBaBoo-iOS/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; - INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = ( @@ -492,7 +491,6 @@ INFOPLIST_FILE = "BiBaBoo-iOS/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; - INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Resource/Info.plist b/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist similarity index 90% rename from BiBaBoo-iOS/BiBaBoo-iOS/Resource/Info.plist rename to BiBaBoo-iOS/BiBaBoo-iOS/Info.plist index dd3c9af..0eb786d 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS/Resource/Info.plist +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Info.plist @@ -15,8 +15,6 @@ Default Configuration UISceneDelegateClassName $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main 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 7/8] =?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 From 99943a546f4e1f0b6b9effacab46d62c1737b32a 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:04:20 +0900 Subject: [PATCH 8/8] =?UTF-8?q?Feat=20[#5]=20SceneDelegate=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BiBaBoo-iOS/Application/SceneDelegate.swift | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift b/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift index 4856389..ec7ebef 100644 --- a/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift +++ b/BiBaBoo-iOS/BiBaBoo-iOS/Application/SceneDelegate.swift @@ -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.