[테플 QA 전까지 머지 금지!] dev to main merge

BusRoad/Application/BusRoadApp.swift

@@ -12,14 +12,19 @@ struct BusRoadApp: App {
     @StateObject var coordinator = NavigationCoordinator()
     @StateObject private var proximityManager = AlightProximityManager(
         locationService: LocationService.shared,
-            journeyManager: JourneyManager.shared,
-            voiceManager: VoiceAnnouncementManager()
-        )
+        journeyManager: JourneyManager.shared,
+        voiceManager: VoiceAnnouncementManager()
+    )
+
+    init() {
+        _ = BusDataManager.shared
+    }
+
     var body: some Scene {
         WindowGroup {
             AppNavigationView()
                 .environmentObject(coordinator)
-                .environmentObject(proximityManager) 
+                .environmentObject(proximityManager)
         }
     }
 }

BusRoad/Component/Common/SettingKeys.swift

@@ -0,0 +1,11 @@
+
+enum SettingsKeys {
+    // 음성
+    static let busArrivalVoice = "busArrivalVoiceEnabled"   // 버스 승차
+    static let busAlightVoice  = "busAlightVoiceEnabled"    // 버스 하차
+    static let walkingVoice    = "walkingVoiceEnabled"      // 도보 안내
+
+    // 진동
+    static let vibration       = "vibrationEnabled"
+}
+

BusRoad/Component/RouteSuggestionView/ETA.swift

