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

[feat] 기본 탭바 구현 #124

Merged
merged 6 commits into from
Jul 6, 2024
Merged

[feat] 기본 탭바 구현 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9173b9e
feat/#114 기본 탭바 구조 구현
youz2me Jul 5, 2024
79b15a6
Merge remote-tracking branch 'refs/remotes/origin/suyeon'
youz2me Jul 5, 2024
12bed83
chore/#114 에셋 폴더링
youz2me Jul 5, 2024
1cba8b0
feat/#114 탭바 색상 적용
youz2me Jul 5, 2024
46f1db8
fix/#114 전역 변수 지역 변수로 변경
youz2me Jul 6, 2024
89d009a
fix/#114 프로젝트 구조 설정에 맞게 파일명 변경
youz2me Jul 6, 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
52 changes: 48 additions & 4 deletions KkuMulKum.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@
785AE1C02C2E878600677CA0 /* FirebaseVertexAI-Preview in Frameworks */ = {isa = PBXBuildFile; productRef = 785AE1BF2C2E878600677CA0 /* FirebaseVertexAI-Preview */; };
78B9286C2C29402C006D9942 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286B2C29402C006D9942 /* AppDelegate.swift */; };
78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286D2C29402C006D9942 /* SceneDelegate.swift */; };
78B928702C29402C006D9942 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B9286F2C29402C006D9942 /* ViewController.swift */; };
78B928752C29402E006D9942 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78B928742C29402E006D9942 /* Assets.xcassets */; };
78B928782C29402E006D9942 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78B928762C29402E006D9942 /* LaunchScreen.storyboard */; };
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */; };
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE742C385FB1007C6059 /* HomeViewController.swift */; };
DDA2EE772C385FC3007C6059 /* GroupListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */; };
DDA2EE792C385FCF007C6059 /* MyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2EE782C385FCF007C6059 /* MyPageViewController.swift */; };
DE254AA52C31131600A4015E /* Color.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DE254AA42C31131600A4015E /* Color.xcassets */; };
DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE254AA72C3118EA00A4015E /* UIView+.swift */; };
DE254AAA2C31190E00A4015E /* UIStackView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE254AA92C31190E00A4015E /* UIStackView+.swift */; };
Expand Down Expand Up @@ -88,10 +91,13 @@
78B928682C29402C006D9942 /* KkuMulKum.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KkuMulKum.app; sourceTree = BUILT_PRODUCTS_DIR; };
78B9286B2C29402C006D9942 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
78B9286D2C29402C006D9942 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
78B9286F2C29402C006D9942 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
78B928742C29402E006D9942 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
78B928772C29402E006D9942 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
78B928792C29402E006D9942 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupListViewController.swift; sourceTree = "<group>"; };
DDA2EE782C385FCF007C6059 /* MyPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
DE254AA42C31131600A4015E /* Color.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Color.xcassets; sourceTree = "<group>"; };
DE254AA72C3118EA00A4015E /* UIView+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+.swift"; sourceTree = "<group>"; };
DE254AA92C31190E00A4015E /* UIStackView+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIStackView+.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -202,6 +208,38 @@
path = KkuMulKum;
sourceTree = "<group>";
};
DDA2EE7B2C386078007C6059 /* Home */ = {
isa = PBXGroup;
children = (
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */,
);
path = Home;
sourceTree = "<group>";
};
DDA2EE7C2C38607F007C6059 /* GroupList */ = {
isa = PBXGroup;
children = (
DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */,
);
path = GroupList;
sourceTree = "<group>";
};
DDA2EE7D2C386087007C6059 /* MyPage */ = {
isa = PBXGroup;
children = (
DDA2EE782C385FCF007C6059 /* MyPageViewController.swift */,
);
path = MyPage;
sourceTree = "<group>";
};
DDA2EE7E2C3860B2007C6059 /* Core */ = {
isa = PBXGroup;
children = (
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */,
);
path = Core;
sourceTree = "<group>";
};
DE254AA12C31106700A4015E /* Application */ = {
isa = PBXGroup;
children = (
Expand All @@ -214,7 +252,10 @@
DE254AA22C31107700A4015E /* Source */ = {
isa = PBXGroup;
children = (
78B9286F2C29402C006D9942 /* ViewController.swift */,
DDA2EE7E2C3860B2007C6059 /* Core */,
DDA2EE7B2C386078007C6059 /* Home */,
DDA2EE7C2C38607F007C6059 /* GroupList */,
DDA2EE7D2C386087007C6059 /* MyPage */,
);
path = Source;
sourceTree = "<group>";
Expand Down Expand Up @@ -438,19 +479,22 @@
files = (
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */,
DE254AAC2C31192400A4015E /* UILabel+.swift in Sources */,
DE254AB72C3119D000A4015E /* ReuseIdentifiable.swift in Sources */,
DDA2EE752C385FB1007C6059 /* HomeViewController.swift in Sources */,
DE254AB42C31199B00A4015E /* UITextField+.swift in Sources */,
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */,
DE254AAA2C31190E00A4015E /* UIStackView+.swift in Sources */,
DED5DBF02C345317006ECE7E /* BaseCollectionViewCell.swift in Sources */,
DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */,
DE254AAE2C31193600A4015E /* UIFont+.swift in Sources */,
DE254AB22C31197B00A4015E /* UIButton+.swift in Sources */,
78B928702C29402C006D9942 /* ViewController.swift in Sources */,
DDA2EE772C385FC3007C6059 /* GroupListViewController.swift in Sources */,
78B9286C2C29402C006D9942 /* AppDelegate.swift in Sources */,
DED5DBF42C34539A006ECE7E /* BaseTableViewCell.swift in Sources */,
78B9286E2C29402C006D9942 /* SceneDelegate.swift in Sources */,
DDA2EE792C385FCF007C6059 /* MyPageViewController.swift in Sources */,
DED5DBEE2C34529A006ECE7E /* BaseView.swift in Sources */,
DE254AB02C31195B00A4015E /* NSAttributedString+.swift in Sources */,
DE8247FD2C36E7C7000601BC /* MoyaLoggingPlugin.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion KkuMulKum/Application/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
) {
guard let windowScene = (scene as? UIWindowScene) else { return }
self.window = UIWindow(windowScene: windowScene)
let navigationController = UINavigationController(rootViewController: ViewController())
let navigationController = UINavigationController(rootViewController: MainTabBarController())
self.window?.rootViewController = navigationController
self.window?.makeKeyAndVisible()
}
Expand Down
6 changes: 6 additions & 0 deletions KkuMulKum/Resource/Assets.xcassets/Image/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
0 ....xcassets/img_logo.imageset/Contents.json → ...ets/Image/img_logo.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets.xcassets/img_logo.imageset/logo.png → ...xcassets/Image/img_logo.imageset/logo.png
View file
Open in desktop
File renamed without changes
0 ...ts.xcassets/img_logo.imageset/[email protected] → ...ssets/Image/img_logo.imageset/[email protected]
View file
Open in desktop
File renamed without changes
0 ...ts.xcassets/img_logo.imageset/[email protected] → ...ssets/Image/img_logo.imageset/[email protected]
View file
Open in desktop
File renamed without changes
0 ...assets/img_profile.imageset/Contents.json → .../Image/img_profile.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ets/img_profile.imageset/profileBasic.png → ...age/img_profile.imageset/profileBasic.png
View file
Open in desktop
File renamed without changes
0 .../img_profile.imageset/[email protected] → .../img_profile.imageset/[email protected]
View file
Open in desktop
File renamed without changes
0 .../img_profile.imageset/[email protected] → .../img_profile.imageset/[email protected]
View file
Open in desktop
File renamed without changes
12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_back.imageset/Contents.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions KkuMulKum/Resource/Assets.xcassets/icon_back.imageset/back.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_camera.imageset/Contents.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions KkuMulKum/Resource/Assets.xcassets/icon_camera.imageset/camera.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_check.imageset/Contents.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions KkuMulKum/Resource/Assets.xcassets/icon_check.imageset/check.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_date.imageset/Contents.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions KkuMulKum/Resource/Assets.xcassets/icon_date.imageset/date.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_delete.imageset/Contents.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions KkuMulKum/Resource/Assets.xcassets/icon_delete.imageset/delete.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_deleteDark.imageset/Contents.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions KkuMulKum/Resource/Assets.xcassets/icon_deleteDark.imageset/deleteDark.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_group.imageset/Contents.json
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions KkuMulKum/Resource/Assets.xcassets/icon_group.imageset/group.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_groupPlus.imageset/Contents.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions KkuMulKum/Resource/Assets.xcassets/icon_groupPlus.imageset/groupPlus.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_home.imageset/Contents.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions KkuMulKum/Resource/Assets.xcassets/icon_home.imageset/home.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_my.imageset/Contents.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions KkuMulKum/Resource/Assets.xcassets/icon_my.imageset/my.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_penalty.imageset/Contents.json
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions KkuMulKum/Resource/Assets.xcassets/icon_penalty.imageset/penalty.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_pin.imageset/Contents.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions KkuMulKum/Resource/Assets.xcassets/icon_pin.imageset/pin.svg
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions KkuMulKum/Resource/Assets.xcassets/icon_plus.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Loading