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

HomeViewController 연결 & 네비게이션 바 구현 & CTFontManagerRegisterFontsForURL로 폰트 적용 #38

Merged
merged 14 commits into from
Nov 9, 2024
Merged

HomeViewController 연결 & 네비게이션 바 구현 & CTFontManagerRegisterFontsForURL로 폰트 적용 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5e3e068
refactor: 카메라 이미지가 저장된 에셋 위치 변경
Kyxxn Nov 9, 2024
0d24d3e
design: 배경색 & 설정 아이콘 추가
Kyxxn Nov 9, 2024
c75037f
refactor: UIView Anchor 함수 디폴트 값 추가
Kyxxn Nov 9, 2024
5e7542a
feat: 첫화면을 Home ViewController로 연결
Kyxxn Nov 9, 2024
04d3570
design: NavigationBar 구현
Kyxxn Nov 9, 2024
60d4af8
feat: MHFoundation ENABLE_MODULE_VERIFIER 설정
Kyxxn Nov 9, 2024
2035f1b
chore: pbxproj 파일 업로드
Kyxxn Nov 9, 2024
ae689c4
fix: HomeViewController에 사용되지 않는 코드 제거
Kyxxn Nov 9, 2024
2bdb0c7
refactor: Anchor 함수 디폴트 값 변경
Kyxxn Nov 9, 2024
7650d90
fix: 네비게이션 바 이미지를 Button으로 변경
Kyxxn Nov 9, 2024
d79da1d
refactor: 불필요한 파일 및 코드 삭제
Kyxxn Nov 9, 2024
9f9abad
refactor: 코드리뷰 반영
Kyxxn Nov 9, 2024
2332b3e
feat: CTFontManagerRegisterFontsForURL를 통해 Presentation 모듈에 있는 Font 가져오기
Kyxxn Nov 9, 2024
787e3f0
chore: 모든 모듈의 디렉토리를 Folder로 변경
Kyxxn Nov 9, 2024
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
94 changes: 27 additions & 67 deletions MemorialHouse/MHApplication/MHApplication.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
0EE4A0A22CD5DD2400F17FA5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE4A0982CD5DD2400F17FA5 /* AppDelegate.swift */; };
0EE4A0A32CD5DD2400F17FA5 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE4A09F2CD5DD2400F17FA5 /* SceneDelegate.swift */; };
0EE4A0A42CD5DD2400F17FA5 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE4A0A02CD5DD2400F17FA5 /* ViewController.swift */; };
0EE4A0A52CD5DD2400F17FA5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0EE4A0992CD5DD2400F17FA5 /* Assets.xcassets */; };
0EE4A0A72CD5DD2400F17FA5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0EE4A09C2CD5DD2400F17FA5 /* LaunchScreen.storyboard */; };
CE9AEB6A2CD7B3DA00F8471D /* MHDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9AEB692CD7B3DA00F8471D /* MHDomain.framework */; };
CE9AEB6B2CD7B3DA00F8471D /* MHDomain.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE9AEB692CD7B3DA00F8471D /* MHDomain.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CE9AEB8A2CD7B4A800F8471D /* MHData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9AEB892CD7B4A800F8471D /* MHData.framework */; };
Expand Down Expand Up @@ -44,19 +39,34 @@

