🐛 SearchMusic에 대한 잘못된 흐름을 수정

boostcampwm2023 · Nov 30, 2023 · ef74cfc · ef74cfc
1 parent 3446a9f
commit ef74cfc
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 83 deletions.
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/AppCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/AppCoordinator.swift
@@ -37,19 +37,3 @@ final class AppCoordinator: Coordinator {
     }
 
 }
-
-// MARK: - App Coordinator
-
-extension AppCoordinator: AppCoordinatorDelegate {
-
-    func popToHomeMap(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.start()
-    }
-
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popToRootViewController(animated: true)
-    }
-
-}
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/HomeMapCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/HomeMapCoordinator.swift
@@ -7,6 +7,12 @@
 
 import UIKit
 
+protocol HomeMapCoordinatorDelegate: AnyObject {
+
+    func popToHomeMap(from coordinator: Coordinator)
+
+}
+
 final class HomeMapCoordinator: Coordinator {
 
     // MARK: - Properties
@@ -39,35 +45,40 @@ extension HomeMapCoordinator: HomeMapViewControllerDelegate {
 
     func navigateToSpot() {
         let spotCoordinator = SpotCoordinator(navigationController: self.navigationController)
+        spotCoordinator.delegate = self
         self.childCoordinators.append(spotCoordinator)
         spotCoordinator.start()
     }
 
+    func navigateToSearchMusic() {
+        let searchMusicCoordinator = SearchMusicCoordinator(navigationController: self.navigationController)
+        searchMusicCoordinator.delegate = self
+        self.childCoordinators.append(searchMusicCoordinator)
+        searchMusicCoordinator.start()
+    }
+
     func navigateToRewind() {
         let rewindCoordinator = RewindCoordinator(navigationController: self.navigationController)
+        rewindCoordinator.delegate = self
         self.childCoordinators.append(rewindCoordinator)
         rewindCoordinator.start()
     }
 
     func navigateToSetting() {
         let settingCoordinator = SettingCoordinator(navigationController: self.navigationController)
+        settingCoordinator.delegate = self
         self.childCoordinators.append(settingCoordinator)
         settingCoordinator.start()
     }
 
 }
 
-// MARK: - App Coordinator
+// MARK: - HomeMap Coordinator
 
-extension HomeMapCoordinator: AppCoordinatorDelegate {
+extension HomeMapCoordinator: HomeMapCoordinatorDelegate {
 
     func popToHomeMap(from coordinator: Coordinator) {
         self.childCoordinators.removeAll()
     }
 
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToSearchMusic(from: self)
-    }
 }
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/RewindCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/RewindCoordinator.swift
@@ -15,7 +15,7 @@ final class RewindCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    var delegate: AppCoordinatorDelegate?
+    var delegate: HomeMapCoordinatorDelegate?
 
     // MARK: - Initializer
 
@@ -43,20 +43,14 @@ extension RewindCoordinator: RewindViewControllerDelegate {
 
 }
 
-// MARK: - App Coordinator
+// MARK: - HomeMap Coordinator
 
-extension RewindCoordinator: AppCoordinatorDelegate {
+extension RewindCoordinator: HomeMapCoordinatorDelegate {
 
     func popToHomeMap(from coordinator: Coordinator) {
         self.childCoordinators.removeAll()
         self.navigationController.popViewController(animated: true)
         self.delegate?.popToHomeMap(from: self)
     }
 
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToSearchMusic(from: self)
-    }
-
 }
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/SaveJourneyCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/SaveJourneyCoordinator.swift
@@ -15,7 +15,7 @@ final class SaveJourneyCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    var delegate: AppCoordinatorDelegate?
+    var delegate: SearchMusicCoordinatorDelegate?
 
     // MARK: - Initializer
 
@@ -46,21 +46,3 @@ extension SaveJourneyCoordinator: SaveJourneyViewControllerDelegate {
     }
 
 }
-
-// MARK: - App Coordinator
-
-extension SaveJourneyCoordinator: AppCoordinatorDelegate {
-
-    func popToHomeMap(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToHomeMap(from: self)
-    }
-
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToSearchMusic(from: self)
-    }
-
-}
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/SearchMusicCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/SearchMusicCoordinator.swift
@@ -7,6 +7,13 @@
 
 import UIKit
 
