Merge pull request #117 from DSM-PICK/feature/(#115)-toast_refectoring

🔗 :: (#115) 토스트 처리 (성공, 실패)

Author: circle0802

Projects/Feature/AcceptFeature/Sources/AcceptReducer.swift

@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import AcceptDomainInterface
+import PiCK_iOS_DesignSystem
 
 public struct AcceptReducer: Reducer {
     private let getAllApplicationsUseCase: any GetAllApplicationsUseCaseProtocol
@@ -53,9 +54,9 @@ public struct AcceptReducer: Reducer {
         public var currentClassNum: Int = 5
         public var currentFloor: Int = 1
         public var currentType: ApplicationType = .outgoing
-        public var toastMessage: String? = nil
-        public var showToast: Bool = false
-        public var shouldDismiss: Bool = false
+        public var showAlert = false
+        public var alertSuccessType: SuccessType = .success
+        public var alertMessage: String = ""
 
         public init() {}
     }
@@ -70,7 +71,7 @@ public struct AcceptReducer: Reducer {
         case approveSelectedApplications
         case rejectSelectedApplications
         case updateStatusResponse(Result<String, Error>)
-        case hideToast
+        case dismissAlert
     }
 
     public var body: some Reducer<State, Action> {
@@ -226,7 +227,7 @@ public struct AcceptReducer: Reducer {
                     switch result {
                     case .success:
                         await send(.updateStatusResponse(.success("\(count)명의 \(typeText) 거절이 완료되었습니다!")))
-                    case .failure(let error):
+                    case let .failure(error):
                         await send(.updateStatusResponse(.failure(error)))
                     }
                 }
@@ -238,20 +239,19 @@ public struct AcceptReducer: Reducer {
                     removedIds.contains(item.id)
                 }
                 state.selectedItemIds = []
-                state.toastMessage = message
-                state.showToast = true
-                state.shouldDismiss = true
+                state.alertMessage = message
+                state.showAlert = true
                 return .none
 
             case .updateStatusResponse(.failure):
                 state.isLoading = false
-                state.toastMessage = "처리에 실패했습니다"
-                state.showToast = true
+                state.alertMessage = "처리를 실패했습니다"
+                state.showAlert = true
+                state.alertSuccessType = .fail
                 return .none
 
-            case .hideToast:
-                state.showToast = false
-                state.toastMessage = nil
+            case .dismissAlert:
+                state.showAlert = false
                 return .none
             }
         }

Projects/Feature/AcceptFeature/Sources/Scene/AcceptView.swift

@@ -254,38 +254,14 @@ public struct AcceptView: View {
                     }
                 }
 
-                if viewStore.showToast, let message = viewStore.toastMessage {
-                    VStack {
-                        Spacer()
-
-                        HStack(spacing: 12) {
-                            Image(systemName: "checkmark.circle.fill")
-                                .foregroundColor(.Primary.primary500)
-                                .font(.system(size: 20))
-
-                            Text(message)
-                                .pickText(type: .body1, textColor: .Normal.black)
-                        }
-                        .padding(.horizontal, 16)
-                        .frame(height: 48)
-                        .background(Color.Gray.gray50)
-                        .cornerRadius(24)
-                        .shadow(color: Color.black.opacity(0.1), radius: 10, x: 0, y: 4)
-                        .padding(.bottom, 40)
-                        .transition(.move(edge: .bottom).combined(with: .opacity))
-                        .onAppear {
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 2.5) {
-                                viewStore.send(.hideToast)
-                            }
-                        }
+                if viewStore.showAlert {
+                    PiCKDisappearAlert(
+                        successType: viewStore.alertSuccessType,
+                        message: viewStore.alertMessage
+                    )
+                    .onDisappear {
+                        viewStore.send(.dismissAlert)
                     }
-                    .zIndex(1000)
-                    .animation(.spring(response: 0.5, dampingFraction: 0.7), value: viewStore.showToast)
-                }
-            }
-            .onChange(of: viewStore.shouldDismiss) { shouldDismiss in
-                if shouldDismiss {
-                    dismiss()
                 }
             }
         }

Projects/Feature/BugReport/Sources/BugReportReducer.swift

@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import PiCK_iOS_DesignSystem
 import Foundation
 import PhotosUI
 import SwiftUI
@@ -21,7 +22,10 @@ public struct BugReportReducer: Reducer {
         public var bugDescription: String = ""
         public var selectedImages: [Data] = []
         public var isSubmitting: Bool = false
-        public var showSuccessAlert: Bool = false
+        public var showAlert: Bool = false
+        public var alertSuccessType: SuccessType = .success
+        public var alertMessage: String = ""
+        public var shouldDismiss: Bool = false
         public var isSubmitButtonEnabled: Bool = false
 
         public init() {}
@@ -35,7 +39,7 @@ public struct BugReportReducer: Reducer {
         case submitButtonTapped
         case uploadImagesResponse(TaskResult<[String]>)
         case submitBugReportResponse(TaskResult<Void>)
-        case dismissSuccessAlert
+        case dismissAlert
         case updateSubmitButtonState
     }
 
@@ -101,24 +105,33 @@ public struct BugReportReducer: Reducer {
                     ))
                 }
 
-            case let .uploadImagesResponse(.failure(error)):
+            case .uploadImagesResponse(.failure):
                 state.isSubmitting = false
