From bad7d0cf2a60f0c398de137761e909ac18603132 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Thu, 2 Dec 2021 15:45:20 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[FIX]=20=EB=A9=94=EC=9D=B8=EB=B7=B0=20flip?= =?UTF-8?q?=20=EB=94=9C=EB=A0=88=EC=9D=B4=20=ED=95=B4=EA=B2=B0=20=EB=B0=8F?= =?UTF-8?q?=20backCard=20initCell()=20=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - 카드 셀 불투명도 0.5->0.4 변경 --- .../Sources/Cells/CardCell/BackCardCell.xib | 13 +++++++++++++ .../Sources/Cells/CardCell/FrontCardCell.xib | 2 +- .../GroupCell/CardInGroupCollectionViewCell.xib | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib index ee726ef4..06ebc35d 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib @@ -25,6 +25,15 @@ + + + + + + + + + @@ -88,27 +93,27 @@ - + - + + - + - @@ -117,7 +122,6 @@ - @@ -135,6 +139,7 @@ + diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index 1ecfae28..b8f788ff 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift @@ -103,7 +103,14 @@ extension CardCreationPreviewViewController { guard let backCard = BackCardCell.nib().instantiate(withOwner: self, options: nil).first as? BackCardCell else { return } guard let backCardDataModel = backCardDataModel else { return } backCard.frame = CGRect(x: 0, y: 0, width: cardView.frame.width, height: cardView.frame.height) - backCard.initCell(cardBackgroundImage, backCardDataModel.isMincho, !backCardDataModel.isMincho, backCardDataModel.isSoju, !backCardDataModel.isSoju, backCardDataModel.isBoomuk, !backCardDataModel.isBoomuk, backCardDataModel.isSauced, !backCardDataModel.isSauced, backCardDataModel.firstTMI, backCardDataModel.secondTMI, backCardDataModel.thirdTMI) + backCard.initCell(cardBackgroundImage, + backCardDataModel.isMincho, + backCardDataModel.isSoju, + backCardDataModel.isBoomuk, + backCardDataModel.isSauced, + backCardDataModel.firstTMI, + backCardDataModel.secondTMI, + backCardDataModel.thirdTMI) cardView.addSubview(backCard) isFront = false @@ -112,7 +119,14 @@ extension CardCreationPreviewViewController { frontCard.frame = CGRect(x: 0, y: 0, width: cardView.frame.width, height: cardView.frame.height) guard let frontCardDataModel = frontCardDataModel else { return } - frontCard.initCell(cardBackgroundImage, frontCardDataModel.title, frontCardDataModel.description, frontCardDataModel.name, frontCardDataModel.birthDate, frontCardDataModel.mbti, frontCardDataModel.instagramID, frontCardDataModel.linkURL) + frontCard.initCell(cardBackgroundImage, + frontCardDataModel.title, + frontCardDataModel.description, + frontCardDataModel.name, + frontCardDataModel.birthDate, + frontCardDataModel.mbti, + frontCardDataModel.instagramID, + frontCardDataModel.linkURL) cardView.addSubview(frontCard) isFront = true diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index 1d1563ec..8d6ab996 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -193,7 +193,14 @@ extension FrontViewController: VerticalCardSwiperDatasource { guard let backCell = verticalCardSwiperView.dequeueReusableCell(withReuseIdentifier: "BackCardCell", for: index) as? BackCardCell else { return CardCell() } - backCell.initCell(imageList[index], mintImageList[index], noMintImageList[index], sojuImageList[index], beerImageList[index], pourImageList[index], putSauceImageList[index], yangnyumImageList[index], friedImageList[index], firstTmiList[index], secondTmiList[index], thirdTmiLabel[index]) + backCell.initCell(imageList[index], + mintImageList[index], + sojuImageList[index], + pourImageList[index], + yangnyumImageList[index], + firstTmiList[index], + secondTmiList[index], + thirdTmiLabel[index]) return backCell } } From de54db1d11578171b76f47346459fd46aaa4fc3f Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Thu, 2 Dec 2021 16:37:54 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[FIX]=20#107=20-=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=EB=B7=B0=20flip=20=EB=94=9C=EB=A0=88=EC=9D=B4=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20=EB=B0=8F=20backCard=20initCell()=20=EA=B0=84?= =?UTF-8?q?=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - 2차릴리즈/share button 숨겨 --- .../Sources/Cells/CardCell/BackCardCell.swift | 6 ++++++ NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib | 4 ++++ .../Sources/Cells/CardCell/FrontCardCell.swift | 4 ++++ .../Sources/Cells/CardCell/FrontCardCell.xib | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift index 13bc3d65..d53b5d5f 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift @@ -25,12 +25,16 @@ class BackCardCell: CardCell { @IBOutlet weak var firstTmiLabel: UILabel! @IBOutlet weak var secondTmiLabel: UILabel! @IBOutlet weak var thirdTmiLabel: UILabel! + @IBOutlet weak var shareButton: UIButton! // MARK: - View Life Cycle override func awakeFromNib() { super.awakeFromNib() setUI() } + // TODO: - 2차 릴리즈/공유기능 + @IBAction func touchShareButton(_ sender: Any) { + } // MARK: - Functions static func nib() -> UINib { @@ -51,6 +55,8 @@ extension BackCardCell { secondTmiLabel.textColor = .white thirdTmiLabel.font = .textRegular04 thirdTmiLabel.textColor = .white + // TODO: - 2차 릴리즈/공유기능 + shareButton.isHidden = true } /// 서버에서 image 를 URL 로 가져올 경우 사용. diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib index 84fe767c..f889e175 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib @@ -38,6 +38,9 @@ + + + From 97e0403e97832c0489f36fad902f671857a76371 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Fri, 3 Dec 2021 13:17:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]=20#107=20-=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=EB=B7=B0=20flip=20=EB=94=9C=EB=A0=88=EC=9D=B4=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20=EB=B0=8F=20backCard=20initCell()=20=EA=B0=84?= =?UTF-8?q?=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - FrontCardCell 최대 글자수 기준 오토레이아웃 잡기(equal or greater) --- .../Sources/Cells/CardCell/FrontCardCell.xib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib index 384f354d..f6a6334d 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib @@ -100,7 +100,7 @@ - + @@ -119,9 +119,9 @@ - + - +