@@ -23,14 +23,18 @@ struct ETA: View {
     var timeText: String {
         let hours = journey.totalTime / 60
         let minutes = journey.totalTime % 60
-
+
+        let base: String
         if hours > 0 && minutes > 0 {
-            return "\(hours)시간 \(minutes)분"
-        } else if hours > 0 && minutes == 0 {
-            return "\(hours)시간"
+            base = "\(hours)시간 \(minutes)분"
+        } else if hours > 0 {
+            base = "\(hours)시간"
         } else {
-            return "\(minutes)분"
+            base = "\(minutes)분"
         }
+
+        // ✅ 도보-only면 "도보 " 붙임
+        return journey.isWalkingOnly ? "도보 \(base)" : base
     }
 
     var isMinimumTransfer: Bool {

BusRoad/Component/RouteSuggestionView/RouteCard.swift

@@ -57,49 +57,49 @@ struct RouteCard: View {
 
 
 
-#Preview {
-    @Previewable var previewBusInfo: (busNo: String, arrivalText: String)? = nil
-
-    RouteCard(
-        viewModel: BusRouteViewModel(),
-        allJourneys: [
-            Journey(totalTime: 48, nodes: [
-                .walk(WalkRouteNode(
-                    start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
-                    end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
-                    travelTime: 5
-                )),
-                .bus(BusRouteNode(
-                    start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
-                    end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
-                    busNo: ["405", "472"],
-                    busId: [1001, 1002],
-                    stations: [
-                        BusStation(index: 0, stationId: 111, stationName: "서울역", stationCityCode: 1100, localStationId: "LOCAL-SEOUL-001", nodeId: "1000001", latitude: 37.55, longitude: 126.97),
-                        BusStation(index: 1, stationId: 222, stationName: "강남역", stationCityCode: 1100, localStationId: "LOCAL-GANGNAM-001", nodeId: "1000002", latitude: 37.49, longitude: 127.02)
-                    ],
-                    travelTime: 35
-                ))
-            ])
-        ],
-        journey: Journey(totalTime: 48, nodes: [
-            .walk(WalkRouteNode(
-                start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
-                end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
-                travelTime: 5
-            )),
-            .bus(BusRouteNode(
-                start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
-                end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
-                busNo: ["472"],
-                busId: [1001],
-                stations: [
-                    BusStation(index: 0, stationId: 111, stationName: "서울역", stationCityCode: 1100, localStationId: "LOCAL-SEOUL-001", nodeId: "1000001", latitude: 37.55, longitude: 126.97),
-                    BusStation(index: 1, stationId: 222, stationName: "강남역", stationCityCode: 1100, localStationId: "LOCAL-GANGNAM-001", nodeId: "1000002", latitude: 37.49, longitude: 127.02)
-                ],
-                travelTime: 35
-            ))
-        ]),
-        index: 0
-    )
-}
+//#Preview {
+//    @Previewable var previewBusInfo: (busNo: String, arrivalText: String)? = nil
+//
+//    RouteCard(
+//        viewModel: BusRouteViewModel(),
+//        allJourneys: [
+//            Journey(totalTime: 48, nodes: [
+//                .walk(WalkRouteNode(
+//                    start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
+//                    end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
+//                    travelTime: 5
+//                )),
+//                .bus(BusRouteNode(
+//                    start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
+//                    end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
+//                    busNo: ["405", "472"],
+//                    busId: [1001, 1002],
+//                    stations: [
+//                        BusStation(index: 0, stationId: 111, stationName: "서울역", stationCityCode: 1100, localStationId: "LOCAL-SEOUL-001", nodeId: "1000001", latitude: 37.55, longitude: 126.97),
+//                        BusStation(index: 1, stationId: 222, stationName: "강남역", stationCityCode: 1100, localStationId: "LOCAL-GANGNAM-001", nodeId: "1000002", latitude: 37.49, longitude: 127.02)
+//                    ],
+//                    travelTime: 35
+//                ))
+//            ])
+//        ],
+//        journey: Journey(totalTime: 48, nodes: [
+//            .walk(WalkRouteNode(
+//                start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
+//                end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
+//                travelTime: 5
+//            )),
+//            .bus(BusRouteNode(
+//                start: LocationInfo(name: "서울역", latitude: 37.55, longitude: 126.97),
+//                end: LocationInfo(name: "강남역", latitude: 37.49, longitude: 127.02),
+//                busNo: ["472"],
+//                busId: [1001],
+//                stations: [
+//                    BusStation(index: 0, stationId: 111, stationName: "서울역", stationCityCode: 1100, localStationId: "LOCAL-SEOUL-001", nodeId: "1000001", latitude: 37.55, longitude: 126.97),
+//                    BusStation(index: 1, stationId: 222, stationName: "강남역", stationCityCode: 1100, localStationId: "LOCAL-GANGNAM-001", nodeId: "1000002", latitude: 37.49, longitude: 127.02)
+//                ],
+//                travelTime: 35
+//            ))
+//        ]),
+//        index: 0
+//    )
+//}

BusRoad/Component/RouteSuggestionView/RouteCardSlide.swift

@@ -4,12 +4,18 @@ struct RouteCardSlide: View {
     @Binding var currentIndex: Int
     @Binding var routes: [Journey]?
     @ObservedObject var viewModel: BusRouteViewModel
-    
+
     var body: some View {
         VStack(spacing: 0) {
             ZStack {
                 if viewModel.errorMessage != nil {
-                    RouteErrorCard(viewModel: viewModel)
+                    if viewModel.errorMessage == "출발지와 목적지가 너무 가깝습니다." {
+                        if let journey = routes?.first {
+                            RouteWalkCard(viewModel: viewModel, journey: journey)
+                        }
+                    } else {
+                        RouteErrorCard(viewModel: viewModel)
+                    }
                 } else if let routes {
                     ZStack {
                         ForEach(Array(routes.enumerated()), id: \.element.id) { index, item in
@@ -39,19 +45,19 @@ struct RouteCardSlide: View {
                                 } else {
                                     newIndex = min(routes.count - 1, currentIndex + 1)
                                 }
-                                
+
                                 if newIndex != currentIndex {
                                     viewModel.arrivalText = nil
                                 }
-                                
+
                                 currentIndex = newIndex
                             }
                     )
                 } else {
                     ProgressRouteCard()
                 }
             }
-            
+
             // 항상 28 높이의 공간 차지
             if let routes = routes, routes.count > 1 {
                 HStack {

BusRoad/Component/RouteSuggestionView/RouteErrorCard.swift

@@ -16,53 +16,80 @@ struct RouteErrorCard: View {
                 .foregroundColor(Color.primarywhite)
                 .cornerRadius(20)
                 .shadow(color: .black.opacity(0.25), radius: 2, x: 0, y: 0)
+
 
-            VStack(spacing: 8) {
-                if viewModel.errorMessage == "출발지와 목적지가 너무 가깝습니다." {
-                    Text("출발지와 도착지가\n가까이 있어요!")
-                        .font(.presemi24)
-                        .foregroundColor(Color.primaryHeavy)
-                        .multilineTextAlignment(.center)
-                        .lineSpacing(5)
-
-                    Text("도보 경로로 안내할게요.")
-                        .font(.premed20)
-                        .foregroundColor(Color.primaryHeavy)
-
-                } else if viewModel.errorMessage == "지원하지 않는 교통수단이 포함되어 있습니다." {
-                    Text("현재 경로는\n지원하지 않아요😵")
-                        .font(.presemi24)
-                        .foregroundColor(Color.primaryHeavy)
-                        .multilineTextAlignment(.center)
-                        .lineSpacing(5)
-
-                    Text("다른 장소를 검색해주세요.")
-                        .font(.premed20)
-                        .foregroundColor(Color.primaryHeavy)
-
-                } else if viewModel.errorMessage == "출발지와 도착지가 같습니다." {
-                    Text("출발지와 도착지가\n같은 곳이에요😵")
-                        .font(.presemi24)
-                        .foregroundColor(Color.primaryHeavy)
-                        .multilineTextAlignment(.center)
-                        .lineSpacing(5)
-
-                    Text("다시 검색해주세요.")
-                        .font(.premed20)
-                        .foregroundColor(Color.primaryHeavy)
-
-                } else {
-                    Text("앗, 문제가 발생했어요😵")
-                        .font(.presemi24)
-                        .foregroundColor(Color.primaryHeavy)
-                        .multilineTextAlignment(.center)
-                        .lineSpacing(5)
-
-                    Text("경로를 새로고침 해주세요.")
-                        .font(.premed20)
-                        .foregroundColor(Color.primaryHeavy)
-                }
+            VStack(spacing: 28) {
+
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: 36, height: 36)
+                    .font(.system(size: 36, weight: .light))
+                    .foregroundStyle(.greyDisable)
+
+                errorMessageText
             }
         }
     }
+
+    //MARK: - 에러메시지 텍스트
+    private var errorMessageText: some View {
+        VStack(alignment: .center, spacing: 12, content: {
+            if viewModel.errorMessage == "지원하지 않는 교통수단이 포함되어 있습니다." {
+                Text("지원하지 않는 경로예요")
+                    .font(.presemi24)
+                    .foregroundStyle(Color.primaryHeavy)
+                    .multilineTextAlignment(.center)
+                    .lineSpacing(5)
+
+                Text("다른 장소를 검색해주세요")
+                    .font(.premed16Scaled)
+                    .foregroundStyle(.greyNormal)
+
+            } else if viewModel.errorMessage == "출발지와 도착지가 같습니다." {
+                Text("출발지와 도착지가\n동일해요")
+                    .font(.presemi24)
+                    .foregroundStyle(Color.primaryHeavy)
+                    .multilineTextAlignment(.center)
+                    .lineSpacing(5)
+
+                Text("다른 장소를 검색해주세요")
+                    .font(.premed16Scaled)
+                    .foregroundStyle(Color.greyNormal)
+
+            } else {
+                Text("오류가 발생했어요")
+                    .font(.presemi24)
+                    .foregroundStyle(Color.primaryHeavy)
+                    .multilineTextAlignment(.center)
+                    .lineSpacing(5)
+
+                Text("경로를 새로고침 해주세요")
+                    .font(.premed16Scaled)
+                    .foregroundStyle(Color.greyNormal)
+            }
+        })
+    }
+}
+
+// MARK: - 프리뷰
+#Preview("지원하지 않는 교통수단") {
+    let vm = BusRouteViewModel()
+    vm.errorMessage = "지원하지 않는 교통수단이 포함되어 있습니다."
+    return RouteErrorCard(viewModel: vm)
+        .padding()
+}
+
+#Preview("출발지=도착지") {
+    let vm = BusRouteViewModel()
+    vm.errorMessage = "출발지와 도착지가 같습니다."
+    return RouteErrorCard(viewModel: vm)
+        .padding()
+}
+
+#Preview("기타 오류") {
+    let vm = BusRouteViewModel()
+    vm.errorMessage = "API 호출 실패"
+    return RouteErrorCard(viewModel: vm)
+        .padding()
 }

BusRoad/Component/RouteSuggestionView/RouteSelectButton.swift

@@ -33,7 +33,7 @@ struct RouteSelectButton: View {
                                         stage: RouteStage.walkingToBus.rawValue,
                                         destination: walkNode.end.name,  // 승차 정류장 이름
                                         remainingBusStops: 0,
-                                        busTravelTime: 0
+                                        timeTillBusArrival: 0
                                     )
                                 }
                                 print("[DEBUG] Live Activity 시작 - walkingToBus, destination: \(walkNode.end.name)")
@@ -44,7 +44,7 @@ struct RouteSelectButton: View {
                                     stage: RouteStage.waitingForBus.rawValue,
                                     destination: destinationName,
                                     remainingBusStops: busNode.stations.count,
-                                    busTravelTime: busNode.travelTime
+                                    timeTillBusArrival: ArrivalInfoManager.shared.lastNearestArrTime ?? 0
                                 )
                                 print("[DEBUG] Live Activity 시작 - waitingForBus, destination: \(destinationName)")
                             }
