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

Jump to bottom

Feat [#14] 홈 뷰 UI 구현 #25

Merged
merged 11 commits into from
Jan 10, 2024
Merged

Feat [#14] 홈 뷰 UI 구현 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b6b29ac
[Fix] #14 - TabBar 홈 화면 파일 연동 변경
yeonsu0-0 Jan 8, 2024
43f801b
[Feat] #14 - 홈 collectionView 구현
yeonsu0-0 Jan 9, 2024
8f39d00
[Fix] #14 - 홈 collectionView footer 뷰 수정
yeonsu0-0 Jan 10, 2024
288f73c
[Feat] #14 - collectionViewCell UI 구현
yeonsu0-0 Jan 10, 2024
de10896
[Fix] #14 - 상수값에 adjusted 추가
yeonsu0-0 Jan 10, 2024
62c591b
Merge branch 'develop' into feat/#14-homeUI
yeonsu0-0 Jan 10, 2024
3397e7e
[Chore] #14 - 글쓰기 뷰 ViewModel 빈 폴더 삭제
yeonsu0-0 Jan 10, 2024
f9a9a11
[Chore] #14 - 콘솔 로그 출력 함수 삭제
yeonsu0-0 Jan 10, 2024
d263c8e
[Fix] #14 - tabBar 높이 구하는 메서드 수정
yeonsu0-0 Jan 10, 2024
97c35d8
[Chore] #14 - 마크업 주석 밑에 공백 추가
yeonsu0-0 Jan 10, 2024
b927eb4
[Chore] #14 - 최종 코드리뷰 반영
yeonsu0-0 Jan 10, 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: 28 additions & 24 deletions DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,21 @@
2AAA845F2B494AC50098A824 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2AAA845E2B494AC50098A824 /* SnapKit */; };
2AAEFC972B4A9C3700C2D323 /* DontBeTabBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAEFC962B4A9C3700C2D323 /* DontBeTabBarItem.swift */; };
2AAEFC992B4A9E3B00C2D323 /* DontBeTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */; };
2F8735402B4BE65300E55552 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F87353F2B4BE65300E55552 /* HomeView.swift */; };
2F8735422B4BE66500E55552 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735412B4BE66500E55552 /* HomeViewController.swift */; };
2F8735442B4BE67300E55552 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735432B4BE67300E55552 /* HomeViewModel.swift */; };
2F8735462B4C34A500E55552 /* HomeCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735452B4C34A500E55552 /* HomeCollectionView.swift */; };
2F8735482B4C355100E55552 /* HomeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */; };
2F87354A2B4C427000E55552 /* UICollectionViewRegisterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */; };
2F87354C2B4D28D700E55552 /* HomeCollectionFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */; };
3C01692A2B4DC82D0075334B /* DontBePopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */; };
3C0920DE2B4D98CD003BD080 /* DontBeToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */; };
3C2854F72B3A9E8300369C99 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854F62B3A9E8300369C99 /* View.swift */; };
3C2854F92B3A9E8A00369C99 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854F82B3A9E8A00369C99 /* ViewModel.swift */; };
3C2854FB2B3A9E9000369C99 /* Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FA2B3A9E9000369C99 /* Cell.swift */; };
3C2854FD2B3A9FD800369C99 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */; };
3C2854FF2B3AA01700369C99 /* ExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FE2B3AA01700369C99 /* ExampleView.swift */; };
3C2855012B3AA0A000369C99 /* ExampleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */; };
3C35565B2B494F0A0016BA49 /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C35565A2B494F0A0016BA49 /* UIColor+.swift */; };
3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EC2B3A719A00220CEB /* AppDelegate.swift */; };
3C6192EF2B3A719A00220CEB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */; };
3C6192F12B3A719A00220CEB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192F02B3A719A00220CEB /* ViewController.swift */; };
3C6192F62B3A719C00220CEB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C6192F52B3A719C00220CEB /* Assets.xcassets */; };
3C61930A2B3A781300220CEB /* ImageLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6193092B3A781300220CEB /* ImageLiterals.swift */; };
3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C61930B2B3A782100220CEB /* StringLiterals.swift */; };
Expand Down Expand Up @@ -82,19 +85,22 @@
2A8D70CB2B4DA7BD009F4C6C /* UITextField+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+.swift"; sourceTree = "<group>"; };
2AAEFC962B4A9C3700C2D323 /* DontBeTabBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeTabBarItem.swift; sourceTree = "<group>"; };
2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeTabBarController.swift; sourceTree = "<group>"; };
2F87353F2B4BE65300E55552 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
2F8735412B4BE66500E55552 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
2F8735432B4BE67300E55552 /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
2F8735452B4C34A500E55552 /* HomeCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionView.swift; sourceTree = "<group>"; };
2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionViewCell.swift; sourceTree = "<group>"; };
2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICollectionViewRegisterable.swift; sourceTree = "<group>"; };
2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCollectionFooterView.swift; sourceTree = "<group>"; };
3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBePopupView.swift; sourceTree = "<group>"; };
3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeToastView.swift; sourceTree = "<group>"; };
3C2854F62B3A9E8300369C99 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
3C2854F82B3A9E8A00369C99 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
3C2854FA2B3A9E9000369C99 /* Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
3C2854FE2B3AA01700369C99 /* ExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleView.swift; sourceTree = "<group>"; };
3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleCollectionViewCell.swift; sourceTree = "<group>"; };
3C35565A2B494F0A0016BA49 /* UIColor+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = "<group>"; };
3C6192E92B3A719A00220CEB /* DontBe-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DontBe-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3C6192EC2B3A719A00220CEB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
3C6192F02B3A719A00220CEB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
3C6192F52B3A719C00220CEB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3C6192FA2B3A719C00220CEB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3C6193092B3A781300220CEB /* ImageLiterals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageLiterals.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -379,31 +385,34 @@
3C6193102B3A7A0D00220CEB /* Views */ = {
isa = PBXGroup;
children = (
3C2854F62B3A9E8300369C99 /* View.swift */,
2F87353F2B4BE65300E55552 /* HomeView.swift */,
2F8735452B4C34A500E55552 /* HomeCollectionView.swift */,
2F87354B2B4D28D700E55552 /* HomeCollectionFooterView.swift */,
2F8735492B4C427000E55552 /* UICollectionViewRegisterable.swift */,
);
path = Views;
sourceTree = "<group>";
};
3C6193112B3A7A1500220CEB /* ViewControllers */ = {
isa = PBXGroup;
children = (
3C6192F02B3A719A00220CEB /* ViewController.swift */,
2F8735412B4BE66500E55552 /* HomeViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
};
3C6193122B3A7A1E00220CEB /* ViewModel */ = {
isa = PBXGroup;
children = (
3C2854F82B3A9E8A00369C99 /* ViewModel.swift */,
2F8735432B4BE67300E55552 /* HomeViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
3C6193132B3A7A2400220CEB /* Cells */ = {
isa = PBXGroup;
children = (
3C2854FA2B3A9E9000369C99 /* Cell.swift */,
2F8735472B4C355100E55552 /* HomeCollectionViewCell.swift */,
);
path = Cells;
sourceTree = "<group>";
Expand All @@ -413,7 +422,6 @@
children = (
3CE9C1262B4BE5E60086E4A3 /* Views */,
3CE9C1282B4BE6580086E4A3 /* ViewControllers */,
3CE9C1272B4BE6400086E4A3 /* ViewModel */,
);
path = Write;
sourceTree = "<group>";
Expand All @@ -429,13 +437,6 @@
path = Views;
sourceTree = "<group>";
};
3CE9C1272B4BE6400086E4A3 /* ViewModel */ = {
isa = PBXGroup;
children = (
);
path = ViewModel;
sourceTree = "<group>";
};
3CE9C1282B4BE6580086E4A3 /* ViewControllers */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -531,15 +532,16 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2F87354A2B4C427000E55552 /* UICollectionViewRegisterable.swift in Sources */,
2A8D70CA2B4D9787009F4C6C /* OnboardingEndingView.swift in Sources */,
3C6193172B3A7A7B00220CEB /* UIStackView+.swift in Sources */,
3CE9C12E2B4C08AE0086E4A3 /* WriteTextView.swift in Sources */,
2A8D70BD2B4D61A1009F4C6C /* OnboardingDummy.swift in Sources */,
3C6193152B3A7A6400220CEB /* UIView+.swift in Sources */,
3C6192F12B3A719A00220CEB /* ViewController.swift in Sources */,
3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */,
2F8735462B4C34A500E55552 /* HomeCollectionView.swift in Sources */,
2F8735422B4BE66500E55552 /* HomeViewController.swift in Sources */,
2A8D70B42B4C999F009F4C6C /* CustomButton.swift in Sources */,
3C2854FB2B3A9E9000369C99 /* Cell.swift in Sources */,
3C61930A2B3A781300220CEB /* ImageLiterals.swift in Sources */,
2A8D70C52B4D8079009F4C6C /* UIViewController+.swift in Sources */,
2A6D54C12B479B4300F9891E /* adjusted+.swift in Sources */,
Expand All @@ -555,12 +557,14 @@
2A8D70B82B4C9A59009F4C6C /* OnboardingViewController.swift in Sources */,
2A2672022B4C3B44009D214F /* ViewModelType.swift in Sources */,
3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */,
3C2854F72B3A9E8300369C99 /* View.swift in Sources */,
2F8735402B4BE65300E55552 /* HomeView.swift in Sources */,
2F8735442B4BE67300E55552 /* HomeViewModel.swift in Sources */,
2F87354C2B4D28D700E55552 /* HomeCollectionFooterView.swift in Sources */,
2F8735482B4C355100E55552 /* HomeCollectionViewCell.swift in Sources */,
3CE9C12A2B4BE6780086E4A3 /* WriteViewController.swift in Sources */,
3C2854FD2B3A9FD800369C99 /* ExampleViewController.swift in Sources */,
2AAEFC992B4A9E3B00C2D323 /* DontBeTabBarController.swift in Sources */,
2AAEFC972B4A9C3700C2D323 /* DontBeTabBarItem.swift in Sources */,
3C2854F92B3A9E8A00369C99 /* ViewModel.swift in Sources */,
3C0920DE2B4D98CD003BD080 /* DontBeToastView.swift in Sources */,
3CE9C1302B4C2F740086E4A3 /* UIImageView+.swift in Sources */,
2A51AE852B4B05AA00FF770A /* SplashViewController.swift in Sources */,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apologize, but I am an AI language model and I don't have real-time data or the ability to browse the internet. My training only goes up until September 2021. Is there anything else I can help you with based on my existing knowledge?

Expand Down
8 changes: 0 additions & 8 deletions DontBe-iOS/DontBe-iOS/Presentation/Home/Cells/Cell.swift
View file
Open in desktop

This file was deleted.

Loading