+                state.alertSuccessType = .fail
+                state.alertMessage = "이미지 업로드를 실패했어요"
+                state.showAlert = true
                 return .none
 
             case .submitBugReportResponse(.success):
                 state.isSubmitting = false
-                state.showSuccessAlert = true
+                state.alertSuccessType = .success
+                state.alertMessage = "버그 제보가 완료되었습니다"
+                state.showAlert = true
+                state.shouldDismiss = true
                 state.bugLocation = ""
                 state.bugDescription = ""
                 state.selectedImages = []
                 return .none
 
-            case let .submitBugReportResponse(.failure(error)):
+            case .submitBugReportResponse(.failure):
                 state.isSubmitting = false
+                state.alertSuccessType = .fail
+                state.alertMessage = "버그 제보를 실패했어요"
+                state.showAlert = true
                 return .none
 
-            case .dismissSuccessAlert:
-                state.showSuccessAlert = false
+            case .dismissAlert:
+                state.showAlert = false
                 return .none
 
             case .updateSubmitButtonState:

Projects/Feature/BugReport/Sources/Scene/BugReportView.swift

@@ -15,27 +15,38 @@ public struct BugReportView: View {
 
     public var body: some View {
         WithViewStore(store, observe: { $0 }) { viewStore in
-            VStack(spacing: 0) {
-                customNavigationBar
+            ZStack {
+                VStack(spacing: 0) {
+                    customNavigationBar
 
-                ScrollView {
-                    formContent(viewStore: viewStore)
-                }
+                    ScrollView {
+                        formContent(viewStore: viewStore)
+                    }
 
-                submitButton(viewStore: viewStore)
-            }
-            .background(Color.Background.background)
-            .navigationBarHidden(true)
-            .toolbar(.hidden, for: .tabBar)
-            .alert("제보 완료", isPresented: viewStore.binding(
-                get: \.showSuccessAlert,
-                send: .dismissSuccessAlert
-            )) {
-                Button("확인") {
-                    dismiss()
+                    submitButton(viewStore: viewStore)
+                }
+                .background(Color.Background.background)
+                .navigationBarHidden(true)
+                .toolbar(.hidden, for: .tabBar)
+                
+                if viewStore.showAlert {
+                    VStack {
+                        Spacer()
+                        PiCKDisappearAlert(
+                            successType: viewStore.alertSuccessType,
+                            message: viewStore.alertMessage
+                        )
+                        .onDisappear {
+                            viewStore.send(.dismissAlert)
+                            if viewStore.shouldDismiss {
+                                dismiss()
+                            }
+                        }
+                        .padding(.bottom, 40)
+                    }
+                    .transition(.move(edge: .bottom).combined(with: .opacity))
+                    .zIndex(999)
                 }
-            } message: {
-                Text("버그 제보가 성공적으로 완료되었습니다.")
             }
         }
     }

Projects/Feature/HomeFeature/Sources/HomeReducer.swift

@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import PiCK_iOS_DesignSystem
 import HomeDomainInterface
 import AcceptDomainInterface
 import OutListDomainInterface
@@ -51,6 +52,9 @@ public struct HomeReducer: Reducer {
         public var floor: String = "0층"
         public var isHomeroomTeacher: Bool = false
         public var isSelfStudyTeacher: Bool = false
+        public var showAlert: Bool = false
+        public var alertSuccessType: SuccessType = .success
+        public var alertMessage: String = ""
 
         // 내부용 리스트
         var earlyReturnList: [EarlyReturnEntity] = []
@@ -90,6 +94,8 @@ public struct HomeReducer: Reducer {
         case classroomMoveResponse(TaskResult<[ClassroomMoveListEntity]>)
         case outListResponse(TaskResult<[OutListEntity]>)
         case earlyReturnListResponse(TaskResult<[EarlyReturnEntity]>)
+
+        case dismissAlert
     }
 
     public var body: some Reducer<State, Action> {
@@ -236,6 +242,10 @@ public struct HomeReducer: Reducer {
                 }
 
             case .updateStatusResponse(.success):
+                state.alertSuccessType = .success
+                state.alertMessage = "외출 처리를 성공했어요"
+                state.showAlert = true
+
                 let components = state.classroom.split(separator: "-").compactMap { Int($0) }
                 if components.count == 2 {
                     return .merge(
@@ -245,9 +255,16 @@ public struct HomeReducer: Reducer {
                 }
                 return .none
             case .updateStatusResponse(.failure):
+                state.alertSuccessType = .fail
+                state.alertMessage = "외출 처리를 실패했어요"
+                state.showAlert = true
                 return .none
 
             case .updateEarlyReturnStatusResponse(.success):
+                state.alertSuccessType = .success
+                state.alertMessage = "조기귀가 처리를 성공했어요"
+                state.showAlert = true
+
                 let components = state.classroom.split(separator: "-").compactMap { Int($0) }
                 if components.count == 2 {
                     return .merge(
@@ -257,6 +274,9 @@ public struct HomeReducer: Reducer {
                 }
                 return .none
             case .updateEarlyReturnStatusResponse(.failure):
+                state.alertSuccessType = .fail
+                state.alertMessage = "조기귀가 처리를 실패했어요"
+                state.showAlert = true
                 return .none
 
             case let .classroomMoveResponse(.success(students)):
@@ -284,6 +304,10 @@ public struct HomeReducer: Reducer {
                 return .none
             case .earlyReturnListResponse(.failure):
                 return .none
+
+            case .dismissAlert:
+                state.showAlert = false
+                return .none
             }
         }
     }