PushNotifiactionSettingsView 로딩 표시 조정

Author: opficdev

Application/DevLogPresentation/Sources/Settings/PushNotificationSettingsFeature.swift

@@ -12,12 +12,19 @@ import SwiftUI
 
 @Reducer
 struct PushNotificationSettingsFeature {
+    enum ActiveLoadingRow: Equatable {
+        case enable
+        case presetTime(hour: Int, minute: Int)
+        case customTime
+    }
+
     @ObservableState
     struct State: Equatable {
         @Presents var alert: AlertState<Never>?
         @Presents var timePicker: TimePickerState?
         var pushNotificationEnable = false
         var viewPushNotificationTime = Date()
+        var activeLoadingRow: ActiveLoadingRow?
         var loading = LoadingFeature.State()
 
         var isLoading: Bool {
@@ -46,6 +53,7 @@ struct PushNotificationSettingsFeature {
         case setAlert
         case tapCustomTime
         case selectPresetTime(Date)
+        case clearActiveLoadingRow
         case loading(LoadingFeature.Action)
 
         enum TimePicker: BindableAction, Equatable {
@@ -68,6 +76,7 @@ struct PushNotificationSettingsFeature {
             case .alert:
                 break
             case .binding(\.pushNotificationEnable):
+                state.activeLoadingRow = .enable
                 return updatePushNotificationSettingsEffect(settings: Self.settings(from: state))
             case .binding(\.viewPushNotificationTime):
                 let time = state.viewPushNotificationTime
@@ -82,10 +91,12 @@ struct PushNotificationSettingsFeature {
                 guard let time = state.timePicker?.time else { break }
                 state.timePicker = nil
                 state.viewPushNotificationTime = time
+                state.activeLoadingRow = .customTime
                 return updatePushNotificationSettingsEffect(settings: Self.settings(from: state))
             case .timePicker:
                 break
             case .fetchSettings:
+                state.activeLoadingRow = .enable
                 return fetchPushNotificationSettingsEffect()
             case .applyFetchedSettings(let settings):
                 state.pushNotificationEnable = settings.isEnabled
@@ -101,7 +112,10 @@ struct PushNotificationSettingsFeature {
             case .selectPresetTime(let date):
                 state.viewPushNotificationTime = date
                 state.timePicker?.time = date
+                state.activeLoadingRow = Self.activeLoadingRow(for: date)
                 return updatePushNotificationSettingsEffect(settings: Self.settings(from: state))
+            case .clearActiveLoadingRow:
+                state.activeLoadingRow = nil
             case .loading:
                 break
             }
@@ -156,6 +170,15 @@ private enum UpdatePushSettingsUseCaseKey: DependencyKey {
     }
 }
 
+extension PushNotificationSettingsFeature {
+    static func activeLoadingRow(for date: Date) -> ActiveLoadingRow? {
+        let components = Calendar.current.dateComponents([.hour, .minute], from: date)
+        guard let hour = components.hour,
+              let minute = components.minute else { return nil }
+        return .presetTime(hour: hour, minute: minute)
+    }
+}
+
 private extension PushNotificationSettingsFeature {
     func fetchPushNotificationSettingsEffect() -> Effect<Action> {
         .run { [fetchPushSettingsUseCase] send in
@@ -164,8 +187,10 @@ private extension PushNotificationSettingsFeature {
                 let settings = try await fetchPushSettingsUseCase.execute()
                 await send(.applyFetchedSettings(settings))
                 await send(.loading(.end(target: .default, mode: .delayed)))
+                await send(.clearActiveLoadingRow)
             } catch {
                 await send(.loading(.end(target: .default, mode: .delayed)))
+                await send(.clearActiveLoadingRow)
                 await send(.setAlert)
             }
         }
@@ -177,8 +202,10 @@ private extension PushNotificationSettingsFeature {
             do {
                 try await updatePushSettingsUseCase.execute(settings)
                 await send(.loading(.end(target: .default, mode: .delayed)))
+                await send(.clearActiveLoadingRow)
             } catch {
                 await send(.loading(.end(target: .default, mode: .delayed)))
+                await send(.clearActiveLoadingRow)
                 await send(.setAlert)
                 await send(.fetchSettings)
             }

Application/DevLogPresentation/Sources/Settings/PushNotificationSettingsView.swift

@@ -14,21 +14,35 @@ struct PushNotificationSettingsView: View {
     var body: some View {
         List {
             Section(content: {
-                Toggle(isOn: $store.pushNotificationEnable) {
+                HStack {
                     Text(String(localized: "push_settings_enable"))
+                    Spacer()
+                    if store.isLoading && store.activeLoadingRow == .enable {
+                        ProgressView()
+                            .id(UUID())
+                    } else {
+                        Toggle("", isOn: $store.pushNotificationEnable)
+                            .labelsHidden()
+                            .tint(.blue)
+                            .disabled(store.activeLoadingRow != nil)
+                    }
                 }
-                .tint(.blue)
             }, footer: {
                 Text(String(localized: "push_settings_footer"))
             })
             Section {
                 ForEach([9, 15, 18, 21], id: \.self) { hour in
                     if let date = Calendar.current.date(bySettingHour: hour, minute: 0, second: 0, of: Date()) {
+                        let loadingRow = PushNotificationSettingsFeature.activeLoadingRow(for: date)
                         HStack {
                             Text(formattedTimeString(date))
                             Spacer()
-                            if store.pushNotificationHour == hour &&
-                                store.pushNotificationMinute == 0 {
+                            if let loadingRow,
+                               store.isLoading && store.activeLoadingRow == loadingRow {
+                                ProgressView()
+                                    .id(UUID())
+                            } else if store.pushNotificationHour == hour &&
+                                        store.pushNotificationMinute == 0 {
                                 Image(systemName: "checkmark")
                                     .foregroundStyle(Color.blue)
                             }
@@ -40,22 +54,26 @@ struct PushNotificationSettingsView: View {
                 HStack {
                     Text(String(localized: "push_settings_custom"))
                     Spacer()
-                    Text(formattedTimeString(store.viewPushNotificationTime))
-                        .foregroundStyle(.secondary)
-                    if store.pushNotificationMinute != 0 {
-                        Image(systemName: "checkmark")
-                            .foregroundStyle(Color.blue)
+                    if store.isLoading && store.activeLoadingRow == .customTime {
+                        ProgressView()
+                            .id(UUID())
+                    } else {
+                        Text(formattedTimeString(store.viewPushNotificationTime))
+                            .foregroundStyle(.secondary)
+                        if store.pushNotificationMinute != 0 {
+                            Image(systemName: "checkmark")
+                                .foregroundStyle(Color.blue)
+                        }
                     }
                 }
                 .contentShape(Rectangle())
                 .onTapGesture { store.send(.tapCustomTime) }
             }
-            .disabled(!store.pushNotificationEnable)
+            .disabled(!store.pushNotificationEnable || store.activeLoadingRow != nil)
             .opacity(store.pushNotificationEnable ? 1.0 : 0.2)
         }
         .listStyle(.insetGrouped)
         .navigationTitle(String(localized: "nav_push_settings"))
-        .overlay { if store.isLoading { LoadingView() } }
         .onAppear { store.send(.fetchSettings) }
         .alert($store.scope(state: \.alert, action: \.alert))
         .sheet(item: $store.scope(state: \.timePicker, action: \.timePicker)) { store in

Application/DevLogPresentation/Tests/Settings/PushNotificationSettingsFeatureTests.swift

@@ -5,6 +5,8 @@
 //  Created by opfic on 6/12/26.
 //
 
+// swiftlint:disable file_length
+
 import Testing
 import ComposableArchitecture
 import Foundation
@@ -143,14 +145,48 @@ struct PushNotificationSettingsFeatureTests {
         await adapter.receiveDelayedLoading()
 
         #expect(adapter.isLoading)
+        #expect(adapter.activeLoadingRow == .enable)
 
         fetchSpy.resume()
         await adapter.drainReceivedActions()
 
         #expect(!adapter.isLoading)
+        #expect(adapter.activeLoadingRow == nil)
         #expect(adapter.pushNotificationHour == 9)
     }
 
+    @Test("프리셋 시간 업데이트가 지연되면 해당 시간 row에 로딩 상태를 표시한다")
+    func 프리셋_시간_업데이트가_지연되면_해당_시간_row에_로딩_상태를_표시한다() async {
+        let clock = TestClock()
+        let updateSpy = UpdatePushSettingsUseCaseSpy()
+        updateSpy.shouldSuspend = true
+        let adapter = PushNotificationSettingsStoreTestAdapter(
+            updateUseCase: updateSpy,
+            configureDependencies: {
+                $0.continuousClock = clock
+            }
+        )
+        let date = makeDate(hour: 15, minute: 0)
+
+        await adapter.selectPresetTime(date)
+
+        #expect(updateSpy.executeCallCount == 1)
+        #expect(adapter.activeLoadingRow == .presetTime(hour: 15, minute: 0))
+        #expect(!adapter.isLoading)
+
+        await clock.advance(by: .milliseconds(300))
+        await adapter.receiveDelayedLoading()
+
+        #expect(adapter.isLoading)
+        #expect(adapter.activeLoadingRow == .presetTime(hour: 15, minute: 0))
+
+        updateSpy.resume()
+        await adapter.drainReceivedActions()
+
+        #expect(!adapter.isLoading)
+        #expect(adapter.activeLoadingRow == nil)
+    }
+
     @Test("푸시 설정 조회에 실패하면 공통 에러 알림을 표시한다")
     func 푸시_설정_조회에_실패하면_공통_에러_알림을_표시한다() async {
         let fetchSpy = FetchPushSettingsUseCaseSpy()
@@ -193,6 +229,7 @@ private struct PushNotificationSettingsStoreTestAdapter {
     var sheetPushNotificationTime: Date { store.state.timePicker?.time ?? store.state.viewPushNotificationTime }
     var showTimePicker: Bool { store.state.timePicker != nil }
     var isLoading: Bool { store.state.isLoading }
+    var activeLoadingRow: PushNotificationSettingsFeature.ActiveLoadingRow? { store.state.activeLoadingRow }
     var sheetHeight: CGFloat { store.state.timePicker?.height ?? .pi }
     var alert: AlertState<Never>? { store.state.alert }
     var pushNotificationHour: Int { store.state.pushNotificationHour }
@@ -349,15 +386,40 @@ private final class FetchPushSettingsUseCaseSpy: FetchPushSettingsUseCase {
 
 private final class UpdatePushSettingsUseCaseSpy: UpdatePushSettingsUseCase {
     var error: Error?
+    var shouldSuspend = false
     private(set) var executeCallCount = 0
+    private var continuation: CheckedContinuation<Void, Never>?
+    private var shouldResume = false
 
     func execute(_: PushNotificationSettings) async throws {
         executeCallCount += 1
+
+        if shouldSuspend {
+            await withCheckedContinuation { continuation in
+                if shouldResume {
+                    shouldResume = false
+                    continuation.resume()
+                } else {
+                    self.continuation = continuation
+                }
+            }
+        }
+
         if let error {
             self.error = nil
             throw error
         }
     }
+
+    func resume() {
+        guard let continuation else {
+            shouldResume = true
+            return
+        }
+
+        self.continuation = nil
+        continuation.resume()
+    }
 }
 
 private enum PushNotificationSettingsTestError: Error {