ui: PushNotficationSettingsView에서 피커용 시트 툴바에 ProgressView 추가

Author: opficdev

Application/DevLogPresentation/Sources/Settings/PushNotificationSettingsFeature.swift

@@ -89,7 +89,6 @@ struct PushNotificationSettingsFeature {
                 state.timePicker = nil
             case .timePicker(.presented(.tapDoneButton)):
                 guard let time = state.timePicker?.time else { break }
-                state.timePicker = nil
                 state.viewPushNotificationTime = time
                 state.activeLoadingRow = .customTime
                 return updatePushNotificationSettingsEffect(settings: Self.settings(from: state))
@@ -202,6 +201,7 @@ private extension PushNotificationSettingsFeature {
             do {
                 try await updatePushSettingsUseCase.execute(settings)
                 await send(.loading(.end(target: .default, mode: .delayed)))
+                await send(.timePicker(.dismiss))
                 await send(.clearActiveLoadingRow)
             } catch {
                 await send(.loading(.end(target: .default, mode: .delayed)))

Application/DevLogPresentation/Sources/Settings/PushNotificationSettingsView.swift

@@ -53,16 +53,11 @@ struct PushNotificationSettingsView: View {
                 HStack {
                     Text(String(localized: "push_settings_custom"))
                     Spacer()
-                    if store.isLoading && store.activeLoadingRow == .customTime {
-                        ProgressView()
-                    } else {
-                        Text(formattedTimeString(store.viewPushNotificationTime))
-                            .foregroundStyle(.secondary)
-                        if store.activeLoadingRow != .customTime &&
-                            store.pushNotificationMinute != 0 {
-                            Image(systemName: "checkmark")
-                                .foregroundStyle(Color.blue)
-                        }
+                    Text(formattedTimeString(store.viewPushNotificationTime))
+                        .foregroundStyle(.secondary)
+                    if store.pushNotificationMinute != 0 {
+                        Image(systemName: "checkmark")
+                            .foregroundStyle(Color.blue)
                     }
                 }
                 .contentShape(Rectangle())
@@ -75,8 +70,11 @@ struct PushNotificationSettingsView: View {
         .navigationTitle(String(localized: "nav_push_settings"))
         .onAppear { store.send(.fetchSettings) }
         .alert($store.scope(state: \.alert, action: \.alert))
-        .sheet(item: $store.scope(state: \.timePicker, action: \.timePicker)) { store in
-            TimePickerView(store: store)
+        .sheet(item: $store.scope(state: \.timePicker, action: \.timePicker)) { timePickerStore in
+            TimePickerView(
+                store: timePickerStore,
+                showsProgressView: store.isLoading && store.activeLoadingRow == .customTime
+            )
         }
     }
 
@@ -90,6 +88,7 @@ private struct TimePickerView: View {
         PushNotificationSettingsFeature.TimePickerState,
         PushNotificationSettingsFeature.Action.TimePicker
     >
+    let showsProgressView: Bool
 
     var body: some View {
         NavigationStack {
@@ -106,8 +105,17 @@ private struct TimePickerView: View {
                 ToolbarLeadingButton {
                     store.send(.tapCloseButton)
                 }
-                ToolbarTrailingButton {
-                    store.send(.tapDoneButton)
+                if showsProgressView {
+                    if #available(iOS 26.0, *) {
+                        ToolbarSpacer(.fixed, placement: .topBarTrailing)
+                    }
+                    ToolbarItem(placement: .topBarTrailing) {
+                        ProgressView()
+                    }
+                } else {
+                    ToolbarTrailingButton {
+                        store.send(.tapDoneButton)
+                    }
                 }
             }
             .background(

Application/DevLogPresentation/Tests/Settings/PushNotificationSettingsFeatureTests.swift

@@ -187,6 +187,42 @@ struct PushNotificationSettingsFeatureTests {
         #expect(adapter.activeLoadingRow == nil)
     }
 
+    @Test("커스텀 시간 업데이트가 지연되면 시트를 유지하고 Done 버튼 로딩 상태를 표시한다")
+    func 커스텀_시간_업데이트가_지연되면_시트를_유지하고_Done_버튼_로딩_상태를_표시한다() async {
+        let clock = TestClock()
+        let updateSpy = UpdatePushSettingsUseCaseSpy()
+        updateSpy.shouldSuspend = true
+        let adapter = PushNotificationSettingsStoreTestAdapter(
+            updateUseCase: updateSpy,
+            configureDependencies: {
+                $0.continuousClock = clock
+            }
+        )
+        let date = makeDate(hour: 10, minute: 35)
+
+        await adapter.setShowTimePicker(true)
+        await adapter.setPushNotificationTime(sheet: date)
+        await adapter.confirmUpdate()
+
+        #expect(adapter.showTimePicker)
+        #expect(adapter.activeLoadingRow == .customTime)
+        #expect(!adapter.isLoading)
+
+        await clock.advance(by: .milliseconds(300))
+        await adapter.receiveDelayedLoading()
+
+        #expect(adapter.showTimePicker)
+        #expect(adapter.isLoading)
+        #expect(adapter.activeLoadingRow == .customTime)
+
+        updateSpy.resume()
+        await adapter.drainReceivedActions()
+
+        #expect(!adapter.showTimePicker)
+        #expect(!adapter.isLoading)
+        #expect(adapter.activeLoadingRow == nil)
+    }
+
     @Test("푸시 설정 조회에 실패하면 공통 에러 알림을 표시한다")
     func 푸시_설정_조회에_실패하면_공통_에러_알림을_표시한다() async {
         let fetchSpy = FetchPushSettingsUseCaseSpy()
@@ -309,10 +345,10 @@ private struct PushNotificationSettingsStoreTestAdapter {
     func confirmUpdate() async {
         let time = store.state.timePicker?.time
         await store.send(.timePicker(.presented(.tapDoneButton))) {
-            $0.timePicker = nil
             if let time {
                 $0.viewPushNotificationTime = time
             }
+            $0.activeLoadingRow = .customTime
         }
         await drainReceivedActions()
     }