From 2b68ccc806daec41e80368d73695d15f3e804527 Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 28 Feb 2024 00:13:56 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix=20[#348]=20=EC=98=90=EB=A1=9C=20?= =?UTF-8?q?=ED=94=8C=EB=9F=AC=EC=8A=A4=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EA=B4=91=EA=B3=A0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VotingPoint/VotingPointViewController.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift index 52d0e2a5..a73689ef 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift @@ -61,15 +61,15 @@ final class VotingPointViewController: BaseViewController { multiplyByTwoImageView.isHidden = false } else { multiplyByTwoImageView.isHidden = true + if isWatchAd { + adButtonStackView.isHidden = true + originView.yellowButton.isHidden = false + } else { + adButtonStackView.isHidden = false + originView.yellowButton.isHidden = true + } } - if isWatchAd { - adButtonStackView.isHidden = true - originView.yellowButton.isHidden = false - } else { - adButtonStackView.isHidden = false - originView.yellowButton.isHidden = true - } } // MARK: - Style From 22f7c52e043a1ad494ad639917a76a7f6a9c7856 Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 28 Feb 2024 00:45:47 +0900 Subject: [PATCH 2/5] =?UTF-8?q?Fix=20[#348]=20=EB=B7=B0=EC=97=90=20?= =?UTF-8?q?=EC=A0=9C=EC=8A=A4=EC=B3=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Payment/Button/PaymentNameKeyButton.swift | 2 ++ .../Payment/ViewController/PaymentPlusViewController.swift | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift index c4b3bd4b..a5c76042 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift @@ -58,6 +58,7 @@ final class PaymentNameKeyButton: UIButton { self.backgroundColor = .black infoContainerView.do { + $0.isUserInteractionEnabled = true $0.makeBorder(width: 1, color: .purpleSub700) $0.makeCornerRound(radius: 10.adjustedHeight) } @@ -72,6 +73,7 @@ final class PaymentNameKeyButton: UIButton { } priceView.do { + $0.isUserInteractionEnabled = true $0.makeCornerRound(radius: 15.adjustedHeight) $0.applyGradientBackground(topColor: UIColor(hex: "D96AFF"), bottomColor: UIColor(hex: "7C57FF"), startPointY: 0.5, endPointY: 0.5) $0.isUserInteractionEnabled = false diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift index bd98f2d2..261dd2af 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift @@ -145,6 +145,11 @@ final class PaymentPlusViewController: BaseViewController { paymentPlusView.nameKeyOneButton.addTarget(self, action: #selector(paymentNameKeyOneButtonTapped), for: .touchUpInside) paymentPlusView.nameKeyTwoButton.addTarget(self, action: #selector(paymentNameKeyTwoButtonTapped), for: .touchUpInside) paymentPlusView.nameKeyFiveButton.addTarget(self, action: #selector(paymentNameKeyFiveButtonTapped), for: .touchUpInside) + + paymentPlusView.nameKeyOneButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyOneButtonTapped))) + paymentPlusView.nameKeyTwoButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyTwoButtonTapped))) + paymentPlusView.nameKeyFiveButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyFiveButtonTapped))) + paymentPlusView.serviceButton.addTarget(self, action: #selector(serviceButtonTapped), for: .touchUpInside) paymentPlusView.privacyButton.addTarget(self, action: #selector(privacyButtonTapped), for: .touchUpInside) paymentPlusView.votingPointButton.addTarget(self, action: #selector(votingPointButtonTapped), for: .touchUpInside) From fa9c15cd0af1879be0f06a4035f2bf102cd1e693 Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 28 Feb 2024 01:02:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?Fix=20[#348]=20=EC=97=B4=EB=9E=8C=EA=B6=8C?= =?UTF-8?q?=20=EA=B0=9C=EC=88=98=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/MyYello/Detail/View/MyYelloDetailView.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift b/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift index 34d33113..0804af3c 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift @@ -495,8 +495,7 @@ extension MyYelloDetailView { if self.indexNumber != -1 { MyYelloListView.myYelloModelDummy[self.indexNumber].nameHint = -2 } - - + UserManager.shared.userTicketCount -= 1 if !self.isKeywordUsed { Amplitude.instance().logEvent("view_open_fullnamefirst") } else { From 5e78b150b85616663a94ddd0bc8aea2356698222 Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 28 Feb 2024 01:08:21 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20[#348]=20=ED=84=B0=EC=B9=98=20?= =?UTF-8?q?=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Payment/Button/PaymentNameKeyButton.swift | 3 +-- .../YELLO-iOS/Presentation/Payment/Button/PointButton.swift | 3 ++- .../Payment/ViewController/PaymentPlusViewController.swift | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift index a5c76042..8d39aba6 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift @@ -58,7 +58,7 @@ final class PaymentNameKeyButton: UIButton { self.backgroundColor = .black infoContainerView.do { - $0.isUserInteractionEnabled = true + $0.isUserInteractionEnabled = false $0.makeBorder(width: 1, color: .purpleSub700) $0.makeCornerRound(radius: 10.adjustedHeight) } @@ -73,7 +73,6 @@ final class PaymentNameKeyButton: UIButton { } priceView.do { - $0.isUserInteractionEnabled = true $0.makeCornerRound(radius: 15.adjustedHeight) $0.applyGradientBackground(topColor: UIColor(hex: "D96AFF"), bottomColor: UIColor(hex: "7C57FF"), startPointY: 0.5, endPointY: 0.5) $0.isUserInteractionEnabled = false diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift index b668e3cd..24fbb08a 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift @@ -51,7 +51,6 @@ final class PointButton: UIButton { self.makeBorder(width: 1, color: .purpleSub700) self.makeCornerRound(radius: 10.adjustedHeight) self.backgroundColor = .black - self.isUserInteractionEnabled = true pointImageView.do { $0.image = ImageLiterals.Payment.imgCoin @@ -72,11 +71,13 @@ final class PointButton: UIButton { $0.spacing = 0 $0.alignment = .leading $0.addArrangedSubviews(pointTitleLabel, subTitleLabel) + $0.isUserInteractionEnabled = false } pointLabel.do { $0.textColor = .white $0.font = .uiBodyMedium + $0.isUserInteractionEnabled = false } } diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift index 261dd2af..bd98f2d2 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Payment/ViewController/PaymentPlusViewController.swift @@ -145,11 +145,6 @@ final class PaymentPlusViewController: BaseViewController { paymentPlusView.nameKeyOneButton.addTarget(self, action: #selector(paymentNameKeyOneButtonTapped), for: .touchUpInside) paymentPlusView.nameKeyTwoButton.addTarget(self, action: #selector(paymentNameKeyTwoButtonTapped), for: .touchUpInside) paymentPlusView.nameKeyFiveButton.addTarget(self, action: #selector(paymentNameKeyFiveButtonTapped), for: .touchUpInside) - - paymentPlusView.nameKeyOneButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyOneButtonTapped))) - paymentPlusView.nameKeyTwoButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyTwoButtonTapped))) - paymentPlusView.nameKeyFiveButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(paymentNameKeyFiveButtonTapped))) - paymentPlusView.serviceButton.addTarget(self, action: #selector(serviceButtonTapped), for: .touchUpInside) paymentPlusView.privacyButton.addTarget(self, action: #selector(privacyButtonTapped), for: .touchUpInside) paymentPlusView.votingPointButton.addTarget(self, action: #selector(votingPointButtonTapped), for: .touchUpInside) From 0fde66e70957a7933c05d5c38bb7bcdaafa97b71 Mon Sep 17 00:00:00 2001 From: Zoe Date: Wed, 28 Feb 2024 01:20:59 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Fix=20[#348]=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Voting/VotingPoint/VotingPointViewController.swift | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift index a73689ef..fe61b600 100644 --- a/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift +++ b/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift @@ -61,13 +61,8 @@ final class VotingPointViewController: BaseViewController { multiplyByTwoImageView.isHidden = false } else { multiplyByTwoImageView.isHidden = true - if isWatchAd { - adButtonStackView.isHidden = true - originView.yellowButton.isHidden = false - } else { - adButtonStackView.isHidden = false - originView.yellowButton.isHidden = true - } + adButtonStackView.isHidden = isWatchAd + originView.yellowButton.isHidden = !isWatchAd } }