Refactor/#146 report navigation mvi #176
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| // | ||
| // NavigationIntent.swift | ||
| // Spoony-iOS | ||
| // | ||
| // Created by 최주리 on 1/24/25. | ||
| // | ||
|
|
||
| import Foundation | ||
| import SwiftUI | ||
|
|
||
| enum NavigationIntent { | ||
| case changeTab(TabType) | ||
| case push(ViewType) | ||
| case pop(Int) | ||
| case popToRoot | ||
| case showPopup(PopupType?) | ||
| case changePath([ViewType], TabType) | ||
| case changeCurrentLocation(String?) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // | ||
| // NavigationManager.swift | ||
| // SpoonMe | ||
| // | ||
| // Created by 최주리 on 1/7/25. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| final class NavigationManager: ObservableObject { | ||
| @Published private(set) var state = NavigationState() | ||
|
|
||
| func dispatch(_ intent: NavigationIntent) { | ||
| switch intent { | ||
| case .changeTab(let tab): | ||
| state.selectedTab = tab | ||
| case .push(let nextView): | ||
| push(nextView) | ||
| case .pop(let depth): | ||
| pop(depth) | ||
| case .popToRoot: | ||
| popToRoot() | ||
| case .showPopup(let popup): | ||
| state.popup = popup | ||
| case .changePath(let path, let tab): | ||
| switch tab { | ||
| case .map: | ||
| state.mapPath = path | ||
| case .explore: | ||
| state.explorePath = path | ||
| case .register: | ||
| state.registerPath = path | ||
| } | ||
| case .changeCurrentLocation(let location): | ||
| state.currentLocation = location | ||
| } | ||
| } | ||
|
|
||
| //TODO: 여기 어떻게 할지 생각해보기......... | ||
| @ViewBuilder | ||
| func build(_ view: ViewType) -> some View { | ||
|
|
||
| switch view { | ||
| case .searchView: | ||
| SearchView() | ||
| case .locationView: | ||
| Home() | ||
| case .detailView(let postId): | ||
| DetailView(postId: postId) | ||
| case .report(let postId): | ||
| Report(postId: postId) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension NavigationManager { | ||
| private func push(_ view: ViewType) { | ||
| switch state.selectedTab { | ||
| case .map: | ||
| state.mapPath.append(view) | ||
| case .explore: | ||
| state.explorePath.append(view) | ||
| case .register: | ||
| state.registerPath.append(view) | ||
| } | ||
| } | ||
|
|
||
| private func pop(_ depth: Int) { | ||
| switch state.selectedTab { | ||
| case .map: | ||
| if state.mapPath.isEmpty || state.mapPath.contains(where: { | ||
| if case .locationView = $0 { return true } | ||
| return false | ||
| }) { | ||
| state.currentLocation = nil | ||
| } | ||
| state.mapPath.removeLast(depth) | ||
|
|
||
| case .explore: | ||
| state.explorePath.removeLast(depth) | ||
| case .register: | ||
| state.registerPath.removeLast(depth) | ||
| } | ||
| } | ||
|
|
||
| private func popToRoot() { | ||
| switch state.selectedTab { | ||
| case .map: | ||
| state.mapPath = [] | ||
| case .explore: | ||
| state.explorePath = [] | ||
| case .register: | ||
| state.registerPath = [] | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // | ||
| // NavigationState.swift | ||
| // Spoony-iOS | ||
| // | ||
| // Created by 최주리 on 1/24/25. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct NavigationState { | ||
| var selectedTab: TabType = .map | ||
| var mapPath: [ViewType] = [] | ||
| var explorePath: [ViewType] = [] | ||
| var registerPath: [ViewType] = [] | ||
| var currentLocation: String? | ||
| var popup: PopupType? | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SwiftUI를 import 해야되나요?