Merge pull request #48 from jeongju9216/feature/change-new-goal-style

NewGoalViewController 수정
jeongju9216 · Jun 30, 2023 · 87cbe48 · 87cbe48
2 parents df0469b + 2a414f9
commit 87cbe48
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/...eDayResolution/ThreeDayResolution/Presentation/GoalList/View/GoalListViewController.swift b/...eDayResolution/ThreeDayResolution/Presentation/GoalList/View/GoalListViewController.swift
@@ -73,16 +73,18 @@ final class GoalListViewController: UIViewController {
 
     //MARK: - Methods
     @objc private func goGoalVC() {
-        let goalVC = NewGoalViewController.instantiate
-        navigationController?.pushViewController(goalVC, animated: true)
+        if let goalVC = NewGoalViewController.instantiate as? NewGoalViewController {
+            goalVC.newGoalViewControllerDelegate = self
+            present(goalVC, animated: true)
+        }
     }
 
     @objc private func showInfoVC() {
         let infoVC = InfoViewController()
         present(infoVC, animated: true)
     }
 
-    private func goThreeDayVC(goal: Goal) {
+    func goThreeDayVC(goal: Goal) {
         guard let threeDayVC = ThreeDayViewController.instantiate as? ThreeDayViewController else {
             return
         }
@@ -188,3 +190,8 @@ extension GoalListViewController: UICollectionViewDataSource {
         return headerCell
     }
 }
+
+//MARK: - NewGaolViewControllerDelegate
+extension GoalListViewController: NewGoalViewControllerDelegate {
+
+}
diff --git a/ThreeDayResolution/ThreeDayResolution/Presentation/NewGoal/View/NewGoalViewController.swift b/ThreeDayResolution/ThreeDayResolution/Presentation/NewGoal/View/NewGoalViewController.swift
@@ -7,6 +7,10 @@
 
 import UIKit
 
+protocol NewGoalViewControllerDelegate: AnyObject {
+    func goThreeDayVC(goal: Goal)
+}
+
 final class NewGoalViewController: UIViewController {
 
     //MARK: - Views
@@ -19,6 +23,7 @@ final class NewGoalViewController: UIViewController {
     //MARK: - Properties
     private let viewModel: NewGoalViewModel = NewGoalViewModel(saveUseCase: .init())
     private let maxGoalLength = 15
+    weak var newGoalViewControllerDelegate: NewGoalViewControllerDelegate?
 
     //MARK: - Life Cycle
     override func viewDidLoad() {
@@ -35,7 +40,16 @@ final class NewGoalViewController: UIViewController {
 
     //MARK: - IBActions
     @IBAction func clickedStartButton(_ sender: UIButton) {
-        goThreeDayVC()
+        guard let goalText = goalTextField.text else {
+            return
+        }
+
+        let goal = Goal(goal: goalText, createdAt: Date())
+        saveGoal(with: goal)
+
+        dismiss(animated: true) { [weak self] in
+            self?.newGoalViewControllerDelegate?.goThreeDayVC(goal: goal)
+        }
     }
 
     //MARK: - Setup
@@ -107,20 +121,6 @@ final class NewGoalViewController: UIViewController {
     }
 
     //MARK: - Methods
-    private func goThreeDayVC() {
-        guard let goalText = goalTextField.text,
-              let threeDayVC = ThreeDayViewController.instantiate as? ThreeDayViewController else {
-            return
-        }
-
-        let goal = Goal(goal: goalText, createdAt: .init())
-
-        saveGoal(with: goal)
-
-        threeDayVC.goal = goal
-        navigationController?.pushViewController(threeDayVC, animated: true)
-    }
-
     private func saveGoal(with goal: Goal) {
         viewModel.action(.save(goal))
     }