From fb56a39f7df5e9572242026fbc791c3763741f2a Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Wed, 29 Dec 2021 21:22:40 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[FEAT]=20#218=20-=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=EB=A1=9C=20=EB=AA=85=ED=95=A8=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EC=8B=A4=ED=8C=A8=EC=8B=9C=20=ED=82=A4=EB=B3=B4=EB=93=9C?= =?UTF-8?q?=EA=B0=80=20=EB=82=B4=EB=A0=A4=EA=B0=80=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EA=B2=8C=20=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/AddWithIdBottomSheetViewController.swift | 3 +-- .../BottomSheet/CommonBottomSheetViewController.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index 07e9fa75..0b949b46 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -94,8 +94,6 @@ class AddWithIdBottomSheetViewController: CommonBottomSheetViewController, UITex extension AddWithIdBottomSheetViewController { func textFieldShouldReturn(_ textField: UITextField) -> Bool { - textField.resignFirstResponder() - // 서버 연결과 더불어... 검색 결과가 없으면 bottomsheet dismiss 하지 말고 hidden 풀어주기 cardDetailFetchWithAPI(cardID: textField.text ?? "") return true } @@ -112,6 +110,7 @@ extension AddWithIdBottomSheetViewController { self.explainLabel.isHidden = false self.explainLabel.text = "자신의 명함은 추가할 수 없습니다." } else { + self.addWithIdTextField.resignFirstResponder() let nextVC = CardResultBottomSheetViewController() nextVC.cardDataModel = card.card self.hideBottomSheetAndPresent(nextBottomSheet: nextVC, title: card.card.name, height: 574) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift index cbb1124e..00df43d9 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift @@ -227,7 +227,7 @@ class CommonBottomSheetViewController: UIViewController { guard let presentingVC = self.presentingViewController else { return } self.dismiss(animated: false) { let nextVC = nextViewController - nextVC.modalPresentationStyle = .overFullScreen + nextVC.modalPresentationStyle = .fullScreen presentingVC.present(nextVC, animated: true, completion: nil) } } From fd4c2e9f50db619fb52e0cc5c138b56283e88f05 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Wed, 29 Dec 2021 22:04:16 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[FEAT]=20#218=20-=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EA=B0=84=EA=B2=A9=20=EC=82=B4=EB=A6=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Group/GroupViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 4cc0b675..46103d57 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -301,6 +301,8 @@ extension GroupViewController: UICollectionViewDelegateFlowLayout { } func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { switch collectionView { + case groupCollectionView: + return 5 case cardsCollectionView: return collectionView.frame.size.width * 15/327 default: From 4f95f2eabdd3a6fcf138ddbbbafb4c5501adf312 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Wed, 29 Dec 2021 22:13:58 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[FEAT]=20#218=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=ED=9B=84=20Alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/SelectGroupBottomSheetViewController.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index 792a400a..22142700 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -156,7 +156,9 @@ extension SelectGroupBottomSheetViewController { case .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() + self.makeOKAlert(title: "", message: "그룹이 변경되었습니다.") { _ in + self.hideBottomSheetAndGoBack() + } case .requestErr(let message): print("changeGroupWithAPI - requestErr: \(message)") case .pathErr: From 43fea5f5243ccd4a24eac9285f4c2dc64004f1c5 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Wed, 29 Dec 2021 22:21:00 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[FEAT]=20#218=20-=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=95=84=EC=9D=B4=EB=94=94=20=ED=9E=88?= =?UTF-8?q?=EB=93=A0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resouces/Storyboards/CardDetail/CardDetail.storyboard | 1 + .../ViewControllers/CardDetail/CardDetailViewController.swift | 2 ++ 2 files changed, 3 insertions(+) diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardDetail.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardDetail.storyboard index e35791ed..514d9dca 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardDetail.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardDetail.storyboard @@ -119,6 +119,7 @@ + diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index 56891226..32fd6692 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -34,6 +34,7 @@ class CardDetailViewController: UIViewController { @IBOutlet weak var optionButton: UIButton! @IBOutlet weak var cardView: UIView! @IBOutlet weak var backButton: UIButton! + @IBOutlet weak var idStackView: UIStackView! @IBOutlet weak var idLabel: UILabel! public var cardDataModel: Card? @@ -110,6 +111,7 @@ extension CardDetailViewController { case .detail: return } + idStackView.isHidden = true idLabel.text = cardDataModel?.cardID } private func setMenu() { From bdaa8bee4221e66c013b21422689d14623435358 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Thu, 30 Dec 2021 00:53:31 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[CHORE]=20#218=20-=20=EB=94=94=EC=8A=A4?= =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Info.plist b/NADA-iOS-forRelease/Info.plist index b6f037de..7c166ada 100644 --- a/NADA-iOS-forRelease/Info.plist +++ b/NADA-iOS-forRelease/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - NADA + 나다 NADA CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier From f51b8f159b0dcfda7e27b24432b18fe170d3e504 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Thu, 30 Dec 2021 01:15:03 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[FEAT]=20#218=20-=20commonBottomSheet=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20overFullScreen=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BottomSheet/CommonBottomSheetViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift index 00df43d9..cbb1124e 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift @@ -227,7 +227,7 @@ class CommonBottomSheetViewController: UIViewController { guard let presentingVC = self.presentingViewController else { return } self.dismiss(animated: false) { let nextVC = nextViewController - nextVC.modalPresentationStyle = .fullScreen + nextVC.modalPresentationStyle = .overFullScreen presentingVC.present(nextVC, animated: true, completion: nil) } }