/* Begin PBXFileReference section */
0EE4A0802CD5DD1800F17FA5 /* MemorialHouse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MemorialHouse.app; sourceTree = BUILT_PRODUCTS_DIR; };
0EE4A0982CD5DD2400F17FA5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
0EE4A0992CD5DD2400F17FA5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0EE4A09A2CD5DD2400F17FA5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0EE4A09B2CD5DD2400F17FA5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
0EE4A09F2CD5DD2400F17FA5 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
0EE4A0A02CD5DD2400F17FA5 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
CE9AEB692CD7B3DA00F8471D /* MHDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEB892CD7B4A800F8471D /* MHData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEBAE2CD7B52D00F8471D /* MHPresentation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHPresentation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEBC92CD7B60200F8471D /* MHCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DB382CBC2CD9B1C1000D7689 /* MHFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
0E5C14CC2CDFB75D005406B3 /* Exceptions for "MHApplication" folder in "MemorialHouse" target */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
Resource/Info.plist,
);
target = 0EE4A07F2CD5DD1800F17FA5 /* MemorialHouse */;
};
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
0E5C14C62CDFB75D005406B3 /* MHApplication */ = {
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
0E5C14CC2CDFB75D005406B3 /* Exceptions for "MHApplication" folder in "MemorialHouse" target */,
);
path = MHApplication;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
0EE4A07D2CD5DD1800F17FA5 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand All @@ -76,7 +86,7 @@
0EE4A0772CD5DD1800F17FA5 = {
isa = PBXGroup;
children = (
0EE4A0A12CD5DD2400F17FA5 /* MHApplication */,
0E5C14C62CDFB75D005406B3 /* MHApplication */,
CE9AEB682CD7B3DA00F8471D /* Frameworks */,
0EE4A0812CD5DD1800F17FA5 /* Products */,
);
Expand All @@ -90,43 +100,6 @@
name = Products;
sourceTree = "<group>";
};
0EE4A0A12CD5DD2400F17FA5 /* MHApplication */ = {
isa = PBXGroup;
children = (
0EE4A0AA2CD5E04B00F17FA5 /* Resource */,
0EE4A0AB2CD5E05200F17FA5 /* Source */,
);
path = MHApplication;
sourceTree = "<group>";
};
0EE4A0AA2CD5E04B00F17FA5 /* Resource */ = {
isa = PBXGroup;
children = (
0EE4A0992CD5DD2400F17FA5 /* Assets.xcassets */,
0EE4A09A2CD5DD2400F17FA5 /* Info.plist */,
0EE4A09C2CD5DD2400F17FA5 /* LaunchScreen.storyboard */,
);
path = Resource;
sourceTree = "<group>";
};
0EE4A0AB2CD5E05200F17FA5 /* Source */ = {
isa = PBXGroup;
children = (
0EE4A0AC2CD5E06200F17FA5 /* App */,
0EE4A0A02CD5DD2400F17FA5 /* ViewController.swift */,
);
path = Source;
sourceTree = "<group>";
};
0EE4A0AC2CD5E06200F17FA5 /* App */ = {
isa = PBXGroup;
children = (
0EE4A0982CD5DD2400F17FA5 /* AppDelegate.swift */,
0EE4A09F2CD5DD2400F17FA5 /* SceneDelegate.swift */,
);
path = App;
sourceTree = "<group>";
};
CE9AEB682CD7B3DA00F8471D /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -156,6 +129,9 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
0E5C14C62CDFB75D005406B3 /* MHApplication */,
);
name = MemorialHouse;
packageProductDependencies = (
);
Expand Down Expand Up @@ -205,8 +181,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0EE4A0A52CD5DD2400F17FA5 /* Assets.xcassets in Resources */,
0EE4A0A72CD5DD2400F17FA5 /* LaunchScreen.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -238,25 +212,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0EE4A0A22CD5DD2400F17FA5 /* AppDelegate.swift in Sources */,
0EE4A0A32CD5DD2400F17FA5 /* SceneDelegate.swift in Sources */,
0EE4A0A42CD5DD2400F17FA5 /* ViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
0EE4A09C2CD5DD2400F17FA5 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
0EE4A09B2CD5DD2400F17FA5 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
0EE4A0942CD5DD1B00F17FA5 /* Debug */ = {
isa = XCBuildConfiguration;
Expand All @@ -269,9 +229,9 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MHApplication/Resource/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "기록소";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
INFOPLIST_KEY_NSCameraUsageDescription = "기록소는 카메라 권한을 필요로 합니다. 허용 안 함 시 일부 기능이 동작하지 않을 수 있습니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "기록소는 사진 권한을 필요로 합니다. 허용 안 함 시 일부 기능이 동작하지 않을 수 있습니다.";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
Expand Down Expand Up @@ -305,9 +265,9 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MHApplication/Resource/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "기록소";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
INFOPLIST_KEY_NSCameraUsageDescription = "기록소는 카메라 권한을 필요로 합니다. 허용 안 함 시 일부 기능이 동작하지 않을 수 있습니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "기록소는 사진 권한을 필요로 합니다. 허용 안 함 시 일부 기능이 동작하지 않을 수 있습니다.";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
Expand Down
5 changes: 2 additions & 3 deletions MemorialHouse/MHApplication/MHApplication/Source/App/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import UIKit
import MHPresentation

@main
final class AppDelegate: UIResponder, UIApplicationDelegate {
func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
UIFont.registerFont()
return true
}

Expand All @@ -16,7 +18,4 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
) -> UISceneConfiguration {
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
}

func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
}
}
3 changes: 2 additions & 1 deletion MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import UIKit
import MHPresentation

