From 0107fca01fa492a382f2ec64639891169eaea3f9 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 04:16:50 +0900 Subject: [PATCH 01/11] =?UTF-8?q?[FEAT]=20#223=20-=20QR=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 8 +- .../Sources/Classes/QRCodeView.swift | 77 +++++++++++++++++++ .../Sources/Classes/TempClass.swift | 8 -- .../AddWithIdBottomSheetViewController.swift | 1 - .../CardShareBottomSheetViewController.swift | 20 +++-- 5 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift delete mode 100644 NADA-iOS-forRelease/Sources/Classes/TempClass.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index ad6eb082..79489156 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -68,6 +68,7 @@ 7713E8482752E2A900724C8B /* SelectGroupBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7713E8472752E2A900724C8B /* SelectGroupBottomSheetViewController.swift */; }; 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; 7734D5AA27719520004360E4 /* CardShareBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */; }; + 7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B527779EF0004360E4 /* QRCodeView.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 */; }; @@ -134,7 +135,6 @@ F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC438726C01CDD0033E151 /* SceneDelegate.swift */; }; F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8FC438E26C01CDE0033E151 /* Assets.xcassets */; }; F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8FC439026C01CDE0033E151 /* LaunchScreen.storyboard */; }; - F8FC43AD26C020940033E151 /* TempClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43AC26C020940033E151 /* TempClass.swift */; }; F8FC43B326C020B90033E151 /* BackCardCreationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43B226C020B90033E151 /* BackCardCreationDelegate.swift */; }; F8FC43B826C0227D0033E151 /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43B726C0227D0033E151 /* Const.swift */; }; F8FC43BA26C022900033E151 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8FC43B926C022900033E151 /* ViewController.swift */; }; @@ -207,6 +207,7 @@ 7713E8472752E2A900724C8B /* SelectGroupBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectGroupBottomSheetViewController.swift; sourceTree = ""; }; 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = ""; }; 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardShareBottomSheetViewController.swift; sourceTree = ""; }; + 7734D5B527779EF0004360E4 /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = ""; }; 77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupCollectionViewCell.swift; sourceTree = ""; }; 77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupCollectionViewCell.xib; sourceTree = ""; }; 7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardInGroupCollectionViewCell.swift; sourceTree = ""; }; @@ -275,7 +276,6 @@ F8FC438E26C01CDE0033E151 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; F8FC439126C01CDE0033E151 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; F8FC439326C01CDE0033E151 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - F8FC43AC26C020940033E151 /* TempClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempClass.swift; sourceTree = ""; }; F8FC43B226C020B90033E151 /* BackCardCreationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCreationDelegate.swift; sourceTree = ""; }; F8FC43B726C0227D0033E151 /* Const.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = ""; }; F8FC43B926C022900033E151 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -825,7 +825,7 @@ F8FC439C26C01EC90033E151 /* Classes */ = { isa = PBXGroup; children = ( - F8FC43AC26C020940033E151 /* TempClass.swift */, + 7734D5B527779EF0004360E4 /* QRCodeView.swift */, ); path = Classes; sourceTree = ""; @@ -1161,12 +1161,12 @@ 397B751A2763B5F1004AEB03 /* TeamNADAViewController.swift in Sources */, 3981148E273BEBB300E28630 /* CardListEditRequest.swift in Sources */, 39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */, + 7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */, 3918F66727719C4B00984648 /* UserTokenReissueRequset.swift in Sources */, 7705CF3E2752C7DB005195DF /* CardView.swift in Sources */, F8FC43BA26C022900033E151 /* ViewController.swift in Sources */, 39523E5F2701AA9000536900 /* CardListDataModel.swift in Sources */, 39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */, - F8FC43AD26C020940033E151 /* TempClass.swift in Sources */, F84BAFB126FDB552004CA335 /* BackCardCreationCollectionViewCell.swift in Sources */, 39811490273BEBCE00E28630 /* CardListRequest.swift in Sources */, F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift b/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift new file mode 100644 index 00000000..f6040e71 --- /dev/null +++ b/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift @@ -0,0 +1,77 @@ +// +// QRCodeView.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/12/26. +// + +import Foundation +import UIKit + +class QRCodeView: UIView { + + // ✅ CIQRCodeGenerator : QR code 생성 필터를 식별하기 위한 속성. + var filter = CIFilter(name: "CIQRCodeGenerator") + + // ✅ QRCode CIImage 를 만들어서 추가할 UIImageView. + var imageView = UIImageView() + + override init(frame: CGRect) { + super.init(frame: frame) + addSubview(imageView) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func layoutSubviews() { + super.layoutSubviews() + imageView.frame = bounds + } + + // ✅ QRCode 이미지를 만들 때 다양한 색으로 만들 수 있도록 parameter 를 받았다. + func generateCode(_ string: String, foregroundColor: UIColor = .black, backgroundColor: UIColor = .white) { + + // ✅ 주어진 인코딩을(=using) 사용해서 NSData 개체를 반환한다. + guard let filter = filter, let data = string.data(using: .isoLatin1, allowLossyConversion: false) else { + return + } + + // ✅ 두가지 파라미터 설정. + filter.setValue(data, forKey: "inputMessage") + filter.setValue("M", forKey: "inputCorrectionLevel") + + // ✅ .outputImage : 필터에 구성된 작업을 캡슐화하는 CIImage 개체이다. 즉, 결과물 + guard let ciImage = filter.outputImage else { + return + } + + // ❗️ 이렇게 끝내면 qr code 가 선명하지 않게 나온다. + //imageView.image = UIImage(ciImage: ciImage, scale: 2.0, orientation: .up) + + // ✅ 다음은 이미지 선명하게 변환하는 과정이다. + // ✅ 원래 이미지에 affine transform(by 파라미터를 의미.) 을 적용한 새 이미지를 반환. 이미지의 넓이와 높이를 10배 증가시킴. + let transformed = ciImage.transformed(by: CGAffineTransform.init(scaleX: 10, y: 10)) + + // ✅ 다음은 QR code 색 커스텀 설정하는 과정이다. 필터 생성하고 이미지 적용. + // ✅ CIColorInvert : 색상을 반전시키기 위한 필터이다. + let invertFilter = CIFilter(name: "CIColorInvert") + invertFilter?.setValue(transformed, forKey: kCIInputImageKey) + + // ✅ CIMaskToAlpha : grayscale 로 변환된 이미지를 alpha 로 마스킹된 흰색이미지로 변환. + let alphaFilter = CIFilter(name: "CIMaskToAlpha") + alphaFilter?.setValue(invertFilter?.outputImage, forKey: kCIInputImageKey) + + // ✅ 받은 파라미터로 imageView 의 속성을 설정. + if let ouputImage = alphaFilter?.outputImage { + imageView.tintColor = foregroundColor + imageView.backgroundColor = backgroundColor + + // ✅ withRenderingMode(.alwaysTemplate) : 원본 이미지의 컬러정보가 사라지고 불투명한 부분을 tintColor 로 설정. + imageView.image = UIImage(ciImage: ouputImage, scale: 2.0, orientation: .up).withRenderingMode(.alwaysTemplate) + } else { + return + } + } +} diff --git a/NADA-iOS-forRelease/Sources/Classes/TempClass.swift b/NADA-iOS-forRelease/Sources/Classes/TempClass.swift deleted file mode 100644 index 7f2424d8..00000000 --- a/NADA-iOS-forRelease/Sources/Classes/TempClass.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// TempClass.swift -// NADA-iOS-forRelease -// -// Created by kimhyungyu on 2021/08/08. -// - -import Foundation diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index 6a3a976a..bf1c8147 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -142,4 +142,3 @@ extension AddWithIdBottomSheetViewController { } } } - diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index df53bec1..7f1b3416 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -11,15 +11,12 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { // MARK: - Properties - var cardID: String? = "1D856A" var isShareable = false var cardDataModel: Card? private let qrImage: UIImageView = { - // 여기를 만든 QR이미지로 바꿔주시면 됩니당 let imageView = UIImageView() - imageView.image = UIImage(named: "qrCodeImg21") - + imageView.frame = CGRect(x: 0, y: 0, width: 160, height: 160) return imageView }() @@ -81,9 +78,10 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { view.addSubview(idStackView) view.addSubview(saveAsImageButton) - idLabel.text = cardID + idLabel.text = cardDataModel?.cardID ?? "" setupLayout() + setQRImage() } // 레이아웃 세팅 @@ -110,6 +108,16 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { ]) } + private func setQRImage() { + let frame = CGRect(origin: .zero, size: qrImage.frame.size) + print("TeamNADA\(cardDataModel?.cardID ?? "")") + let qrcode = QRCodeView(frame: frame) + qrcode.generateCode("ThisIsTeamNADAQrCode\(cardDataModel?.cardID ?? "")", + foregroundColor: .primary, + backgroundColor: .background) + qrImage.addSubview(qrcode) + } + private func setImageWriteToSavedPhotosAlbum() { let frontCardImage = setFrontCardImage() let backCardImage = setBackCardImage() @@ -172,7 +180,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { // MARK: - @objc Methods @objc func copyId() { - UIPasteboard.general.string = cardID + UIPasteboard.general.string = cardDataModel?.cardID ?? "" showToast(message: "명함 아이디가 복사되었습니다.", font: UIFont.button02, view: "copyID") } From ad4163af8d5ea78710ee89eb46260b9546880ee8 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 05:16:00 +0900 Subject: [PATCH 02/11] =?UTF-8?q?[FEAT]=20#223=20-=20QR=EB=A1=9C=20?= =?UTF-8?q?=EB=AA=85=ED=95=A8=20=EC=B6=94=EA=B0=80=20=EC=84=9C=EB=B2=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 ++ .../Extensions/UIString+Extension.swift | 14 +++++ .../CardShareBottomSheetViewController.swift | 3 ++ .../Group/QRScanViewController.swift | 53 ++++++++++++++++--- 4 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 79489156..28710df0 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -69,6 +69,7 @@ 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; 7734D5AA27719520004360E4 /* CardShareBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */; }; 7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B527779EF0004360E4 /* QRCodeView.swift */; }; + 7734D5B82777A8E8004360E4 /* UIString+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B72777A8E8004360E4 /* UIString+Extension.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 */; }; @@ -208,6 +209,7 @@ 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = ""; }; 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardShareBottomSheetViewController.swift; sourceTree = ""; }; 7734D5B527779EF0004360E4 /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = ""; }; + 7734D5B72777A8E8004360E4 /* UIString+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIString+Extension.swift"; sourceTree = ""; }; 77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupCollectionViewCell.swift; sourceTree = ""; }; 77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupCollectionViewCell.xib; sourceTree = ""; }; 7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardInGroupCollectionViewCell.swift; sourceTree = ""; }; @@ -931,6 +933,7 @@ 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */, F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */, F8D74DD7276C7FB60071E5FC /* UIImageView+Extension.swift */, + 7734D5B72777A8E8004360E4 /* UIString+Extension.swift */, ); path = Extensions; sourceTree = ""; @@ -1173,6 +1176,7 @@ F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */, 7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */, 3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */, + 7734D5B82777A8E8004360E4 /* UIString+Extension.swift in Sources */, F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */, 392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */, 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift new file mode 100644 index 00000000..979a4465 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift @@ -0,0 +1,14 @@ +// +// UIString+Extension.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/12/26. +// + +import Foundation +extension String { + func deletingPrefix(_ prefix: String) -> String { + guard self.hasPrefix(prefix) else { return self } + return String(self.dropFirst(prefix.count)) + } +} diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 7f1b3416..c5455e2f 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -115,6 +115,9 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { qrcode.generateCode("ThisIsTeamNADAQrCode\(cardDataModel?.cardID ?? "")", foregroundColor: .primary, backgroundColor: .background) +// qrcode.generateCode("ThisIsTeamNADAQrCodeCardE", +// foregroundColor: .primary, +// backgroundColor: .background) qrImage.addSubview(qrcode) } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index a49178b2..6eddfd0b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -39,6 +39,7 @@ class QRScanViewController: UIViewController { extension QRScanViewController { @objc func dismissQRScanViewController() { self.dismiss(animated: true, completion: nil) + presentingViewController?.viewWillAppear(true) } } @@ -120,19 +121,59 @@ extension QRScanViewController: AVCaptureMetadataOutputObjectsDelegate { } // ✅ qr코드가 가진 문자열이 URL 형태를 띈다면 출력.(아무런 qr코드나 찍는다고 출력시키면 안되니까 여기서 분기처리 가능. ) - if stringValue.hasPrefix("http://") { + if stringValue.hasPrefix("ThisIsTeamNADAQrCode") { print(stringValue) self.captureSession.stopRunning() // TODO: 여기서 QR에 있는 ID값으로 명함검색 API통신 - let nextVC = CardResultBottomSheetViewController() - .setTitle("이채연") - .setHeight(574) - nextVC.modalPresentationStyle = .overFullScreen - self.present(nextVC, animated: false, completion: nil) + cardDetailFetchWithAPI(cardID: stringValue.deletingPrefix("ThisIsTeamNADAQrCode")) + } else { showToast(message: "유효하지 않은 QR입니다.", font: UIFont.button02, view: "QRScan") } } } } + +extension QRScanViewController { + func cardDetailFetchWithAPI(cardID: String) { + CardAPI.shared.cardDetailFetch(cardID: cardID) { response in + switch response { + case .success(let data): + if let card = data as? CardClass { + //TODO: 내가 쓴거 내가 추가 하면 예외처리 필요 + let nextVC = CardResultBottomSheetViewController() + .setTitle(card.card.name) + .setHeight(574) + 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) + nextVC.modalPresentationStyle = .overFullScreen + self.present(nextVC, animated: false, completion: nil) + } + case .requestErr(let message): + print("cardDetailFetchWithAPI - requestErr: \(message)") + case .pathErr: + print("cardDetailFetchWithAPI - pathErr") + case .serverErr: + print("cardDetailFetchWithAPI - serverErr") + case .networkFail: + print("cardDetailFetchWithAPI - networkFail") + } + } + } +} + From df6e21aa61f03b9c7819d45639b89966043907c9 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 05:23:12 +0900 Subject: [PATCH 03/11] =?UTF-8?q?[FIX]=20#223=20-=20Card=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=AA=A8=EB=8D=B8=EC=97=90=20author=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift | 4 ++-- .../BottomSheet/AddWithIdBottomSheetViewController.swift | 2 ++ .../Sources/ViewControllers/Group/GroupViewController.swift | 1 + .../ViewControllers/Group/QRScanViewController.swift | 1 + .../Sources/ViewControllers/Main/FrontViewController.swift | 4 ++-- .../ViewControllers/TeamNADA/TeamNADAViewController.swift | 6 ++++++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift index 65ef1c70..2dbd76ac 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift @@ -14,7 +14,7 @@ struct CardClass: Codable { // MARK: - Card struct Card: Codable { - let cardID, background, title, name: String + let cardID, author, background, title, name: String let birthDate, mbti, instagram, link: String let cardDescription: String let isMincho, isSoju, isBoomuk, isSauced: Bool @@ -22,7 +22,7 @@ struct Card: Codable { enum CodingKeys: String, CodingKey { case cardID = "cardId" - case background, title, name, birthDate, mbti, instagram, link + case author, background, title, name, birthDate, mbti, instagram, link case cardDescription = "description" case isMincho, isSoju, isBoomuk, isSauced, oneTmi, twoTmi, threeTmi } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index bf1c8147..ea845bff 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -109,8 +109,10 @@ extension AddWithIdBottomSheetViewController { case .success(let data): if let card = data as? CardClass { //TODO: 내가 쓴거 내가 추가 하면 예외처리 필요 + print(card.card.author) let nextVC = CardResultBottomSheetViewController() nextVC.cardDataModel = Card(cardID: card.card.cardID, + author: card.card.author, background: card.card.background, title: card.card.title, name: card.card.name, diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 648ad438..27fd2714 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -228,6 +228,7 @@ extension GroupViewController { guard let nextVC = UIStoryboard.init(name: Const.Storyboard.Name.cardDetail, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardDetailViewController) as? CardDetailViewController else { return } nextVC.cardDataModel = Card(cardID: card.card.cardID, + author: card.card.author, background: card.card.background, title: card.card.title, name: card.card.name, diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 6eddfd0b..10477cd7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -146,6 +146,7 @@ extension QRScanViewController { .setTitle(card.card.name) .setHeight(574) nextVC.cardDataModel = Card(cardID: card.card.cardID, + author: card.card.author, background: card.card.background, title: card.card.title, name: card.card.name, diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 7171ad91..78d3987b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -13,7 +13,7 @@ class FrontViewController: UIViewController { // MARK: - Properteis - var cardDataList: [Card]? = [Card(cardID: "card", + var cardDataList: [Card]? = [Card(cardID: "card", author: "", background: "card", title: "SOPT 명함", name: "이채연", @@ -29,7 +29,7 @@ class FrontViewController: UIViewController { oneTmi: "첫번째", twoTmi: "두번째", threeTmi: "세번째세번째세번째"), - Card(cardID: "card", + Card(cardID: "card", author: "", background: "card", title: "SOPT 명함", name: "이채연", diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift index 79bc6fa2..b66a3665 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift @@ -13,6 +13,7 @@ class TeamNADAViewController: UIViewController { // MARK: - Properteis var cardDataList: [Card]? = [Card(cardID: "card", + author: "", background: "imgYun", title: "NADA", name: "박윤정", @@ -29,6 +30,7 @@ class TeamNADAViewController: UIViewController { twoTmi: "일벌리기도 좋아하는데 체력이..", threeTmi: "내가 바로 나다 기획자😎"), Card(cardID: "card", + author: "", background: "imgChae", title: "NADA", name: "이채연", @@ -45,6 +47,7 @@ class TeamNADAViewController: UIViewController { twoTmi: "빵, 디저트 좋아해요 🥞🍞🍰🍦🍩🍪", threeTmi: "ENFP와 ENFJ 그 사이!"), Card(cardID: "card", + author: "", background: "imgHyun", title: "NADA", name: "김현규", @@ -61,6 +64,7 @@ class TeamNADAViewController: UIViewController { twoTmi: "후드티 주세요 후드티", threeTmi: "스트로베리 문 한스쿱"), Card(cardID: "card", + author: "", background: "imgYi", title: "NADA", name: "최이준", @@ -77,6 +81,7 @@ class TeamNADAViewController: UIViewController { twoTmi: "축구야구가좋아요 스포츠좋아", threeTmi: "난 슬플때 컵을 쌓아..."), Card(cardID: "card", + author: "", background: "imgMin", title: "NADA", name: "이민재", @@ -93,6 +98,7 @@ class TeamNADAViewController: UIViewController { twoTmi: "믿기지 않겠지만, 전 야구선수 출신", threeTmi: "천안-서울 쉽지않네;;"), Card(cardID: "card", + author: "", background: "imgYe", title: "NADA", name: "오예원", From 0a4c6631df236df3f7622dcea05435c9a4f561e8 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 05:32:18 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[FEAT]=20#223=20-=20=EC=9E=90=EC=8B=A0?= =?UTF-8?q?=EC=9D=98=20=EB=AA=85=ED=95=A8=20=EC=8A=A4=EC=BA=94=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddWithIdBottomSheetViewController.swift | 48 +++++++++--------- .../Group/QRScanViewController.swift | 49 ++++++++++--------- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index ea845bff..3672c4c8 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -34,7 +34,6 @@ class AddWithIdBottomSheetViewController: CommonBottomSheetViewController, UITex private let explainLabel: UILabel = { let label = UILabel() - label.text = "검색한 ID가 존재하지 않습니다." label.textColor = .stateColorError label.font = .textRegular05 @@ -108,32 +107,37 @@ extension AddWithIdBottomSheetViewController { switch response { case .success(let data): if let card = data as? CardClass { - //TODO: 내가 쓴거 내가 추가 하면 예외처리 필요 - print(card.card.author) - let nextVC = CardResultBottomSheetViewController() - nextVC.cardDataModel = Card(cardID: card.card.cardID, - author: card.card.author, - 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) + if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author { + self.errorImageView.isHidden = false + self.explainLabel.isHidden = false + self.explainLabel.text = "자신의 명함은 추가할 수 없습니다." + } else { + let nextVC = CardResultBottomSheetViewController() + nextVC.cardDataModel = Card(cardID: card.card.cardID, + author: card.card.author, + 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 + self.explainLabel.text = "검색한 ID가 존재하지 않습니다." case .pathErr: print("cardDetailFetchWithAPI - pathErr") case .serverErr: diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 10477cd7..7cde45f6 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -141,29 +141,32 @@ extension QRScanViewController { switch response { case .success(let data): if let card = data as? CardClass { - //TODO: 내가 쓴거 내가 추가 하면 예외처리 필요 - let nextVC = CardResultBottomSheetViewController() - .setTitle(card.card.name) - .setHeight(574) - nextVC.cardDataModel = Card(cardID: card.card.cardID, - author: card.card.author, - 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) - nextVC.modalPresentationStyle = .overFullScreen - self.present(nextVC, animated: false, completion: nil) + if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author { + self.showToast(message: "자신의 명함은 추가할 수 없습니다.", font: UIFont.button02, view: "wrongCard") + } else { + let nextVC = CardResultBottomSheetViewController() + .setTitle(card.card.name) + .setHeight(574) + nextVC.cardDataModel = Card(cardID: card.card.cardID, + author: card.card.author, + 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) + nextVC.modalPresentationStyle = .overFullScreen + self.present(nextVC, animated: false, completion: nil) + } } case .requestErr(let message): print("cardDetailFetchWithAPI - requestErr: \(message)") From 3f2fd0649213f10cda8772670b5ab0fd4e6276a8 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 18:07:47 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[FIX]=20#223=20-=20String=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 8 ++++---- .../{UIString+Extension.swift => String+Extension.swift} | 0 .../ViewControllers/Group/QRScanViewController.swift | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) rename NADA-iOS-forRelease/Resouces/Extensions/{UIString+Extension.swift => String+Extension.swift} (100%) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 28710df0..a1a18fa5 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -69,7 +69,7 @@ 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; 7734D5AA27719520004360E4 /* CardShareBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */; }; 7734D5B627779EF0004360E4 /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B527779EF0004360E4 /* QRCodeView.swift */; }; - 7734D5B82777A8E8004360E4 /* UIString+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B72777A8E8004360E4 /* UIString+Extension.swift */; }; + 7734D5B82777A8E8004360E4 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5B72777A8E8004360E4 /* String+Extension.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 */; }; @@ -209,7 +209,7 @@ 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = ""; }; 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardShareBottomSheetViewController.swift; sourceTree = ""; }; 7734D5B527779EF0004360E4 /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = ""; }; - 7734D5B72777A8E8004360E4 /* UIString+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIString+Extension.swift"; sourceTree = ""; }; + 7734D5B72777A8E8004360E4 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = ""; }; 77607ED8274A68BD00204CD2 /* GroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupCollectionViewCell.swift; sourceTree = ""; }; 77607ED9274A68BD00204CD2 /* GroupCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupCollectionViewCell.xib; sourceTree = ""; }; 7766A40D274FEBE200714912 /* CardInGroupCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardInGroupCollectionViewCell.swift; sourceTree = ""; }; @@ -933,7 +933,7 @@ 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */, F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */, F8D74DD7276C7FB60071E5FC /* UIImageView+Extension.swift */, - 7734D5B72777A8E8004360E4 /* UIString+Extension.swift */, + 7734D5B72777A8E8004360E4 /* String+Extension.swift */, ); path = Extensions; sourceTree = ""; @@ -1176,7 +1176,7 @@ F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */, 7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */, 3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */, - 7734D5B82777A8E8004360E4 /* UIString+Extension.swift in Sources */, + 7734D5B82777A8E8004360E4 /* String+Extension.swift in Sources */, F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */, 392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */, 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/String+Extension.swift similarity index 100% rename from NADA-iOS-forRelease/Resouces/Extensions/UIString+Extension.swift rename to NADA-iOS-forRelease/Resouces/Extensions/String+Extension.swift diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 7cde45f6..2d682087 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -180,4 +180,3 @@ extension QRScanViewController { } } } - From 44099528e5f191c6f0afff544f2ae9c493bf5a25 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Sun, 26 Dec 2021 23:00:23 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[FEAT]=20#223=20-=20Status=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20QR=EB=A1=9C=20=EC=B6=94=EA=B0=80=ED=96=88=EC=9D=84?= =?UTF-8?q?=EB=95=8C=20dismiss=20=EB=B6=84=EA=B8=B0=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 4 ++++ .../Resouces/Constants/Status.swift | 14 ++++++++++++++ .../CardResultBottomSheetViewController.swift | 4 +++- .../SelectGroupBottomSheetViewController.swift | 10 ++++------ .../CardDetail/CardDetailViewController.swift | 14 ++++++++------ .../Group/QRScanViewController.swift | 1 + 6 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Constants/Status.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index a1a18fa5..60b5e7d7 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -65,6 +65,7 @@ 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; }; 7705CF3E2752C7DB005195DF /* CardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7705CF3D2752C7DB005195DF /* CardView.swift */; }; 7705CF402752C844005195DF /* CardView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7705CF3F2752C844005195DF /* CardView.xib */; }; + 770E58862778A78900498C2E /* Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = 770E58852778A78900498C2E /* Status.swift */; }; 7713E8482752E2A900724C8B /* SelectGroupBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7713E8472752E2A900724C8B /* SelectGroupBottomSheetViewController.swift */; }; 7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; }; 7734D5AA27719520004360E4 /* CardShareBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */; }; @@ -205,6 +206,7 @@ 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7705CF3D2752C7DB005195DF /* CardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardView.swift; sourceTree = ""; }; 7705CF3F2752C844005195DF /* CardView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardView.xib; sourceTree = ""; }; + 770E58852778A78900498C2E /* Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Status.swift; sourceTree = ""; }; 7713E8472752E2A900724C8B /* SelectGroupBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectGroupBottomSheetViewController.swift; sourceTree = ""; }; 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardsInGroupResponse.swift; sourceTree = ""; }; 7734D5A927719520004360E4 /* CardShareBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardShareBottomSheetViewController.swift; sourceTree = ""; }; @@ -918,6 +920,7 @@ F8C83FC2272FA17B0009DF0D /* URL.swift */, 3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */, 77F47D92276C79B600414659 /* Header.swift */, + 770E58852778A78900498C2E /* Status.swift */, ); path = Constants; sourceTree = ""; @@ -1137,6 +1140,7 @@ F8C83FBF272FA0670009DF0D /* UserSevice.swift in Sources */, 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */, F8268DB927730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift in Sources */, + 770E58862778A78900498C2E /* Status.swift in Sources */, F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */, 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */, F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Constants/Status.swift b/NADA-iOS-forRelease/Resouces/Constants/Status.swift new file mode 100644 index 00000000..f67c3d87 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Constants/Status.swift @@ -0,0 +1,14 @@ +// +// Status.swift +// NADA-iOS-forRelease +// +// Created by Yi Joon Choi on 2021/12/26. +// + +import Foundation +enum Status { + case group + case detail + case add + case addWithQR +} diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift index d3a36644..a19d4a24 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift @@ -13,6 +13,8 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController { // MARK: - Properties var cardDataModel: Card? + var status: Status = .add + private let groupLabel: UILabel = { let label = UILabel() label.textColor = .secondary @@ -108,7 +110,7 @@ extension CardResultBottomSheetViewController { case .success(let data): if let group = data as? Groups { let nextVC = SelectGroupBottomSheetViewController() - nextVC.status = .add + nextVC.status = self.status nextVC.cardDataModel = self.cardDataModel nextVC.serverGroups = group self.hideBottomSheetAndPresent(nextBottomSheet: nextVC, title: "그룹선택", height: 386) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index 98d80f74..feef2621 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -15,10 +15,6 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { var selectedGroup = 0 var selectedGroupIndex = 0 var groupId: Int? - enum Status { - case detail - case add - } var status: Status = .add @@ -80,10 +76,12 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupID: groupId ?? 0, newGroupID: selectedGroup)) - case .add: + case .add, .addWithQR: cardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: cardDataModel?.cardID ?? "", userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: selectedGroup)) + case .group: + return } } @@ -133,7 +131,7 @@ extension SelectGroupBottomSheetViewController { switch response { case .success: 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.status = self.status nextVC.cardDataModel = self.cardDataModel nextVC.groupId = self.selectedGroup nextVC.serverGroups = self.serverGroups diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index dad91872..d652f873 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -11,11 +11,6 @@ class CardDetailViewController: UIViewController { // MARK: - Properties // 네비게이션 바 - enum Status { - case group - case add - } - @IBAction func touchBackButton(_ sender: Any) { switch status { case .group: @@ -23,6 +18,11 @@ class CardDetailViewController: UIViewController { case .add: self.dismiss(animated: true, completion: nil) presentingViewController?.viewWillAppear(true) + case .addWithQR: + self.presentingViewController?.presentingViewController?.dismiss(animated: true, completion: nil) + + case .detail: + return } } @@ -86,8 +86,10 @@ extension CardDetailViewController { switch status { case .group: backButton.setImage(UIImage(named: "iconArrow"), for: .normal) - case .add: + case .add, .addWithQR: backButton.setImage(UIImage(named: "iconClear"), for: .normal) + case .detail: + return } idLabel.text = cardDataModel?.cardID } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 2d682087..0fd0ad6b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -165,6 +165,7 @@ extension QRScanViewController { twoTmi: card.card.twoTmi, threeTmi: card.card.threeTmi) nextVC.modalPresentationStyle = .overFullScreen + nextVC.status = .addWithQR self.present(nextVC, animated: false, completion: nil) } } From 187fce7a6ad8da9dffe09f098c236e64712264fb Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 27 Dec 2021 00:20:02 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[FEAT]=20#223=20-=20=EC=93=B8=EB=8D=B0?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift | 2 +- .../ViewControllers/TeamNADA/TeamNADAViewController.swift | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift b/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift index f6040e71..13d91d06 100644 --- a/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift +++ b/NADA-iOS-forRelease/Sources/Classes/QRCodeView.swift @@ -48,7 +48,7 @@ class QRCodeView: UIView { } // ❗️ 이렇게 끝내면 qr code 가 선명하지 않게 나온다. - //imageView.image = UIImage(ciImage: ciImage, scale: 2.0, orientation: .up) + // imageView.image = UIImage(ciImage: ciImage, scale: 2.0, orientation: .up) // ✅ 다음은 이미지 선명하게 변환하는 과정이다. // ✅ 원래 이미지에 affine transform(by 파라미터를 의미.) 을 적용한 새 이미지를 반환. 이미지의 넓이와 높이를 10배 증가시킴. diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift index 0a47c19a..bc32a33a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift @@ -12,7 +12,6 @@ class TeamNADAViewController: UIViewController { // MARK: - Properteis var cardDataList: [Card]? = [Card(cardID: "card", - author: "", background: "imgYun", title: "NADA", name: "박윤정", @@ -29,7 +28,6 @@ class TeamNADAViewController: UIViewController { twoTmi: "일벌리기도 좋아하는데 체력이..", threeTmi: "내가 바로 나다 기획자😎"), Card(cardID: "card", - author: "", background: "imgChae", title: "NADA", name: "이채연", @@ -46,7 +44,6 @@ class TeamNADAViewController: UIViewController { twoTmi: "빵, 디저트 좋아해요 🥞🍞🍰🍦🍩🍪", threeTmi: "ENFP와 ENFJ 그 사이!"), Card(cardID: "card", - author: "", background: "imgHyun", title: "NADA", name: "김현규", @@ -63,7 +60,6 @@ class TeamNADAViewController: UIViewController { twoTmi: "후드티 주세요 후드티", threeTmi: "스트로베리 문 한스쿱"), Card(cardID: "card", - author: "", background: "imgYi", title: "NADA", name: "최이준", @@ -80,7 +76,6 @@ class TeamNADAViewController: UIViewController { twoTmi: "축구야구가좋아요 스포츠좋아", threeTmi: "난 슬플때 컵을 쌓아..."), Card(cardID: "card", - author: "", background: "imgMin", title: "NADA", name: "이민재", @@ -97,7 +92,6 @@ class TeamNADAViewController: UIViewController { twoTmi: "믿기지 않겠지만, 전 야구선수 출신", threeTmi: "천안-서울 쉽지않네;;"), Card(cardID: "card", - author: "", background: "imgYe", title: "NADA", name: "오예원", From c873482867d710cb86a3fb7123ea36c37a0f08d2 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 27 Dec 2021 00:20:37 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[FEAT]=20#223=20-=20Card=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=AA=A8=EB=8D=B8=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/Sources/NetworkModel/Card/Card.swift | 9 ++++++++- .../NetworkModel/Group/CardsInGroupResponse.swift | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift index c9451608..05322ebd 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift @@ -7,9 +7,16 @@ import Foundation +// MARK: - CardClass +struct CardClass: Codable { + let card: Card +} + // MARK: - Card struct Card: Codable { - let cardID, background, title, name, birthDate, mbti: String + let cardID: String + let author: String? = "" + let background, title, name, birthDate, mbti: String let instagram, link, cardDescription: String? let isMincho, isSoju, isBoomuk, isSauced: Bool let oneTmi, twoTmi, threeTmi: String? diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift index ceb1b4a4..36348f98 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardsInGroupResponse.swift @@ -26,12 +26,12 @@ struct CardsInGroupResponse: Codable { // MARK: - Cards struct FrontCard: Codable { - let cardID, background, title, name, birthDate, age, mbti: String - let instagram, linkName, link, cardDescription: String? + let cardID, background, title, name, birthDate, mbti: String + let instagram, link, cardDescription: String? enum CodingKeys: String, CodingKey { case cardID = "cardId" - case background, title, name, birthDate, age, mbti, instagram, linkName, link + case background, title, name, birthDate, mbti, instagram, link case cardDescription = "description" } From cab7c73dbd4f6bf749fd58f8c4e861fa3190f402 Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 27 Dec 2021 00:24:01 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[FEAT]=20#223=20-=20CardClass=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=ED=9B=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/NetworkService/Card/CardAPI.swift | 2 +- .../AddWithIdBottomSheetViewController.swift | 18 +----------------- .../Group/GroupViewController.swift | 4 ++-- .../Group/QRScanViewController.swift | 18 +----------------- 4 files changed, 5 insertions(+), 37 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardAPI.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardAPI.swift index 0d8dc9da..5efbda27 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardAPI.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardAPI.swift @@ -112,7 +112,7 @@ public class CardAPI { private func judgeCardDetailFetchStatus(by statusCode: Int, _ data: Data) -> NetworkResult { let decoder = JSONDecoder() - guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) + guard let decodedData = try? decoder.decode(GenericResponse.self, from: data) else { return .pathErr } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index 3672c4c8..9494a886 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -113,23 +113,7 @@ extension AddWithIdBottomSheetViewController { self.explainLabel.text = "자신의 명함은 추가할 수 없습니다." } else { let nextVC = CardResultBottomSheetViewController() - nextVC.cardDataModel = Card(cardID: card.card.cardID, - author: card.card.author, - 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) + nextVC.cardDataModel = card.card self.hideBottomSheetAndPresent(nextBottomSheet: nextVC, title: card.card.name, height: 574) } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 5354afea..ade578f8 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -224,10 +224,10 @@ extension GroupViewController { CardAPI.shared.cardDetailFetch(cardID: cardID) { response in switch response { case .success(let data): - if let card = data as? Card { + if let card = data as? CardClass { guard let nextVC = UIStoryboard.init(name: Const.Storyboard.Name.cardDetail, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardDetailViewController) as? CardDetailViewController else { return } - nextVC.cardDataModel = card + nextVC.cardDataModel = card.card nextVC.groupId = self.groupId nextVC.serverGroups = self.serverGroups self.navigationController?.pushViewController(nextVC, animated: true) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 0fd0ad6b..5207f3da 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -147,23 +147,7 @@ extension QRScanViewController { let nextVC = CardResultBottomSheetViewController() .setTitle(card.card.name) .setHeight(574) - nextVC.cardDataModel = Card(cardID: card.card.cardID, - author: card.card.author, - 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) + nextVC.cardDataModel = card.card nextVC.modalPresentationStyle = .overFullScreen nextVC.status = .addWithQR self.present(nextVC, animated: false, completion: nil) From 2b8049f71b586a572c17d16bbaa4f01a522d059e Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 27 Dec 2021 01:00:47 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[FIX]=20#223=20-=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EB=B7=B0=20=EB=AA=85=ED=95=A8=20=EC=B6=94=EA=B0=80=20=EB=AA=A8?= =?UTF-8?q?=EB=8B=AC=20=EB=B2=84=EA=B7=B8=20=ED=94=BD=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/CardDetail/CardDetailViewController.swift | 1 - .../Sources/ViewControllers/Group/GroupViewController.swift | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index d652f873..b24cfc4b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -17,7 +17,6 @@ class CardDetailViewController: UIViewController { self.navigationController?.popViewController(animated: true) case .add: self.dismiss(animated: true, completion: nil) - presentingViewController?.viewWillAppear(true) case .addWithQR: self.presentingViewController?.presentingViewController?.dismiss(animated: true, completion: nil) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index ade578f8..1c07b4c2 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -88,8 +88,8 @@ class GroupViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { // 그룹 리스트 조회 서버 테스트 + super.viewWillAppear(true) NotificationCenter.default.addObserver(self, selector: #selector(didRecieveDataNotification(_:)), name: Notification.Name.passDataToGroup, object: nil) - print("viewWillAppear") groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") } From 6f0d1c0075f400e546738961d3886daa501c032d Mon Sep 17 00:00:00 2001 From: dlwns33 Date: Mon, 27 Dec 2021 01:18:51 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[CHORE]=20#223=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/CardShareBottomSheetViewController.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index 8329cc6c..62599e1a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -115,9 +115,6 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { qrcode.generateCode("ThisIsTeamNADAQrCode\(cardDataModel?.cardID ?? "")", foregroundColor: .primary, backgroundColor: .background) -// qrcode.generateCode("ThisIsTeamNADAQrCodeCardE", -// foregroundColor: .primary, -// backgroundColor: .background) qrImage.addSubview(qrcode) }