From 629095115005fc579eed2a6b0cd47d91d8aee84a Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Fri, 10 Dec 2021 22:10:05 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT]=20#128=20-=20mbti,=20=EC=83=9D=EB=85=84?= =?UTF-8?q?=EC=9B=94=EC=9D=BC=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20dis?= =?UTF-8?q?miss=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=AA=85=ED=95=A8=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 피커뷰 코드 정리(조건문 수정) - 명함 배경 선택 테두리 색 변경(메인나다색으로) -  카드 불투명도 0.4->0.2변경 - 명함 기본배경 설정 --- .../imgCardBg01.imageset/Contents.json | 4 +- .../imgCardBg06.imageset/Contents.json | 10 ++--- .../imgCardBg07.imageset/Contents.json | 12 +++--- .../Sources/Cells/CardCell/BackCardCell.xib | 2 +- .../Sources/Cells/CardCell/FrontCardCell.xib | 2 +- .../BackgroundCollectionViewCell.swift | 3 +- .../FrontCardCreationCollectionViewCell.swift | 37 +++++++++++-------- .../CardInGroupCollectionViewCell.xib | 2 +- .../CardCreationPreviewViewController.swift | 21 +++++++++++ .../CardCreationViewController.swift | 23 +++++------- 10 files changed, 70 insertions(+), 46 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json index 989d4c6b..3926d1ea 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json @@ -1,9 +1,9 @@ { "images" : [ { - "scale" : "1x", + "idiom" : "universal", "filename" : "imgCardBg01.png", - "idiom" : "universal" + "scale" : "1x" }, { "idiom" : "universal", diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json index fb5b324a..6d72ad76 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json @@ -1,19 +1,19 @@ { "images" : [ { - "scale" : "1x", "filename" : "imgCardBg06.png", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" }, { - "scale" : "2x", "idiom" : "universal", + "scale" : "2x", "filename" : "imgCardBg06@2x.png" }, { + "scale" : "3x", "filename" : "imgCardBg06@3x.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json index 5f8730f0..95e22c93 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json @@ -1,19 +1,19 @@ { "images" : [ { - "filename" : "imgCardBg07.png", + "scale" : "1x", "idiom" : "universal", - "scale" : "1x" + "filename" : "imgCardBg07.png" }, { "filename" : "imgCardBg07@2x.png", - "idiom" : "universal", - "scale" : "2x" + "scale" : "2x", + "idiom" : "universal" }, { - "filename" : "imgCardBg07@3x.png", "scale" : "3x", - "idiom" : "universal" + "idiom" : "universal", + "filename" : "imgCardBg07@3x.png" } ], "info" : { diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib index f889e175..10cd5094 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib @@ -25,7 +25,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib index 0c379e4f..944de074 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib @@ -24,7 +24,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift index 763b5602..58c9b51b 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/Background/BackgroundCollectionViewCell.swift @@ -34,12 +34,13 @@ class BackgroundCollectionViewCell: UICollectionViewCell { extension BackgroundCollectionViewCell { private func setUI() { - bgView.backgroundColor = .tertiary + bgView.backgroundColor = .mainColorNadaMain bgView.isHidden = true bgView.layer.cornerRadius = bgViewCornerRadius opacityView.layer.cornerRadius = imageviewCornerRadius imageView.layer.cornerRadius = imageviewCornerRadius + imageView.contentMode = .scaleAspectFill } func initCell(image: UIImage, isFirst: Bool) { imageView.image = image diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index 772bb5c0..26dece22 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -15,7 +15,7 @@ class FrontCardCreationCollectionViewCell: UICollectionViewCell { // MARK: - Properties - private let backgroundList = ["img", "img", "img", "img", "img"] + private let backgroundList = ["", "imageDefaultBg01", "imageDefaultBg02", "imageDefaultBg03", "imageDefaultBg04", "imageDefaultBg05", "imageDefaultBg06", "imageDefaultBg07"] private var requiredTextFieldList = [UITextField]() private var optionalTextFieldList = [UITextField]() private var cardBackgroundImage: UIImage? @@ -176,17 +176,19 @@ extension FrontCardCreationCollectionViewCell { } else { frontCardCreationDelegate?.frontCardCreation(requiredInfo: false) } - frontCardCreationDelegate?.frontCardCreation(withRequired: [ - "defaultImageIndex": String(defaultImageIndex ?? -1), - "title": cardTitleTextField.text ?? "", - "name": userNameTextField.text ?? "", - "birthDate": birthTextField.text ?? "", - "mbti": mbtiTextField.text ?? "" - ], withOptional: [ - "instagram": instagramIDTextField.text ?? "", - "linkURL": linkURLTextField.text ?? "", - "description": descriptionTextField.text ?? "" - ]) + if let defaultImageIndex = defaultImageIndex { + frontCardCreationDelegate?.frontCardCreation(withRequired: [ + "defaultImageIndex": String(defaultImageIndex), + "title": cardTitleTextField.text ?? "", + "name": userNameTextField.text ?? "", + "birthDate": birthTextField.text ?? "", + "mbti": mbtiTextField.text ?? "" + ], withOptional: [ + "instagram": instagramIDTextField.text ?? "", + "linkURL": linkURLTextField.text ?? "", + "description": descriptionTextField.text ?? "" + ]) + } } static func nib() -> UINib { return UINib(nibName: Const.Xib.frontCardCreationCollectionViewCell, bundle: Bundle(for: FrontCardCreationCollectionViewCell.self)) @@ -261,6 +263,12 @@ extension FrontCardCreationCollectionViewCell: UICollectionViewDelegate { defaultImageIndex = 3 case 4: defaultImageIndex = 4 + case 5: + defaultImageIndex = 5 + case 6: + defaultImageIndex = 6 + case 7: + defaultImageIndex = 7 default: return } @@ -282,9 +290,8 @@ extension FrontCardCreationCollectionViewCell: UICollectionViewDataSource { case 0: cell.initCell(image: cardBackgroundImage ?? UIImage(), isFirst: true) default: - // FIXME: - 기본 명함 배경 넘겨주면 수정. -// guard let image = UIImage(systemName: backgroundList[indexPath.item]) else { return UICollectionViewCell() } - cell.initCell(image: UIImage(), isFirst: false) + guard let image = UIImage(named: backgroundList[indexPath.item]) else { return UICollectionViewCell() } + cell.initCell(image: image, isFirst: false) } return cell } diff --git a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib index fae3a551..7f38e19c 100644 --- a/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/GroupCell/CardInGroupCollectionViewCell.xib @@ -32,7 +32,7 @@ - + diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index 56addb29..25a18e73 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift @@ -12,6 +12,7 @@ class CardCreationPreviewViewController: UIViewController { public var frontCardDataModel: FrontCardDataModel? public var backCardDataModel: BackCardDataModel? public var cardBackgroundImage: UIImage? + public var defaultImageIndex: Int? private var isFront = true private var cardCreationRequest: CardCreationRequest? @@ -28,6 +29,7 @@ class CardCreationPreviewViewController: UIViewController { super.viewDidLoad() setUI() + setBackgroundImage() setFrontCard() setGestureRecognizer() } @@ -94,6 +96,25 @@ extension CardCreationPreviewViewController { swipeRightGestureRecognizer.direction = .right self.cardView.addGestureRecognizer(swipeRightGestureRecognizer) } + private func setBackgroundImage() { + if frontCardDataModel?.defaultImage == 0 { + return + } else if frontCardDataModel?.defaultImage == 1 { + cardBackgroundImage = UIImage(named: "imgCardBg01") + } else if frontCardDataModel?.defaultImage == 2 { + cardBackgroundImage = UIImage(named: "imgCardBg02") + } else if frontCardDataModel?.defaultImage == 3 { + cardBackgroundImage = UIImage(named: "imgCardBg03") + } else if frontCardDataModel?.defaultImage == 4 { + cardBackgroundImage = UIImage(named: "imgCardBg04") + } else if frontCardDataModel?.defaultImage == 5 { + cardBackgroundImage = UIImage(named: "imgCardBg05") + } else if frontCardDataModel?.defaultImage == 6 { + cardBackgroundImage = UIImage(named: "imgCardBg06") + } else { + cardBackgroundImage = UIImage(named: "imgCardBg07") + } + } // MARK: - @objc Methods diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift index 9308f70d..a179cc28 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationViewController.swift @@ -41,7 +41,6 @@ class CardCreationViewController: UIViewController { private var mbtiText: String? private var birthText: String? private var newImage: UIImage? - private var defaultImageIndex: Int? // MARK: - @IBOutlet Properties @@ -90,7 +89,7 @@ class CardCreationViewController: UIViewController { } @IBAction func pushToCardCompletionView(_ sender: Any) { guard let nextVC = UIStoryboard.init(name: Const.Storyboard.Name.cardCreationPreview, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.cardCreationPreviewViewController) as? CardCreationPreviewViewController else { return } - + nextVC.frontCardDataModel = frontCard nextVC.backCardDataModel = backCard nextVC.cardBackgroundImage = newImage @@ -149,13 +148,13 @@ extension CardCreationViewController { // TODO: - QA/iOS 13 테스트. selected 설정. completeButton.layer.cornerRadius = 15 - completeButton.setTitle("완료", for: .normal) + completeButton.setTitle("완료", for: .normal) completeButton.setTitleColor(.white, for: .normal) - completeButton.setBackgroundImage(UIImage(named: "enableButtonBackground"), for: .normal) - - completeButton.setTitle("완료", for: .disabled) - completeButton.setTitleColor(.white, for: .disabled) - completeButton.setBackgroundImage(UIImage(named: "disableButtonBackground"), for: .disabled) + completeButton.setBackgroundImage(UIImage(named: "enableButtonBackground"), for: .normal) + + completeButton.setTitle("완료", for: .disabled) + completeButton.setTitleColor(.white, for: .disabled) + completeButton.setBackgroundImage(UIImage(named: "disableButtonBackground"), for: .disabled) } let cardCreationCollectionViewlayout = cardCreationCollectionView.collectionViewLayout as? UICollectionViewFlowLayout @@ -379,7 +378,7 @@ extension CardCreationViewController: FrontCardCreationDelegate { isEditingMode = valid } func frontCardCreation(withRequired requiredInfo: [String: String], withOptional optionalInfo: [String: String]) { - frontCard = FrontCardDataModel(defaultImage: Int(requiredInfo["defaultImage"] ?? "-1") ?? -1, + frontCard = FrontCardDataModel(defaultImage: Int(requiredInfo["defaultImageIndex"] ?? "-1") ?? -1, title: requiredInfo["title"] ?? "", name: requiredInfo["name"] ?? "", birthDate: requiredInfo["birthDate"] ?? "", @@ -419,13 +418,9 @@ extension CardCreationViewController: UIImagePickerControllerDelegate, UINavigat func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) { if let editedImage = info[UIImagePickerController.InfoKey.editedImage] as? UIImage { newImage = editedImage - } else if let originalImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage { - newImage = originalImage - } - if let cropImage = info[UIImagePickerController.InfoKey.cropRect] as? UIImage { - newImage = cropImage } NotificationCenter.default.post(name: .sendNewImage, object: newImage) + picker.dismiss(animated: true, completion: nil) } }