@@ -55,7 +55,7 @@ struct RouteSelectButton: View {
                     print("[DEBUG] routes가 존재하지 않습니다.")
                 }
             } label: {
-                Text("시작하기")
+                Text("안내 시작")
                     .foregroundColor(Color.subLight)
                     .font(.premed32)
                     .frame(width: 305.wScaled, height: 64)
@@ -68,7 +68,7 @@ struct RouteSelectButton: View {
             Button {
                 retrySearch()
             } label: {
-                Text("다시 검색하기")
+                Text("다시 검색")
                     .foregroundColor(Color.subLight)
                     .font(.premed32)
                     .frame(width: 305.wScaled, height: 64)
@@ -89,13 +89,13 @@ struct RouteSelectButton: View {
                             stage: RouteStage.walkingToDestination.rawValue,
                             destination: node.end.name,
                             remainingBusStops: 0,
-                            busTravelTime: 0
+                            timeTillBusArrival: 0
                         )
                     }
                 }
 
             } label: {
-                Text("도보 이동하기")
+                Text("안내 시작")
                     .foregroundColor(Color.subLight)
                     .font(.premed32)
                     .frame(width: 305.wScaled, height: 64)
@@ -108,7 +108,7 @@ struct RouteSelectButton: View {
             Button {
                 retrySearch()
             } label: {
-                Text("다시 검색하기")
+                Text("다시 검색")
                     .foregroundColor(Color.subLight)
                     .font(.premed32)
                     .frame(width: 305.wScaled, height: 64)

BusRoad/Component/RouteSuggestionView/RouteSummary.swift

@@ -47,6 +47,7 @@ struct RouteSummary: View {
                             .frame(width:12.wScaled.minimum(12), height:16.wScaled.minimum(16))
                             .foregroundColor(Color.subStrong)
                     }
+
                     Text("도보 \(journey.walkingTime)분")
                         .font(.prereg16Scaled)
                         .foregroundColor(Color.primaryHeavy)