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] #46 - 명함 그룹화면 구현 #84

Merged
merged 14 commits into from
Nov 26, 2021
Merged

[FEAT] #46 - 명함 그룹화면 구현 #84

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8598c5c
[FEAT] #46 명함 그룹 뷰 네비게이션 바 추가
dlwns33 Nov 21, 2021
5dd8ac9
[FEAT] #46 명함 그룹 레이아웃 잡기
dlwns33 Nov 21, 2021
bee89df
[FEAT] #46 그룹 collectionview cell 추가
dlwns33 Nov 21, 2021
f3865d9
[FEAT] #46 collectionview 큰 레이아웃 완료
dlwns33 Nov 22, 2021
f9b4f5d
[FEAT] #46 그룹명 다이나믹 셀
dlwns33 Nov 22, 2021
2c2ee45
[REFACTOR] #46 collectionview switch 문 사용
dlwns33 Nov 22, 2021
078bdf6
Merge branch 'develop' into feature/#46
dlwns33 Nov 25, 2021
539ac3d
[FEAT] #46 그룹 편집 뷰 이어지게
dlwns33 Nov 25, 2021
af68891
[FEAT] #46 명함 그룹 뷰 셀 따로 만들기
dlwns33 Nov 25, 2021
a4f32d6
[FEAT] #46 명함 그룹 뷰 셀 IBoutlet 추가
dlwns33 Nov 25, 2021
137a66f
[FEAT] #46 아이디로 추가 bottomSheet 연결
dlwns33 Nov 25, 2021
7f0091c
[FEAT] #46 ID검색 뒤 명함 bottomSheet 연결
dlwns33 Nov 25, 2021
f0750a2
[FEAT] #46 QR스캔 화면 생성
dlwns33 Nov 25, 2021
15d0f8e
[FEAT] #46 const 에 bottomsheet 추가
dlwns33 Nov 26, 2021
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
41 changes: 40 additions & 1 deletion NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,20 @@
39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; };
39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; };
7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; };
77607EDA274A68BE00204CD2 /* GroupCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */; };
77607EDB274A68BE00204CD2 /* GroupCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */; };
7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */; };
7766A410274FEBE200714912 /* CardInGroupCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7766A40E274FEBE200714912 /* CardInGroupCollectionViewCell.xib */; };
77703157275005AA002CBD19 /* CardResultBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77703156275005AA002CBD19 /* CardResultBottomSheetViewController.swift */; };
7770315927500C49002CBD19 /* QRScan.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7770315827500C49002CBD19 /* QRScan.storyboard */; };
7770315B27500C7B002CBD19 /* QRScanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7770315A27500C7B002CBD19 /* QRScanViewController.swift */; };
777FF89B27359B7800BF69D3 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89A27359B7800BF69D3 /* Groups.swift */; };
777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */; };
777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; };
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */; };
77DFB871274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77DFB870274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift */; };
DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; };
F811720027383097002742CF /* ChangeGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81171FF27383097002742CF /* ChangeGroupRequest.swift */; };
F81A6833274F49A700B80A4F /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81A6832274F49A700B80A4F /* UITextField+Extension.swift */; };
Copy link
Member

Choose a reason for hiding this comment

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

어라라라ㅏ 혹쉬 이게 빠져있는거는 위치가 변경되서 그런걸까요...?
아니면 pull을 안받아서일까요..?
이준교수님 xcode에서는 잘 되는건가욥..?

Copy link
Member Author

Choose a reason for hiding this comment

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

안그래두.. 나도 이게 뭐지 싶었는데 또 깃허브랑 엑스코드에서는 파일이 잘 있더라구..?
풀은 분명히 중간에 최신걸로 받았는데... 이상허다 싶었어...

Copy link
Member

Choose a reason for hiding this comment

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

UITextField+Extension 파일을 민재랑 내가 동시에 만들어서 내가 삭제해줘서 그런거 같네요1

Copy link
Member Author

Choose a reason for hiding this comment

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

