[feat]#2 매니저와 뷰모델, 서비스 파일 분리

- 두번 빠구먹고 성공했습니다
- VoiceSearchViewModel과 MainSearchViewModel이 같은 Manager를 구성하도록 수정했습니다

Author: ela-lee

BusRoad/Feature/MainSearch/MainSearchView.swift

@@ -2,35 +2,36 @@ import SwiftUI
 
 struct MainSearchView: View {
     @EnvironmentObject private var coordinator: NavigationCoordinator
-    @ObservedObject private var vm = MainSearchViewModel.shared
-    
+    @StateObject private var vm = MainSearchViewModel()
+
     @State private var hasSubmitted = false
     @State private var isSearchMode = false
-    @State private var suppressKeyboardOnce = false
     @FocusState private var isFocused: Bool
-    
+
     var body: some View {
         Group {
             if isSearchMode {
                 SearchModeSection(
-                    query: $vm.query,
+                    query: Binding(get: { vm.query }, set: { vm.query = $0 }),
                     results: vm.results,
                     isFocused: $isFocused,
                     onBack: { exitSearchMode() },
                     onSubmit: { performSearch() },
                     onClear: { clearSearch() },
                     onMicTap: {
                         isFocused = false
-                        coordinator.push(.voiceSearch)}
+                        coordinator.push(.voiceSearch)
+                    }
                 )
             } else {
                 IntroSection(
-                    query: $vm.query,
+                    query: Binding(get: { vm.query }, set: { vm.query = $0 }),
                     isFocused: $isFocused,
                     onSubmit: { performSearch() },
                     onMicTap: {
                         isFocused = false
-                        coordinator.push(.voiceSearch) },
+                        coordinator.push(.voiceSearch)
+                    },
                     onClear: { clearSearch() }
                 )
             }
@@ -45,6 +46,7 @@ struct MainSearchView: View {
                 DispatchQueue.main.async { isFocused = true }
             }
         }
+        // ✅ SearchManager가 올린 전환 신호 감시
         .onChange(of: vm.shouldShowSearchMode) { _, show in
             if show {
                 isSearchMode = true
@@ -53,32 +55,28 @@ struct MainSearchView: View {
             }
         }
     }
-}
 
-// MARK: - Helpers
-private extension MainSearchView {
+    // MARK: - Helpers
     @MainActor func exitSearchMode() {
         isSearchMode = false
         isFocused = false
         hasSubmitted = false
         vm.query = ""
-        vm.results = []
+        // vm.results는 매니저가 관리하니 굳이 초기화 필요 없음
     }
-    
+
     @MainActor func performSearch() {
         isSearchMode = true
         hasSubmitted = true
-        Task { await vm.search() } // vm이 내부에서 메인 업데이트하도록 설계 권장
+        Task { await vm.search() }
     }
-    
+
     @MainActor func clearSearch() {
         vm.query = ""
-        vm.results = []
         hasSubmitted = false
         isFocused = true
     }
 }
-
 //#Preview {
 //    MainSearchView()
 //        .environmentObject(NavigationCoordinator())

BusRoad/Feature/MainSearch/MainSearchViewModel.swift

