From 029ff91aeb763971c1b14aaefa881bd22ea7a1f4 Mon Sep 17 00:00:00 2001 From: cchanmi Date: Fri, 15 Jul 2022 01:39:13 +0900 Subject: [PATCH 01/14] =?UTF-8?q?[#49]=20play=20tape=20=EB=B7=B0=EC=BB=A8?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Deartoday/Deartoday.xcodeproj/project.pbxproj | 4 ++++ .../Global/Constant/ViewController.swift | 1 + .../PlayTapeOnboardingViewController.swift | 17 +++++++++++++++++ .../Screen/Onboarding/Onboarding.storyboard | 19 +++++++++++++++++-- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift diff --git a/Deartoday/Deartoday.xcodeproj/project.pbxproj b/Deartoday/Deartoday.xcodeproj/project.pbxproj index 56b72c59..97149f8c 100644 --- a/Deartoday/Deartoday.xcodeproj/project.pbxproj +++ b/Deartoday/Deartoday.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 4A44EEFB28807DC00062420E /* PlayTapeOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A44EEFA28807DC00062420E /* PlayTapeOnboardingViewController.swift */; }; 4A45D37E287F0B2F00592749 /* OpenBoxOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A45D37D287F0B2F00592749 /* OpenBoxOnboardingViewController.swift */; }; 4A45D380287F2BF800592749 /* LetterOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A45D37F287F2BF800592749 /* LetterOnboardingViewController.swift */; }; 4A706264287C079F00140315 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A706263287C079F00140315 /* Onboarding.storyboard */; }; @@ -82,6 +83,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 4A44EEFA28807DC00062420E /* PlayTapeOnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayTapeOnboardingViewController.swift; sourceTree = ""; }; 4A45D37D287F0B2F00592749 /* OpenBoxOnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenBoxOnboardingViewController.swift; sourceTree = ""; }; 4A45D37F287F2BF800592749 /* LetterOnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LetterOnboardingViewController.swift; sourceTree = ""; }; 4A706263287C079F00140315 /* Onboarding.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Onboarding.storyboard; sourceTree = ""; }; @@ -460,6 +462,7 @@ 92DB35652875652F001E2006 /* OnboardingViewController.swift */, 4A45D37D287F0B2F00592749 /* OpenBoxOnboardingViewController.swift */, 4A45D37F287F2BF800592749 /* LetterOnboardingViewController.swift */, + 4A44EEFA28807DC00062420E /* PlayTapeOnboardingViewController.swift */, ); path = Controller; sourceTree = ""; @@ -851,6 +854,7 @@ 92DB356E287565AC001E2006 /* UIScreen+.swift in Sources */, 98B4B5AA287EB54600F4AD7A /* ViewController.swift in Sources */, 98D912D2287DC3590088A7F9 /* CheckMessageDataModel.swift in Sources */, + 4A44EEFB28807DC00062420E /* PlayTapeOnboardingViewController.swift in Sources */, 92DB358A28756B8E001E2006 /* TempAPI.swift in Sources */, 98D912A5287D3B0D0088A7F9 /* DeartodayAlertViewController.swift in Sources */, 92DB356A28756577001E2006 /* DDSTextField.swift in Sources */, diff --git a/Deartoday/Deartoday/Global/Constant/ViewController.swift b/Deartoday/Deartoday/Global/Constant/ViewController.swift index b472bcfb..437b7342 100644 --- a/Deartoday/Deartoday/Global/Constant/ViewController.swift +++ b/Deartoday/Deartoday/Global/Constant/ViewController.swift @@ -13,6 +13,7 @@ extension Constant { static let Onboarding = "OnboardingViewController" static let OpenBoxOnboarding = "OpenBoxOnboardingViewController" static let LetterOnboarding = "LetterOnboardingViewController" + static let PlayTapeOnboarding = "PlayTapeOnboardingViewController" ///메인 static let Main = "MainViewController" diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift new file mode 100644 index 00000000..8a7ed239 --- /dev/null +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -0,0 +1,17 @@ +// +// PlayTapeOnboardingViewController.swift +// Deartoday +// +// Created by 황찬미 on 2022/07/15. +// + +import UIKit + +class PlayTapeOnboardingViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + } + +} diff --git a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard index cff9a1c7..41a56f09 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard +++ b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard @@ -196,7 +196,7 @@ - + @@ -343,7 +343,22 @@ - + + + + + + + + + + + + + + + + From c702a9226bde3f83df862b442c103c0c77d639af Mon Sep 17 00:00:00 2001 From: cchanmi Date: Fri, 15 Jul 2022 01:50:10 +0900 Subject: [PATCH 02/14] =?UTF-8?q?[#49]=20=EC=84=A4=EB=AA=85=20label=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 --- .../PlayTapeOnboardingViewController.swift | 12 +++++++++- .../Screen/Onboarding/Onboarding.storyboard | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index 8a7ed239..1f0e6b52 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -8,10 +8,20 @@ import UIKit class PlayTapeOnboardingViewController: UIViewController { - + + // MARK: - UI Property + + @IBOutlet weak var explanationLabel: UILabel! + + // MARK: - Life Cycle + override func viewDidLoad() { super.viewDidLoad() } + + // MARK: - @objc + + // MARK: - Custom Method } diff --git a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard index 41a56f09..45265a5c 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard +++ b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard @@ -352,9 +352,32 @@ + + + + + + + + + + + + + + + + + + @@ -367,6 +390,7 @@ + From 134522fc5274b398c923748326cab6e01cd1c475 Mon Sep 17 00:00:00 2001 From: cchanmi Date: Fri, 15 Jul 2022 03:41:20 +0900 Subject: [PATCH 03/14] =?UTF-8?q?[#49]=20=ED=85=8C=EC=9D=B4=ED=94=84=20?= =?UTF-8?q?=EC=98=A8=EB=B3=B4=EB=94=A9=20=ED=99=94=EB=A9=B4=20=EC=A0=84?= =?UTF-8?q?=ED=99=98=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/LetterOnboardingViewController.swift | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift index 2a8c945c..e42bf3ac 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift @@ -45,6 +45,17 @@ final class LetterOnboardingViewController: UIViewController { } } + // MARK: - IBAction + + @IBAction func checkPlayerButtonDidTap(_ sender: UIButton) { + guard let playTapeOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.PlayTapeOnboarding) as? PlayTapeOnboardingViewController else { return } + playTapeOnboarding.modalTransitionStyle = .crossDissolve + playTapeOnboarding.modalPresentationStyle = .fullScreen + present(playTapeOnboarding, animated: true) + } + + // MARK: - Animation function + private func setLayout() { letterTopConstraint.constant = (getDeviceHeight() == 667) ? 100 : 160 dearLabelTopConstraint.constant = (getDeviceHeight() == 667) ? -58 : -64 From bae206ce4efa86e8fb689bac0f2bf92f0e393f6c Mon Sep 17 00:00:00 2001 From: cchanmi Date: Fri, 15 Jul 2022 04:25:36 +0900 Subject: [PATCH 04/14] =?UTF-8?q?[#49]=20Components=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayTapeOnboardingViewController.swift | 24 +++- .../Screen/Onboarding/Onboarding.storyboard | 114 +++++++++++++----- 2 files changed, 101 insertions(+), 37 deletions(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index 1f0e6b52..e81448eb 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -7,21 +7,35 @@ import UIKit -class PlayTapeOnboardingViewController: UIViewController { +final class PlayTapeOnboardingViewController: UIViewController { // MARK: - UI Property @IBOutlet weak var explanationLabel: UILabel! + @IBOutlet weak var circleButton: UIImageView! + @IBOutlet weak var tapeButton: UIButton! + @IBOutlet var circleCollection: [UIView]! // MARK: - Life Cycle override func viewDidLoad() { super.viewDidLoad() - + setComponentsUI() } - // MARK: - @objc - // MARK: - Custom Method - + + private func setComponentsUI() { + circleCollection.forEach { + $0.layer.cornerRadius = $0.frame.width / 2 + } + explanationLabel.font = .onboard0 + explanationLabel.textColor = .white + } + + // MARK: IBAction + + @IBAction func tapeButtonDidTap(_ sender: UIButton) { + guard let LetterOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.LetterOnboarding) as? + } } diff --git a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard index 45265a5c..0bd10bf7 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard +++ b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard @@ -1,6 +1,6 @@ - - + + @@ -11,34 +11,34 @@ - + - + - + From 059267dd3d1dd24d0fc9f624244ae9af19ec4786 Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 16:26:49 +0900 Subject: [PATCH 09/14] =?UTF-8?q?[#49]=20=ED=8E=B8=EC=A7=80=EC=A7=80=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=A0=84=ED=99=98=20=EB=B6=84=EA=B8=B0=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/LetterOnboardingViewController.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift index 1bde7d66..c2e08936 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift @@ -89,7 +89,11 @@ final class LetterOnboardingViewController: UIViewController { setThirdInitAnimation() } else { - print("나나나") + guard let playTapeOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.PlayTapeOnboarding) as? PlayTapeOnboardingViewController else { return } + playTapeOnboarding.modalTransitionStyle = .crossDissolve + playTapeOnboarding.modalPresentationStyle = .fullScreen + playTapeOnboarding.playTapeNumber = 1 + present(playTapeOnboarding, animated: true) } } // MARK: - Animation function From dfc787c1e14cce116681502f3ff7b25847b3928b Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 16:29:32 +0900 Subject: [PATCH 10/14] =?UTF-8?q?[#49]=20=ED=94=8C=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EC=9E=91=EB=8F=99=ED=95=98=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=99=94=EB=A9=B4=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayTapeOnboardingViewController.swift | 36 +++++++++++++++++-- .../Screen/Onboarding/Onboarding.storyboard | 16 +++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index a9182ad7..fbea9d67 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -9,18 +9,27 @@ import UIKit final class PlayTapeOnboardingViewController: UIViewController { + // MARK: - Property + + var playTapeNumber: Int? + // MARK: - UI Property @IBOutlet weak var explanationLabel: UILabel! @IBOutlet weak var circleButton: UIImageView! @IBOutlet weak var tapeButton: UIButton! @IBOutlet var circleCollection: [UIView]! + @IBOutlet weak var startPlayerButton: UIButton! // MARK: - Life Cycle override func viewDidLoad() { super.viewDidLoad() setComponentsUI() + if playTapeNumber == 1 { + hideComponentsUI() + showComponentsUI() + } } // MARK: - Custom Method @@ -31,16 +40,27 @@ final class PlayTapeOnboardingViewController: UIViewController { } explanationLabel.font = .onboard0 explanationLabel.textColor = .white + startPlayerButton.titleLabel?.font = .btn0 + startPlayerButton.setTitleColor(.blue02, for: .normal) } - // MARK: IBAction + private func showComponentsUI() { + startPlayerButton.alpha = 1 + } - @IBAction func tapeButtonDidTap(_ sender: UIButton) { + private func hideComponentsUI() { circleCollection.forEach { $0.isHidden = true } explanationLabel.isHidden = true circleButton.isHidden = true + startPlayerButton.isHidden = true + } + + // MARK: IBAction + + @IBAction func tapeButtonDidTap(_ sender: UIButton) { + hideComponentsUI() guard let letterOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.LetterOnboarding) as? LetterOnboardingViewController else { return } letterOnboarding.modalTransitionStyle = .crossDissolve @@ -48,4 +68,16 @@ final class PlayTapeOnboardingViewController: UIViewController { letterOnboarding.letterNumber = 2 present(letterOnboarding, animated: true) } + + @IBAction func playLottieButtonDidTap(_ sender: UIButton) { + print("로티 재생 후") + + guard let letterOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.LetterOnboarding) as? LetterOnboardingViewController else { return } + letterOnboarding.modalTransitionStyle = .crossDissolve + letterOnboarding.modalPresentationStyle = .overFullScreen + letterOnboarding.letterNumber = 4 + present(letterOnboarding, animated: true) + } + + } diff --git a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard index f661848c..94a547f1 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard +++ b/Deartoday/Deartoday/Screen/Onboarding/Onboarding.storyboard @@ -389,7 +389,7 @@ - + @@ -443,6 +443,14 @@ + @@ -456,9 +464,12 @@ + + + @@ -467,6 +478,7 @@ + @@ -474,7 +486,7 @@ - + From af6454d0d81fdbbd109dbfe37db11cb23c71877b Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 16:31:52 +0900 Subject: [PATCH 11/14] =?UTF-8?q?[#49]=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/LetterOnboardingViewController.swift | 12 ++++++------ .../PlayTapeOnboardingViewController.swift | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift index c2e08936..c15850e5 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift @@ -52,6 +52,11 @@ final class LetterOnboardingViewController: UIViewController { dearLabel.textColor = .blue02 } + private func setLayout() { + letterTopConstraint.constant = (getDeviceHeight() == 667) ? 100 : 160 + dearLabelTopConstraint.constant = (getDeviceHeight() == 667) ? -58 : -64 + } + private func setFirstInitAnimation() { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { self.setFirstComponentsAnimation() @@ -81,12 +86,12 @@ final class LetterOnboardingViewController: UIViewController { @IBAction func nextButtonDidTap(_ sender: UIButton) { nextButtonNumber += 1 + if nextButtonNumber == 1 { letterLabelCollection[5...6].forEach { $0.alpha = 0 } nextButtonCollection[1].alpha = 0 - setThirdInitAnimation() } else { guard let playTapeOnboarding = UIStoryboard(name: Constant.Storyboard.Onboarding, bundle: nil).instantiateViewController(withIdentifier: Constant.ViewController.PlayTapeOnboarding) as? PlayTapeOnboardingViewController else { return } @@ -98,11 +103,6 @@ final class LetterOnboardingViewController: UIViewController { } // MARK: - Animation function - private func setLayout() { - letterTopConstraint.constant = (getDeviceHeight() == 667) ? 100 : 160 - dearLabelTopConstraint.constant = (getDeviceHeight() == 667) ? -58 : -64 - } - private func setFirstComponentsAnimation() { UIView.animate(withDuration: 0.6, animations: { self.dearLabel.alpha = 1 diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index fbea9d67..024a2dc3 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -78,6 +78,4 @@ final class PlayTapeOnboardingViewController: UIViewController { letterOnboarding.letterNumber = 4 present(letterOnboarding, animated: true) } - - } From bfb8a0d49bba366ecba898d4a1365048c79587bd Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 16:54:59 +0900 Subject: [PATCH 12/14] =?UTF-8?q?[#49]=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PlayTapeOnboardingViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index 024a2dc3..240a4a39 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -18,8 +18,8 @@ final class PlayTapeOnboardingViewController: UIViewController { @IBOutlet weak var explanationLabel: UILabel! @IBOutlet weak var circleButton: UIImageView! @IBOutlet weak var tapeButton: UIButton! - @IBOutlet var circleCollection: [UIView]! @IBOutlet weak var startPlayerButton: UIButton! + @IBOutlet var circleCollection: [UIView]! // MARK: - Life Cycle From 194f8beccc79d5b5d18dee9b88b9ccc89923db4b Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 17:22:24 +0900 Subject: [PATCH 13/14] =?UTF-8?q?[#49]=20viewDidLoad=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LetterOnboardingViewController.swift | 19 ++++++++++++------- .../PlayTapeOnboardingViewController.swift | 13 ++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift index c15850e5..0e210f0f 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/LetterOnboardingViewController.swift @@ -28,13 +28,7 @@ final class LetterOnboardingViewController: UIViewController { super.viewDidLoad() setLabelUI() setLayout() - if letterNumber == 1 { - setFirstInitAnimation() - } else if letterNumber == 2 { - setSecondInitAnimation() - } else if letterNumber == 4 { - print("네번째 온보딩 편지") - } + setAnimation() } // MARK: - Custom Method @@ -57,6 +51,16 @@ final class LetterOnboardingViewController: UIViewController { dearLabelTopConstraint.constant = (getDeviceHeight() == 667) ? -58 : -64 } + private func setAnimation() { + if letterNumber == 1 { + setFirstInitAnimation() + } else if letterNumber == 2 { + setSecondInitAnimation() + } else if letterNumber == 4 { + print("네번째 온보딩 편지") + } + } + private func setFirstInitAnimation() { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { self.setFirstComponentsAnimation() @@ -101,6 +105,7 @@ final class LetterOnboardingViewController: UIViewController { present(playTapeOnboarding, animated: true) } } + // MARK: - Animation function private func setFirstComponentsAnimation() { diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index 240a4a39..98d41bbc 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -26,10 +26,7 @@ final class PlayTapeOnboardingViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() setComponentsUI() - if playTapeNumber == 1 { - hideComponentsUI() - showComponentsUI() - } + setPlayerButtonUI() } // MARK: - Custom Method @@ -54,7 +51,13 @@ final class PlayTapeOnboardingViewController: UIViewController { } explanationLabel.isHidden = true circleButton.isHidden = true - startPlayerButton.isHidden = true + } + + private func setPlayerButtonUI() { + if playTapeNumber == 1 { + hideComponentsUI() + showComponentsUI() + } } // MARK: IBAction From 5bf458a5cb65e1336084fd84bae1306e57f5a986 Mon Sep 17 00:00:00 2001 From: cchanmi Date: Sat, 16 Jul 2022 17:25:18 +0900 Subject: [PATCH 14/14] =?UTF-8?q?[#49]=20button=20hidden=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Onboarding/Controller/PlayTapeOnboardingViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift index 98d41bbc..b25cf21b 100644 --- a/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift +++ b/Deartoday/Deartoday/Screen/Onboarding/Controller/PlayTapeOnboardingViewController.swift @@ -49,6 +49,7 @@ final class PlayTapeOnboardingViewController: UIViewController { circleCollection.forEach { $0.isHidden = true } + tapeButton.isHidden = true explanationLabel.isHidden = true circleButton.isHidden = true }