From 9f17faa85a1a2c161646532e777880a282723a52 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Thu, 23 Dec 2021 02:37:59 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FEAT]=20#201=20-=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EB=B7=B0=20userId=20Const=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20Con?= =?UTF-8?q?st=20=EC=97=90=20=EC=9E=88=EB=8A=94=20userId=20nada2=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift | 3 ++- .../Sources/ViewControllers/Group/GroupViewController.swift | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift index f0628d1d..e138bc02 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift @@ -12,6 +12,7 @@ extension Const { static let darkModeState = "darkModeState" static let accessToken = "accessToken" static let refreshToken = "refreshToken" - static let userID = "userID" +// static let userID = "userID" + static let userID = "nada2" } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 0e031522..f33c6d2e 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -88,7 +88,7 @@ class GroupViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { // 그룹 리스트 조회 서버 테스트 - groupListFetchWithAPI(userID: "nada2") + groupListFetchWithAPI(userID: Const.UserDefaults.userID) } } @@ -122,8 +122,8 @@ 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: Const.UserDefaults.userID, groupId: group.groups[0].groupID, offset: 0)) +// self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: "nada2", groupId: group.groups[0].groupID, offset: 0)) + self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: Const.UserDefaults.userID, groupId: group.groups[0].groupID, offset: 0)) } } case .requestErr(let message): From c9700c3c8a25d893ef02acb2b128d1dff4e38e0d Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Thu, 23 Dec 2021 02:58:19 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FEAT]=20#201=20-=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=EB=A1=9C=20=EA=B2=80=EC=83=89=20=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=EC=97=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddWithIdBottomSheetViewController.swift | 44 ++++++++++++++++++- .../CardResultBottomSheetViewController.swift | 8 ++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index b313a4ca..9b0fdd86 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -97,7 +97,49 @@ extension AddWithIdBottomSheetViewController { func textFieldShouldReturn(_ textField: UITextField) -> Bool { textField.resignFirstResponder() // 서버 연결과 더불어... 검색 결과가 없으면 bottomsheet dismiss 하지 말고 hidden 풀어주기 - hideBottomSheetAndPresent(nextBottomSheet: CardResultBottomSheetViewController(), title: "이채연", height: 574) + cardDetailFetchWithAPI(cardID: textField.text ?? "") return true } } + +extension AddWithIdBottomSheetViewController { + func cardDetailFetchWithAPI(cardID: String) { + CardAPI.shared.cardDetailFetch(cardID: cardID) { response in + switch response { + case .success(let data): + if let card = data as? CardClass { + let nextVC = CardResultBottomSheetViewController() + nextVC.cardDataModel = Card(cardID: card.card.cardID, + background: card.card.background, + title: card.card.title, + name: card.card.name, + birthDate: card.card.birthDate, + mbti: card.card.mbti, + instagram: card.card.instagram, + link: card.card.link, + cardDescription: card.card.cardDescription, + isMincho: card.card.isMincho, + isSoju: card.card.isSoju, + isBoomuk: card.card.isBoomuk, + isSauced: card.card.isSauced, + oneTmi: card.card.oneTmi, + twoTmi: card.card.twoTmi, + threeTmi: card.card.threeTmi) + self.hideBottomSheetAndPresent(nextBottomSheet: nextVC, title: card.card.name, height: 574) + } + case .requestErr(let message): + print("cardDetailFetchWithAPI - requestErr: \(message)") + self.errorImageView.isHidden = false + self.explainLabel.isHidden = false + case .pathErr: + print("cardDetailFetchWithAPI - pathErr") + case .serverErr: + print("cardDetailFetchWithAPI - serverErr") + case .networkFail: + print("cardDetailFetchWithAPI - networkFail") + } + } + } +} + + diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift index f814a09e..17a50461 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift @@ -11,16 +11,17 @@ import IQKeyboardManagerSwift class CardResultBottomSheetViewController: CommonBottomSheetViewController { // MARK: - Properties + var cardDataModel: Card? + private let groupLabel: UILabel = { let label = UILabel() - label.text = "어쩌구 동아리 명함" label.textColor = .secondary label.font = .textRegular03 return label }() - private let cardView: UIView = { + private let cardView: CardView = { let view = CardView() return view }() @@ -46,6 +47,8 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController { view.addSubview(cardView) view.addSubview(addButton) setupLayout() + + groupLabel.text = cardDataModel?.cardDescription } // 레이아웃 세팅 @@ -77,7 +80,6 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController { let nextVC = SelectGroupBottomSheetViewController() nextVC.status = .add hideBottomSheetAndPresent(nextBottomSheet: nextVC, title: "그룹선택", height: 386) - print("next bottomsheet") } } From 3a9cc8c9bc8f9bd1a8cf05511c8912cd0318ee7c Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Thu, 23 Dec 2021 03:10:36 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FEAT]=20#201=20-=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20cardView=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardResultBottomSheetViewController.swift | 19 +++++++++++++++++ .../Sources/Views/CardView.swift | 3 +++ .../Sources/Views/CardView.xib | 21 ++++++++++++------- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift index 17a50461..15dac8fd 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift @@ -49,6 +49,25 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController { setupLayout() groupLabel.text = cardDataModel?.cardDescription + setCardView() + } + + private func setCardView() { + cardView.backgroundImageView.updateServerImage(cardDataModel?.background ?? "") + cardView.titleLabel.text = cardDataModel?.title ?? "" + cardView.descriptionLabel.text = cardDataModel?.cardDescription ?? "" + cardView.userNameLabel.text = cardDataModel?.name ?? "" + cardView.birthLabel.text = cardDataModel?.birthDate ?? "" + cardView.mbtiLabel.text = cardDataModel?.mbti ?? "" + cardView.instagramIDLabel.text = cardDataModel?.instagram ?? "" + cardView.lineURLLabel.text = cardDataModel?.link ?? "" + + if cardDataModel?.instagram == ""{ + cardView.instagramIcon.isHidden = true + } + if cardDataModel?.link == ""{ + cardView.urlIcon.isHidden = true + } } // 레이아웃 세팅 diff --git a/NADA-iOS-forRelease/Sources/Views/CardView.swift b/NADA-iOS-forRelease/Sources/Views/CardView.swift index 3b9e05f4..35ff0732 100644 --- a/NADA-iOS-forRelease/Sources/Views/CardView.swift +++ b/NADA-iOS-forRelease/Sources/Views/CardView.swift @@ -19,6 +19,9 @@ class CardView: UIView { @IBOutlet weak var instagramIDLabel: UILabel! @IBOutlet weak var lineURLLabel: UILabel! + @IBOutlet weak var instagramIcon: UIImageView! + @IBOutlet weak var urlIcon: UIImageView! + override init(frame: CGRect) { super.init(frame: frame) xibSetup() diff --git a/NADA-iOS-forRelease/Sources/Views/CardView.xib b/NADA-iOS-forRelease/Sources/Views/CardView.xib index ca300bf7..25126881 100644 --- a/NADA-iOS-forRelease/Sources/Views/CardView.xib +++ b/NADA-iOS-forRelease/Sources/Views/CardView.xib @@ -21,9 +21,11 @@ + + @@ -34,39 +36,44 @@ + + + + +