@@ -4,51 +4,27 @@ import Foundation
 @MainActor
 final class MainSearchViewModel: ObservableObject {
 
-    static let shared = MainSearchViewModel()
-    
-    @Published var query: String = ""
-    @Published var results: [NaverLocalItem] = []
-    @Published var isLoading = false
-    @Published var errorMessage: String?
-    @Published var shouldShowSearchMode = false // 음성 검색 완료 후 검색 모드 표시용
-    @Published var isFromVoiceSearch = false
-
-    private let manager: PlaceSearchManager
-
-    private init(manager: PlaceSearchManager = PlaceSearchManager()) {
-            self.manager = manager
-        }
-
-    /// 엔터/버튼에서 호출
-    func search() async {
-        errorMessage = nil
-        let kw = query.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !kw.isEmpty else { results = []; return }
-
-        isLoading = true
-        defer { isLoading = false }
+    let searchManager = SearchManager.shared
 
-        do {
-            results = try await manager.search(keyword: kw, display: 5, sort: "random")
-        } catch {
-            errorMessage = error.localizedDescription
-            results = []
-        }
+    // SearchManager의 변경을 View로 릴레이 (UI 갱신 보장)
+    private var bag = Set<AnyCancellable>()
+    init() {
+        searchManager.objectWillChange
+            .sink { [weak self] _ in self?.objectWillChange.send() }
+            .store(in: &bag)
     }
-    
-    /// 음성 검색 완료 처리 (검색어 설정 + 검색 실행 + 모드 전환)
-    func searchWithVoiceResult(_ text: String) async {
-        query = text
-        
-        isFromVoiceSearch = true
-        shouldShowSearchMode = true
 
-        await search()
-    }
-    
-    /// 검색 모드 상태 초기화
-    func resetSearchMode() {
-        shouldShowSearchMode = false
-        isFromVoiceSearch = false
+    // 뷰에서 쓰기 편한 프록시
+    var query: String {
+        get { searchManager.query }
+        set { searchManager.query = newValue }
     }
+    var results: [NaverLocalItem] { searchManager.results }
+    var shouldShowSearchMode: Bool { searchManager.shouldShowSearchMode }
+    var isLoading: Bool { searchManager.isLoading }
+    var errorMessage: String? { searchManager.errorMessage }
+
+  
+    func search() async { await searchManager.search() }
+    func resetSearchMode() { searchManager.resetSearchMode() }
 }

BusRoad/Feature/VoiceSearch/VoiceSearchView.swift

@@ -4,23 +4,23 @@ struct VoiceSearchView: View {
     @EnvironmentObject private var coordinator: NavigationCoordinator
     @StateObject var vm = VoiceSearchViewModel()
     @Environment(\.dismiss) private var dismiss
-    
+
     var onSearchCompleted: ((String) -> Void)? = nil
-    
+
     var body: some View {
         ZStack {
             backgroundGradient
-            
+
             VStack {
                 Spacer()
-                
+
                 Text(vm.centerMessage)
                     .font(.title2.weight(.medium))
                     .foregroundColor(.white)
                     .multilineTextAlignment(.center)
-                
+
                 Spacer()
-                
+
                 ZStack {
                     if vm.showWaveAnimation {
                         WaveRingsView()
@@ -36,14 +36,17 @@ struct VoiceSearchView: View {
                                 .foregroundColor(micIconColor)
                         }
                     }
+                    // 듣는 중/처리 중에는 살짝 눌린 느낌
                     .scaleEffect(vm.isMicButtonEnabled ? 1.0 : 0.95)
                     .animation(.spring(response: 0.3, dampingFraction: 0.6), value: vm.state)
+                    .disabled(!vm.isMicButtonEnabled) // 준비/실패 외 상태에서는 탭 방지
                 }
                 .padding(.bottom, 60)
                 .animation(.easeInOut(duration: 0.25), value: vm.showWaveAnimation)
             }
             .padding(.horizontal, 32)
-            
+
+            // 닫기 버튼
             VStack {
                 HStack {
                     Spacer()
@@ -62,13 +65,18 @@ struct VoiceSearchView: View {
         }
         .toolbar(.hidden, for: .navigationBar)
         .onAppear {
+            // 1) 완료 시: 외부 콜백(있으면) -> pop
             vm.onSearchCompleted = { text in
                 onSearchCompleted?(text)
                 coordinator.pop()
             }
-            vm.onDismiss = { coordinator.pop() } 
+            // 2) 닫기(X) 시 pop
+            vm.onDismiss = { coordinator.pop() }
+            // 3) 실제 리스닝 시작/바인딩
             vm.onAppear()
         }
-        .onDisappear { vm.stopListening() }
+        .onDisappear {
+            vm.stopListening()
+        }
     }
 }