아하... 글면 괜찮을거 같슴다..!

F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; };
F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; };
F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */; };
Expand Down Expand Up @@ -152,10 +159,18 @@
39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = "<group>"; };
4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = "<group>"; };
77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupCollectionViewCell.swift; sourceTree = "<group>"; };
77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupCollectionViewCell.xib; sourceTree = "<group>"; };
7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardInGroupCollectionViewCell.swift; sourceTree = "<group>"; };
7766A40E274FEBE200714912 /* CardInGroupCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardInGroupCollectionViewCell.xib; sourceTree = "<group>"; };
77703156275005AA002CBD19 /* CardResultBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardResultBottomSheetViewController.swift; sourceTree = "<group>"; };
7770315827500C49002CBD19 /* QRScan.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = QRScan.storyboard; sourceTree = "<group>"; };
7770315A27500C7B002CBD19 /* QRScanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRScanViewController.swift; sourceTree = "<group>"; };
777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = "<group>"; };
777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = "<group>"; };
777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = "<group>"; };
77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardAddInGroupRequest.swift; sourceTree = "<group>"; };
77DFB870274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWithIdBottomSheetViewController.swift; sourceTree = "<group>"; };
7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = "<group>"; };
F81171FF27383097002742CF /* ChangeGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGroupRequest.swift; sourceTree = "<group>"; };
F81A6832274F49A700B80A4F /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -298,6 +313,7 @@
isa = PBXGroup;
children = (
3958F238270FFBBF00B100B2 /* GroupViewController.swift */,
7770315A27500C7B002CBD19 /* QRScanViewController.swift */,
);
path = Group;
sourceTree = "<group>";
Expand All @@ -307,6 +323,7 @@
children = (
3958F23B270FFBD500B100B2 /* Group.storyboard */,
3936993A274A53C600684420 /* GroupEdit.storyboard */,
7770315827500C49002CBD19 /* QRScan.storyboard */,
);
path = Group;
sourceTree = "<group>";
Expand Down Expand Up @@ -356,7 +373,9 @@
isa = PBXGroup;
children = (
39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */,
77DFB870274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift */,
398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */,
77703156275005AA002CBD19 /* CardResultBottomSheetViewController.swift */,
);
path = BottomSheet;
sourceTree = "<group>";
Expand All @@ -381,6 +400,17 @@
name = Frameworks;
sourceTree = "<group>";
};
77607ED7274A689300204CD2 /* GroupCell */ = {
isa = PBXGroup;
children = (
77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */,
77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */,
7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */,
7766A40E274FEBE200714912 /* CardInGroupCollectionViewCell.xib */,
);
path = GroupCell;
sourceTree = "<group>";
};
777FF89927359B1000BF69D3 /* Group */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -603,6 +633,7 @@
isa = PBXGroup;
children = (
3936993F274A565E00684420 /* GroupEdit */,
77607ED7274A689300204CD2 /* GroupCell */,
392F7FB1274621CF008CDBF5 /* MoreList */,
F84BAFA126FDB4E5004CA335 /* CreationCard */,
39523E582701A47400536900 /* CardList */,
Expand Down Expand Up @@ -777,6 +808,7 @@
files = (
F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */,
F85711A7274A6B3400F59F0B /* CardCreationPreview.storyboard in Resources */,
77607EDB274A68BE00204CD2 /* GroupCollectionViewCell.xib in Resources */,
39369936274A4FCB00684420 /* NotoSansCJKkr-Regular.otf in Resources */,
39369935274A4FCB00684420 /* NotoSansCJKkr-Bold.otf in Resources */,
39D88B622745FBA900A72164 /* More.storyboard in Resources */,
Expand All @@ -791,6 +823,7 @@
F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */,
3936993B274A53C600684420 /* GroupEdit.storyboard in Resources */,
39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */,
7766A410274FEBE200714912 /* CardInGroupCollectionViewCell.xib in Resources */,
39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */,
F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */,
F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */,
Expand All @@ -801,6 +834,7 @@
F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */,
39369937274A4FCB00684420 /* NotoSansCJKkr-Medium.otf in Resources */,
392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */,
7770315927500C49002CBD19 /* QRScan.storyboard in Resources */,
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -877,6 +911,7 @@
F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */,
F8C83FBD272F9F430009DF0D /* GenericResponse.swift in Sources */,
398413B7274A7A1E005550BC /* AddGroupBottomSheetViewController.swift in Sources */,
77DFB871274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift in Sources */,
39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */,
F8C83FB6272F9E380009DF0D /* UtilService.swift in Sources */,
3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */,
Expand All @@ -902,6 +937,7 @@
F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */,
F8C83FC7272FA2A20009DF0D /* CardService.swift in Sources */,
39D88B662745FE5F00A72164 /* TabBarViewController.swift in Sources */,
77607EDA274A68BE00204CD2 /* GroupCollectionViewCell.swift in Sources */,
F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */,
39D88B5F2745FB7E00A72164 /* MoreViewController.swift in Sources */,
F8FC43B326C020B90033E151 /* BackCardCreationDelegate.swift in Sources */,
Expand All @@ -910,6 +946,7 @@
F8FC43B526C020C10033E151 /* TempViews.swift in Sources */,
F8C83FBB272F9F370009DF0D /* NetworkResult.swift in Sources */,
39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */,
7770315B27500C7B002CBD19 /* QRScanViewController.swift in Sources */,
39523E5B2701A48900536900 /* CardListTableViewCell.swift in Sources */,
F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */,
3981148E273BEBB300E28630 /* CardListEditRequest.swift in Sources */,
Expand All @@ -922,12 +959,14 @@
39811490273BEBCE00E28630 /* CardListRequest.swift in Sources */,
F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */,
7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */,
F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */,
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */,
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */,
3936993E274A53E000684420 /* GroupEditViewController.swift in Sources */,
F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */,
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */,
77703157275005AA002CBD19 /* CardResultBottomSheetViewController.swift in Sources */,
39D13565273FDB9C00B1A148 /* User.swift in Sources */,
F822E7A92709CEB60020452C /* Notification.swift in Sources */,
F8C83FC5272FA2940009DF0D /* CardAPI.swift in Sources */,
Expand Down
1 change: 1 addition & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ extension Const {
static let front = "Front"
static let group = "Group"
static let groupEdit = "GroupEdit"
static let qrScan = "QRScan"
static let tabBar = "TabBar"
static let cardCreationPreview = "CardCreationPreview"
static let more = "More"
Expand Down
1 change: 1 addition & 0 deletions NADA-iOS-forRelease/Resouces/Constants/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ extension Const {
static let frontViewController = "FrontViewController"
static let groupViewController = "GroupViewController"
static let groupEditViewController = "GroupEditViewController"
static let qrScanViewController = "QRScanViewController"
Copy link
Member

Choose a reason for hiding this comment

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

바텀시트도 Constants에 같이 추가해두면 좋을 것 같습니다 선배님!

Copy link
Member Author

Choose a reason for hiding this comment

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

오우 굿포인트 지금 바로 추가할게여!!!

static let tabBarViewController = "TabBarViewController"
static let commonBottomSheetViewController = "CommonBottomSheetViewController"
static let cardCreationPreviewViewController = "CardCreationPreviewViewController"
Expand Down
2 changes: 2 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Xib.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ extension Const {
static let frontCardCell = "FrontCardCell"
static let backCardCell = "BackCardCell"
static let backgroundCollectionViewCell = "BackgroundCollectionViewCell"
static let groupCollectionViewCell = "GroupCollectionViewCell"
static let cardInGroupCollectionViewCell = "CardInGroupCollectionViewCell"
static let groupEditTableViewCell = "GroupEditTableViewCell"
static let moreListTableViewCell = "MoreListTableViewCell"
}
Expand Down
Loading