refactor: PushNotification Account toast 표시 이전

Author: opficdev

Application/DevLogPresentation/Sources/PushNotification/PushNotificationListView.swift

@@ -47,18 +47,6 @@ struct PushNotificationListView: View {
         } message: {
             Text(viewModel.state.alertMessage)
         }
-        .toast(
-            isPresented: Binding(
-                get: { viewModel.state.showToast },
-                set: { viewModel.send(.setToast(isPresented: $0)) }),
-            duration: 5,
-            action: { viewModel.send(.undoDelete) }
-        ) {
-            Label(viewModel.state.toastMessage, systemImage: "arrow.uturn.left")
-                .font(.caption)
-                .multilineTextAlignment(.center)
-                .lineLimit(3)
-        }
         .sheet(item: Binding(
             get: { isCompactLayout ? coordinator.todoIdToPresent : nil },
             set: { item in

Application/DevLogPresentation/Sources/PushNotification/PushNotificationListViewModel.swift

@@ -15,10 +15,8 @@ final class PushNotificationListViewModel: Store {
     struct State: Equatable {
         var notifications: [PushNotificationItem] = []
         var showAlert: Bool = false
-        var showToast: Bool = false
         var alertTitle: String = ""
         var alertMessage: String = ""
-        var toastMessage: String = ""
         var isLoading: Bool = false
         var hasMore: Bool = false
         var nextCursor: PushNotificationCursor?
@@ -33,8 +31,8 @@ final class PushNotificationListViewModel: Store {
         case deleteNotification(PushNotificationItem)
         case toggleRead(PushNotificationItem)
         case undoDelete
+        case finishDeleteToast(String)
         case setAlert(isPresented: Bool)
-        case setToast(isPresented: Bool)
         case setLoading(Bool)
         case appendNotifications([PushNotificationItem], nextCursor: PushNotificationCursor?)
         case resetPagination
@@ -98,11 +96,11 @@ final class PushNotificationListViewModel: Store {
         var effects: [SideEffect] = []
 
         switch action {
-        case .deleteNotification, .toggleRead, .undoDelete, .setAlert, .toggleSortOption,
+        case .deleteNotification, .toggleRead, .undoDelete, .finishDeleteToast, .setAlert, .toggleSortOption,
                 .setTimeFilter, .toggleUnreadOnly, .resetFilters, .selectNotification:
             effects = reduceByUser(action, state: &state)
 
-        case .fetchNotifications, .setToast, .loadNextPage:
+        case .fetchNotifications, .loadNextPage:
             effects = reduceByView(action, state: &state)
 
         case .setLoading, .appendNotifications, .resetPagination, .setHasMore,
@@ -187,7 +185,7 @@ private extension PushNotificationListViewModel {
             if state.notifications.contains(where: { $0.id == item.id }) {
                 self.undoNotificationId = item.id
                 setNotificationHidden(&state, notificationId: item.id, isHidden: true)
-                setToast(&state, isPresented: true)
+                presentDeleteNotificationToast(item.id)
                 return [.delete(item)]
             }
             return []
@@ -201,6 +199,11 @@ private extension PushNotificationListViewModel {
             setNotificationHidden(&state, notificationId: undoNotificationId, isHidden: false)
             self.undoNotificationId = nil
             return [.undoDelete(undoNotificationId)]
+        case .finishDeleteToast(let notificationId):
+            state.notifications.removeAll { $0.id == notificationId && $0.isHidden }
+            if self.undoNotificationId == notificationId {
+                self.undoNotificationId = nil
+            }
         case .setAlert(let isPresented):
             setAlert(&state, isPresented: isPresented)
         case .toggleSortOption:
@@ -253,12 +256,6 @@ private extension PushNotificationListViewModel {
         case .loadNextPage:
             guard state.hasMore, !state.isLoading else { return [] }
             return [.fetchNotifications(state.query, cursor: state.nextCursor)]
-        case .setToast(let isPresented):
-            setToast(&state, isPresented: isPresented)
-            if !isPresented {
-                state.notifications.removeAll { $0.isHidden }
-                self.undoNotificationId = nil
-            }
         default:
             break
         }
@@ -306,12 +303,21 @@ private extension PushNotificationListViewModel {
         state.showAlert = isPresented
     }
 
-    func setToast(
-        _ state: inout State,
-        isPresented: Bool
-    ) {
-        state.toastMessage = String(localized: "common_undo")
-        state.showToast = isPresented
+    func presentDeleteNotificationToast(_ notificationId: String) {
+        ToastPresenter.present(
+            message: String(localized: "common_undo"),
+            systemImage: "arrow.uturn.left",
+            duration: 5,
+            font: .caption,
+            multilineTextAlignment: .center,
+            lineLimit: 3,
+            action: { [weak self] in
+                self?.send(.undoDelete)
+            },
+            onDismiss: { [weak self] in
+                self?.send(.finishDeleteToast(notificationId))
+            }
+        )
     }
 
     func setNotificationHidden(

Application/DevLogPresentation/Sources/Settings/AccountView.swift

@@ -63,12 +63,6 @@ struct AccountView: View {
         } message: {
             Text(viewModel.state.alertMessage)
         }
-        .toast(isPresented: Binding(
-            get: { viewModel.state.showToast },
-            set: { viewModel.send(.setToast(isPresented: $0)) }
-        )) {
-            Text(viewModel.state.toastMessage)
-        }
         .overlay {
             if viewModel.state.isLoading {
                 LoadingView()

Application/DevLogPresentation/Sources/Settings/AccountViewModel.swift

@@ -18,9 +18,6 @@ final class AccountViewModel: Store {
         var alertTitle: String = ""
         var alertType: AlertType?
         var alertMessage: String = ""
-        var showToast: Bool = false
-        var toastType: ToastType?
-        var toastMessage: String = ""
         var isLoading: Bool = false
     }
 
@@ -29,7 +26,6 @@ final class AccountViewModel: Store {
         case linkWithProvider(AuthProvider)
         case unlinkFromProvider(AuthProvider)
         case setAlert(isPresented: Bool, type: AlertType? = nil)
-        case setToast(isPresented: Bool, type: ToastType? = nil)
         case setLoading(Bool)
         case updateProviders(currentProvider: AuthProvider?, allProviders: [AuthProvider])
     }
@@ -47,11 +43,6 @@ final class AccountViewModel: Store {
         case error
     }
 
-    enum ToastType {
-        case linkSuccess
-        case unlinkSuccess
-    }
-
     private(set) var state: State = .init()
     private let fetchProvidersUseCase: FetchAuthProvidersUseCase
     private let linkProviderUseCase: LinkAuthProviderUseCase
@@ -81,8 +72,6 @@ final class AccountViewModel: Store {
             effects = [.unlink(value)]
         case .setAlert(let presented, let type):
             setAlert(&state, isPresented: presented, type: type)
-        case .setToast(let presented, let type):
-            setToast(&state, isPresented: presented, type: type)
         case .setLoading(let value):
             state.isLoading = value
         case .updateProviders(let currentProvider, let allProviders):
@@ -113,7 +102,7 @@ final class AccountViewModel: Store {
                 do {
                     defer { endLoading(.delayed) }
                     try await linkProviderUseCase.execute(provider)
-                    send(.setToast(isPresented: true, type: .linkSuccess))
+                    ToastPresenter.present(message: String(localized: "account_toast_link_success"))
 
                     let (currentProvider, allProviders) = try await fetchProvidersUseCase.execute()
                     send(.updateProviders(currentProvider: currentProvider, allProviders: allProviders))
@@ -128,7 +117,7 @@ final class AccountViewModel: Store {
                 do {
                     defer { endLoading(.delayed) }
                     try await unlinkProviderUseCase.execute(provider)
-                    send(.setToast(isPresented: true, type: .unlinkSuccess))
+                    ToastPresenter.present(message: String(localized: "account_toast_unlink_success"))
 
                     let (currentProvider, allProviders) = try await fetchProvidersUseCase.execute()
                     send(.updateProviders(currentProvider: currentProvider, allProviders: allProviders))
@@ -180,19 +169,6 @@ private extension AccountViewModel {
         state.alertType = type
     }
 
-    func setToast(_ state: inout State, isPresented: Bool, type: ToastType?) {
-        switch type {
-        case .linkSuccess:
-            state.toastMessage = String(localized: "account_toast_link_success")
-        case .unlinkSuccess:
-            state.toastMessage = String(localized: "account_toast_unlink_success")
-        case .none:
-            state.toastMessage = ""
-        }
-        state.showToast = isPresented
-        state.toastType = type
-    }
-
     private func beginLoading(_ mode: LoadingState.Mode) {
         loadingState.begin(mode: mode) { [weak self] isLoading in
             self?.send(.setLoading(isLoading))

Application/DevLogPresentation/Tests/PushNotification/DeletePushNotificationTests.swift

@@ -15,6 +15,8 @@ import DevLogDomain
 struct DeletePushNotificationTests {
     @Test("삭제하면 항목이 즉시 숨겨지고 되돌리기 토스트가 표시되며 삭제 유스케이스가 호출된다")
     func 삭제하면_항목이_즉시_숨겨지고_되돌리기_토스트가_표시되며_삭제_유스케이스가_호출된다() async throws {
+        ToastPresenter.reset()
+
         let fetchPushNotificationsUseCaseSpy = FetchPushNotificationsUseCaseSpy(
             pushNotificationPage: PushNotificationPage(
                 items: [
@@ -56,7 +58,7 @@ struct DeletePushNotificationTests {
         pushNotificationListViewModel.send(.deleteNotification(pushNotificationItem))
 
         #expect(pushNotificationListViewModel.state.notifications.filter { !$0.isHidden }.isEmpty)
-        #expect(pushNotificationListViewModel.state.showToast)
+        #expect(ToastPresenter.item?.message == String(localized: "common_undo"))
 
         await waitUntil {
             deletePushNotificationUseCaseSpy.calledNotificationIds == ["notification-1"]
@@ -67,6 +69,8 @@ struct DeletePushNotificationTests {
 
     @Test("삭제를 되돌리면 되돌리기 유스케이스가 호출되고 숨김 상태가 해제된다")
     func 삭제를_되돌리면_되돌리기_유스케이스가_호출되고_숨김_상태가_해제된다() async throws {
+        ToastPresenter.reset()
+
         let fetchPushNotificationsUseCaseSpy = FetchPushNotificationsUseCaseSpy(
             pushNotificationPage: PushNotificationPage(
                 items: [