From 80997749d970a1788db2a22e233ff11f7a4e494e Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sat, 25 Dec 2021 15:55:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[FEAT]=20#219=20-=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EC=88=98=EC=A0=95=20=EC=84=9C=EB=B2=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SelectGroupBottomSheetViewController.swift | 30 +++++++++++++++++-- .../CardCreationViewController.swift | 17 ----------- .../CardDetail/CardDetailViewController.swift | 4 +++ .../Group/GroupViewController.swift | 12 +++++--- 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index 41333c81..7106703b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -13,6 +13,7 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { var cardDataModel: Card? var serverGroups: Groups? var selectedGroup = 0 + var groupId: Int? enum Status { case detail case add @@ -74,8 +75,12 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { @objc func presentCardInfoViewController() { switch status { case .detail: - // TODO: 그룹 변경 서버통신 - hideBottomSheetAndGoBack() + // 그룹 변경 서버통신 + print(selectedGroup) + changeGroupWithAPI(request: ChangeGroupRequest(cardID: cardDataModel?.cardID ?? "", + userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", + groupID: groupId ?? 0, + newGroupID: selectedGroup)) case .add: print(selectedGroup) // 그룹 속 명함 추가 테스트 @@ -132,6 +137,8 @@ extension SelectGroupBottomSheetViewController { guard let nextVC = UIStoryboard.init(name: Const.Storyboard.Name.cardDetail, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardDetailViewController) as? CardDetailViewController else { return } nextVC.status = .add nextVC.cardDataModel = self.cardDataModel + nextVC.groupId = self.groupId + nextVC.serverGroups = self.serverGroups self.hideBottomSheetAndPresentVC(nextViewController: nextVC) case .requestErr(let message): print("postCardAddInGroupWithAPI - requestErr", message) @@ -145,4 +152,23 @@ extension SelectGroupBottomSheetViewController { } } } + + func changeGroupWithAPI(request: ChangeGroupRequest) { + GroupAPI.shared.changeCardGroup(request: request) { response in + switch response { + case .success: + print("changeGroupWithAPI - success") + self.hideBottomSheetAndGoBack() + // TODO: 그룹 뷰로 한번 더 pop 되게 + case .requestErr(let message): + print("changeGroupWithAPI - requestErr: \(message)") + case .pathErr: + print("changeGroupWithAPI - pathErr") + case .serverErr: + print("changeGroupWithAPI - serverErr") + case .networkFail: + print("changeGroupWithAPI - networkFail") + } + } + } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index aa5b731a..6f08d2e6 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -244,23 +244,6 @@ extension CardCreationViewController { // } // } - // TODO: - group 서버통신. 위치변경. -// func changeGroupWithAPI(request: ChangeGroupRequest) { -// GroupAPI.shared.changeCardGroup(request: request) { response in -// switch response { -// case .success: -// print("changeGroupWithAPI - success") -// case .requestErr(let message): -// print("changeGroupWithAPI - requestErr: \(message)") -// case .pathErr: -// print("changeGroupWithAPI - pathErr") -// case .serverErr: -// print("changeGroupWithAPI - serverErr") -// case .networkFail: -// print("changeGroupWithAPI - networkFail") -// } -// } -// } // TODO: - group 서버통신. 위치변경. // func cardDeleteInGroupWithAPI(groupID: Int, cardID: String) { // GroupAPI.shared.cardDeleteInGroup(groupID: groupID, cardID: cardID) { response in diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index 26dc4d2b..fef8f39a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -44,6 +44,7 @@ class CardDetailViewController: UIViewController { private var isFront = true var status: Status = .group + var serverGroups: Groups? var groupId: Int? override func viewDidLoad() { @@ -94,6 +95,9 @@ extension CardDetailViewController { .setTitle("그룹선택") .setHeight(386) nextVC.status = .detail + nextVC.groupId = self.groupId + nextVC.serverGroups = self.serverGroups + nextVC.cardDataModel = self.cardDataModel nextVC.modalPresentationStyle = .overFullScreen self.present(nextVC, animated: false, completion: nil) }) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index f2dacc1e..6b6e281b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -73,7 +73,8 @@ class GroupViewController: UIViewController { // 그룹 삭제 서버 테스트 // groupDeleteWithAPI(groupID: 1) // 그룹 추가 서버 테스트 -// groupAddWithAPI(groupRequest: GroupAddRequest(userId: "nada2", groupName: "대학교")) +// groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", +// groupName: "대학교")) // 그룹 수정 서버 테스트 // groupEditWithAPI(groupRequest: GroupEditRequest(groupId: 5, groupName: "수정나다")) // 그룹 속 명함 조회 테스트 @@ -85,7 +86,7 @@ class GroupViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { // 그룹 리스트 조회 서버 테스트 -// groupListFetchWithAPI(userID: UserConst.UserDefaults.userID) + print("viewWillAppear") groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") } @@ -121,7 +122,6 @@ extension GroupViewController { self.groupCollectionView.reloadData() self.groupId = group.groups[0].groupID if !group.groups.isEmpty { -// self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: "nada2", groupId: group.groups[0].groupID, offset: 0)) self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: group.groups[0].groupID, offset: 0)) } } @@ -237,6 +237,7 @@ extension GroupViewController { twoTmi: card.card.twoTmi, threeTmi: card.card.threeTmi) nextVC.groupId = self.groupId + nextVC.serverGroups = self.serverGroups self.navigationController?.pushViewController(nextVC, animated: true) } case .requestErr(let message): @@ -315,7 +316,10 @@ extension GroupViewController: UICollectionViewDataSource { switch collectionView { case groupCollectionView: groupId = serverGroups?.groups[indexPath.row].groupID - cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: "nada2", groupId: serverGroups?.groups[indexPath.row].groupID ?? 0, offset: 0)) + cardListInGroupWithAPI(cardListInGroupRequest: + CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", + groupId: serverGroups?.groups[indexPath.row].groupID ?? 0, + offset: 0)) case cardsCollectionView: cardDetailFetchWithAPI(cardID: serverCards?.cards[indexPath.row].cardID ?? "") default: From f10045dfe7e70f797f3582c195770ad2cf4b127f Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sat, 25 Dec 2021 16:12:32 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[FEAT]=20#219=20-=20selectedRow=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Group/GroupViewController.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 6b6e281b..8d5937e3 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -66,6 +66,8 @@ class GroupViewController: UIViewController { var serverCardsWithBack: Card? var groupId: Int? + var selectedRow = 0 + override func viewDidLoad() { super.viewDidLoad() registerCell() @@ -120,9 +122,9 @@ extension GroupViewController { if let group = data as? Groups { self.serverGroups = group self.groupCollectionView.reloadData() - self.groupId = group.groups[0].groupID + self.groupId = group.groups[self.selectedRow].groupID if !group.groups.isEmpty { - self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: group.groups[0].groupID, offset: 0)) + self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: group.groups[self.selectedRow].groupID, offset: 0)) } } case .requestErr(let message): @@ -280,7 +282,7 @@ extension GroupViewController: UICollectionViewDataSource { groupCell.groupName.text = serverGroups?.groups[indexPath.row].groupName - if indexPath.row == 0 { + if indexPath.row == selectedRow { collectionView.selectItem(at: indexPath, animated: true, scrollPosition: .init()) } return groupCell @@ -315,6 +317,7 @@ extension GroupViewController: UICollectionViewDataSource { func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { switch collectionView { case groupCollectionView: + selectedRow = indexPath.row groupId = serverGroups?.groups[indexPath.row].groupID cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", From 66b474c987b6963453537774e81fdb0aa98cb06b Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sat, 25 Dec 2021 16:47:33 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[FEAT]=20#219=20-=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/SelectGroupBottomSheetViewController.swift | 1 - .../Sources/ViewControllers/Group/GroupViewController.swift | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index 7106703b..745e4df1 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -159,7 +159,6 @@ extension SelectGroupBottomSheetViewController { case .success: print("changeGroupWithAPI - success") self.hideBottomSheetAndGoBack() - // TODO: 그룹 뷰로 한번 더 pop 되게 case .requestErr(let message): print("changeGroupWithAPI - requestErr: \(message)") case .pathErr: diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 8d5937e3..b10b77e1 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -76,7 +76,7 @@ class GroupViewController: UIViewController { // groupDeleteWithAPI(groupID: 1) // 그룹 추가 서버 테스트 // groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", -// groupName: "대학교")) +// groupName: "SOPT")) // 그룹 수정 서버 테스트 // groupEditWithAPI(groupRequest: GroupEditRequest(groupId: 5, groupName: "수정나다")) // 그룹 속 명함 조회 테스트 From 5806d7cb6844bde19c914c8267298cfcabeff56b Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sat, 25 Dec 2021 17:18:38 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FEAT]=20#219=20-=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=B9=B4=EB=93=9C=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EC=8B=9C=20=EA=B7=B8=20=EA=B7=B8=EB=A3=B9=EC=9D=98=20?= =?UTF-8?q?=EB=B7=B0=EB=A1=9C=20=EB=8F=8C=EC=95=84=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Resouces/Constants/Notification.swift | 1 + .../BottomSheet/SelectGroupBottomSheetViewController.swift | 4 ++++ .../Sources/ViewControllers/Group/GroupViewController.swift | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift index fe6829fc..1d158fde 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift @@ -16,4 +16,5 @@ extension Notification.Name { static let dismissRequiredBottomSheet = Notification.Name("dismissRequiredBottomSheet") static let cancelImagePicker = Notification.Name("cancelImagePicker") static let presentCardShare = Notification.Name("presentCardShare") + static let passDataToGroup = Notification.Name("passDataToGroup") } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index 745e4df1..f8726af4 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -13,6 +13,7 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { var cardDataModel: Card? var serverGroups: Groups? var selectedGroup = 0 + var selectedGroupIndex = 0 var groupId: Int? enum Status { case detail @@ -117,6 +118,7 @@ extension SelectGroupBottomSheetViewController: UIPickerViewDelegate, UIPickerVi func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { selectedGroup = serverGroups?.groups[row].groupID ?? 0 + selectedGroupIndex = row pickerView.reloadAllComponents() } @@ -139,6 +141,7 @@ extension SelectGroupBottomSheetViewController { nextVC.cardDataModel = self.cardDataModel nextVC.groupId = self.groupId nextVC.serverGroups = self.serverGroups + NotificationCenter.default.post(name: Notification.Name.passDataToGroup, object: self.selectedGroupIndex, userInfo: nil) self.hideBottomSheetAndPresentVC(nextViewController: nextVC) case .requestErr(let message): print("postCardAddInGroupWithAPI - requestErr", message) @@ -158,6 +161,7 @@ extension SelectGroupBottomSheetViewController { switch response { case .success: print("changeGroupWithAPI - success") + NotificationCenter.default.post(name: Notification.Name.passDataToGroup, object: self.selectedGroupIndex, userInfo: nil) self.hideBottomSheetAndGoBack() case .requestErr(let message): print("changeGroupWithAPI - requestErr: \(message)") diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index b10b77e1..648ad438 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -88,6 +88,7 @@ class GroupViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { // 그룹 리스트 조회 서버 테스트 + NotificationCenter.default.addObserver(self, selector: #selector(didRecieveDataNotification(_:)), name: Notification.Name.passDataToGroup, object: nil) print("viewWillAppear") groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") @@ -110,6 +111,10 @@ extension GroupViewController { emptyView.isHidden = true navigationController?.navigationBar.isHidden = true } + + @objc func didRecieveDataNotification(_ notification: Notification) { + selectedRow = notification.object as? Int ?? 0 + } } // MARK: - Network From 09d5e7f7548527939108e9ef38c74c6a11d3db62 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 01:32:10 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[FEAT]=20#219=20-=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20=EB=B3=80=EA=B2=BD=ED=9B=84=20?= =?UTF-8?q?=EC=9E=AC=EB=B3=80=EA=B2=BD=EC=8B=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Resouces/Constants/Notification.swift | 1 + .../SelectGroupBottomSheetViewController.swift | 8 ++------ .../CardDetail/CardDetailViewController.swift | 7 +++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift index 1d158fde..2ef63808 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift @@ -17,4 +17,5 @@ extension Notification.Name { static let cancelImagePicker = Notification.Name("cancelImagePicker") static let presentCardShare = Notification.Name("presentCardShare") static let passDataToGroup = Notification.Name("passDataToGroup") + static let passDataToDetail = Notification.Name("passDataToDetail") } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index f8726af4..98d80f74 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -76,15 +76,11 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { @objc func presentCardInfoViewController() { switch status { case .detail: - // 그룹 변경 서버통신 - print(selectedGroup) changeGroupWithAPI(request: ChangeGroupRequest(cardID: cardDataModel?.cardID ?? "", userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupID: groupId ?? 0, newGroupID: selectedGroup)) case .add: - print(selectedGroup) -// 그룹 속 명함 추가 테스트 cardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: cardDataModel?.cardID ?? "", userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: selectedGroup)) @@ -139,7 +135,7 @@ extension SelectGroupBottomSheetViewController { guard let nextVC = UIStoryboard.init(name: Const.Storyboard.Name.cardDetail, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardDetailViewController) as? CardDetailViewController else { return } nextVC.status = .add nextVC.cardDataModel = self.cardDataModel - nextVC.groupId = self.groupId + nextVC.groupId = self.selectedGroup nextVC.serverGroups = self.serverGroups NotificationCenter.default.post(name: Notification.Name.passDataToGroup, object: self.selectedGroupIndex, userInfo: nil) self.hideBottomSheetAndPresentVC(nextViewController: nextVC) @@ -160,8 +156,8 @@ extension SelectGroupBottomSheetViewController { GroupAPI.shared.changeCardGroup(request: request) { response in switch response { case .success: - print("changeGroupWithAPI - success") NotificationCenter.default.post(name: Notification.Name.passDataToGroup, object: self.selectedGroupIndex, userInfo: nil) + NotificationCenter.default.post(name: Notification.Name.passDataToDetail, object: self.selectedGroup, userInfo: nil) self.hideBottomSheetAndGoBack() case .requestErr(let message): print("changeGroupWithAPI - requestErr: \(message)") diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index fef8f39a..3458d668 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -55,6 +55,9 @@ class CardDetailViewController: UIViewController { setGestureRecognizer() } + override func viewWillAppear(_ animated: Bool) { + NotificationCenter.default.addObserver(self, selector: #selector(didRecieveDataNotification(_:)), name: Notification.Name.passDataToDetail, object: nil) + } } extension CardDetailViewController { @@ -146,6 +149,10 @@ extension CardDetailViewController { // MARK: - @objc Methods + @objc func didRecieveDataNotification(_ notification: Notification) { + groupId = notification.object as? Int ?? 0 + } + @objc private func transitionCardWithAnimation(_ swipeGesture: UISwipeGestureRecognizer) { if isFront {