final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?
Expand All @@ -11,7 +12,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
guard let windowScene = (scene as? UIWindowScene) else { return }

window = UIWindow(windowScene: windowScene)
window?.rootViewController = ViewController()
window?.rootViewController = HomeViewController()
window?.makeKeyAndVisible()
}
}
24 changes: 0 additions & 24 deletions MemorialHouse/MHApplication/MHApplication/Source/ViewController.swift
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions MemorialHouse/MHCore/MHCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@
objects = {

/* Begin PBXBuildFile section */
CE9AEBCD2CD7B60F00F8471D /* Temp.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9AEBCC2CD7B60F00F8471D /* Temp.swift */; };
DB382CB92CD9B1A6000D7689 /* MHFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB382CB82CD9B1A6000D7689 /* MHFoundation.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
CE9AEBBB2CD7B5EF00F8471D /* MHCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MHCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEBCC2CD7B60F00F8471D /* Temp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Temp.swift; sourceTree = "<group>"; };
DB382CB82CD9B1A6000D7689 /* MHFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
0E5C14BB2CDFB75B005406B3 /* MHCore */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = MHCore;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
CE9AEBB82CD7B5EF00F8471D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand All @@ -32,7 +38,7 @@
CE9AEBB12CD7B5EF00F8471D = {
isa = PBXGroup;
children = (
CE9AEBC72CD7B5F700F8471D /* MHCore */,
0E5C14BB2CDFB75B005406B3 /* MHCore */,
CE9AEBFF2CD7BA2B00F8471D /* Frameworks */,
CE9AEBBC2CD7B5EF00F8471D /* Products */,
);
Expand All @@ -46,14 +52,6 @@
name = Products;
sourceTree = "<group>";
};
CE9AEBC72CD7B5F700F8471D /* MHCore */ = {
isa = PBXGroup;
children = (
CE9AEBCC2CD7B60F00F8471D /* Temp.swift */,
);
path = MHCore;
sourceTree = "<group>";
};
CE9AEBFF2CD7BA2B00F8471D /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -89,6 +87,9 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
0E5C14BB2CDFB75B005406B3 /* MHCore */,
);
name = MHCore;
packageProductDependencies = (
);
Expand Down Expand Up @@ -168,7 +169,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CE9AEBCD2CD7B60F00F8471D /* Temp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
24 changes: 12 additions & 12 deletions MemorialHouse/MHData/MHData.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,25 @@

/* Begin PBXBuildFile section */
CE9AEB862CD7B49C00F8471D /* MHDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9AEB852CD7B49C00F8471D /* MHDomain.framework */; };
CE9AEB8E2CD7B4B300F8471D /* Temp.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9AEB8C2CD7B4B300F8471D /* Temp.swift */; };
CE9AEBF42CD7BA1800F8471D /* MHCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9AEBF32CD7BA1800F8471D /* MHCore.framework */; };
DB382CC92CD9B24F000D7689 /* MHFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB382CC82CD9B24F000D7689 /* MHFoundation.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
CE9AEB772CD7B46700F8471D /* MHData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MHData.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEB852CD7B49C00F8471D /* MHDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE9AEB8C2CD7B4B300F8471D /* Temp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Temp.swift; sourceTree = "<group>"; };
CE9AEBF32CD7BA1800F8471D /* MHCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DB382CC82CD9B24F000D7689 /* MHFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MHFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
0E5C14CE2CDFB761005406B3 /* MHData */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = MHData;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
CE9AEB742CD7B46700F8471D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand All @@ -38,7 +44,7 @@
CE9AEB6D2CD7B46700F8471D = {
isa = PBXGroup;
children = (
CE9AEB8D2CD7B4B300F8471D /* MHData */,
0E5C14CE2CDFB761005406B3 /* MHData */,
CE9AEB842CD7B49C00F8471D /* Frameworks */,
CE9AEB782CD7B46700F8471D /* Products */,
);
Expand All @@ -62,14 +68,6 @@
name = Frameworks;
sourceTree = "<group>";
};
CE9AEB8D2CD7B4B300F8471D /* MHData */ = {
isa = PBXGroup;
children = (
CE9AEB8C2CD7B4B300F8471D /* Temp.swift */,
);
path = MHData;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -97,6 +95,9 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
0E5C14CE2CDFB761005406B3 /* MHData */,
);
name = MHData;
packageProductDependencies = (
);
Expand Down Expand Up @@ -176,7 +177,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CE9AEB8E2CD7B4B300F8471D /* Temp.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading
Loading