+protocol SearchMusicCoordinatorDelegate {
+
+    func popToHomeMap(from coordinator: Coordinator)
+    func popToSearchMusic(from coordinator: Coordinator)
+
+}
+
 final class SearchMusicCoordinator: Coordinator {
 
     // MARK: - Properties
@@ -15,7 +22,7 @@ final class SearchMusicCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    var delegate: AppCoordinatorDelegate?
+    var delegate: HomeMapCoordinatorDelegate?
 
     // MARK: - Initializer
 
@@ -43,6 +50,7 @@ extension SearchMusicCoordinator: SearchMusicViewControllerDelegate {
 
     func navigateToSaveJourney() {
         let saveJourneyCoordinator = SaveJourneyCoordinator(navigationController: self.navigationController)
+        saveJourneyCoordinator.delegate = self
         self.childCoordinators.append(saveJourneyCoordinator)
         saveJourneyCoordinator.start()
     }
@@ -51,7 +59,7 @@ extension SearchMusicCoordinator: SearchMusicViewControllerDelegate {
 
 // MARK: - App Coordinator
 
-extension SearchMusicCoordinator: AppCoordinatorDelegate {
+extension SearchMusicCoordinator: SearchMusicCoordinatorDelegate {
 
     func popToHomeMap(from coordinator: Coordinator) {
         self.childCoordinators.removeAll()

diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/SettingCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/SettingCoordinator.swift
@@ -15,7 +15,7 @@ final class SettingCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    var delegate: AppCoordinatorDelegate?
+    var delegate: HomeMapCoordinatorDelegate?
 
     // MARK: - Initializer
 
@@ -43,20 +43,14 @@ extension SettingCoordinator: SettingViewControllerDelegate {
 
 }
 
-// MARK: - App Coordinator
+// MARK: - HomeMap Coordinator
 
-extension SettingCoordinator: AppCoordinatorDelegate {
+extension SettingCoordinator: HomeMapCoordinatorDelegate {
 
     func popToHomeMap(from coordinator: Coordinator) {
         self.childCoordinators.removeAll()
         self.navigationController.popViewController(animated: true)
         self.delegate?.popToHomeMap(from: self)
     }
 
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToSearchMusic(from: self)
-    }
-
 }
diff --git a/iOS/MusicSpot/MusicSpot/MSCoordinator/SpotCoordinator.swift b/iOS/MusicSpot/MusicSpot/MSCoordinator/SpotCoordinator.swift
@@ -15,7 +15,7 @@ final class SpotCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    var delegate: AppCoordinatorDelegate?
+    var delegate: HomeMapCoordinatorDelegate?
 
     // MARK: - Initializer
 
@@ -41,28 +41,16 @@ extension SpotCoordinator: SpotViewControllerDelegate {
         self.delegate?.popToHomeMap(from: self)
     }
 
-    func navigateToSearchMusic() {
-        let searchMusicCoordinator = SearchMusicCoordinator(navigationController: self.navigationController)
-        self.childCoordinators.append(searchMusicCoordinator)
-        searchMusicCoordinator.start()
-    }
-
 }
 
-// MARK: - App Coordinator
+// MARK: - HomeMap Coordinator
 
-extension SpotCoordinator: AppCoordinatorDelegate {
+extension SpotCoordinator: HomeMapCoordinatorDelegate {
 
     func popToHomeMap(from coordinator: Coordinator) {
         self.childCoordinators.removeAll()
         self.navigationController.popViewController(animated: true)
         self.delegate?.popToHomeMap(from: self)
     }
 
-    func popToSearchMusic(from coordinator: Coordinator) {
-        self.childCoordinators.removeAll()
-        self.navigationController.popViewController(animated: true)
-        self.delegate?.popToSearchMusic(from: self)
-    }
-
 }
diff --git a/iOS/MusicSpot/MusicSpot/TempViewController/HomeMapViewController.swift b/iOS/MusicSpot/MusicSpot/TempViewController/HomeMapViewController.swift
@@ -9,6 +9,7 @@ import UIKit
 
 protocol HomeMapViewControllerDelegate: AnyObject {
     func navigateToSpot()
+    func navigateToSearchMusic()
     func navigateToRewind()
     func navigateToSetting()
 }

diff --git a/iOS/MusicSpot/MusicSpot/TempViewController/SpotViewController.swift b/iOS/MusicSpot/MusicSpot/TempViewController/SpotViewController.swift
@@ -9,7 +9,6 @@ import UIKit
 
 protocol SpotViewControllerDelegate: AnyObject {
     func navigateToHomeMap()
-    func navigateToSearchMusic()
 }
 
 class SpotViewController: UIViewController {
@@ -45,6 +44,12 @@ class SpotViewController: UIViewController {
         self.configureStyle()
         self.configureLayout()
     }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+
+        self.delegate?.navigateToHomeMap()
+    }
 
     // MARK: - Functions
 
@@ -77,10 +82,5 @@ class SpotViewController: UIViewController {
     func navigateToHomeMap() {
         self.delegate?.navigateToHomeMap()
     }
-
-    @objc
-    func navigateToSearchMusic() {
-        self.delegate?.navigateToSearchMusic()
-    }
 
 }