[✨] Alert 관리 기능 추가

AcaMate/1. View/0. Common/NavigationView.swift

@@ -46,6 +46,9 @@ struct NavigationView: View {
             printLog("\(old.path) => \(new.path)")
             showHistory()
         }
+        .fullView(.Normal.normal)
+        .setAlert()
+        .setNetwork()
     }
     
     private func addHistory(path: PathName) {

AcaMate/1. View/1. Intro & Login/IntroView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 import Combine
 
 struct IntroView: View {
+    @EnvironmentObject var alertController: AlertController
     @State var cancellables: Set<AnyCancellable> = []
     @Binding var naviState : NaviState
     
@@ -37,9 +38,10 @@ struct IntroView: View {
                 .foregroundStyle(Color(.Text.detail))
                 .padding(.bottom,50)
         }
-        .fullView(.Normal.normal)
+        
         .onAppear {
             printLog("IntroView_onAppear")
+            subscribeAlertAction()
             loadVersion()
                 .sink { completion in
                     switch completion {
@@ -48,24 +50,20 @@ struct IntroView: View {
                     case .finished: break
                     }
                 } receiveValue: { version in
-                    switch compareVersion(version.force_ver, currentVersion()){
+                    let compareForce = compareVersion(version.force_ver, currentVersion())
-                    case .bigger:
+                    let compareChoice = compareVersion(version.final_ver, currentVersion())
-                        printLog("강제 업데이트")
+                    if compareForce == .bigger {
-                    default:
+                        alertController.alertData = SetAlertData().setForceUpdate(
-                        switch compareVersion(version.final_ver, currentVersion()) {
+                            action: alertController.alertAction
-                        case .bigger:
+                        )
-                            if version.choice_update_yn {
+                        alertController.showAlert.toggle()
-                                printLog("선택 업데이트")
+                    } else if compareChoice == .bigger && version.choice_update_yn {
-                            }
+                        alertController.alertData = SetAlertData().setSelectUpdate(
-                            else {
+                            action: alertController.alertAction
-                                printLog("정상 동작")
+                        )
-                                naviState.set(act: .RESET, path: .Login)
+                        alertController.showAlert.toggle()
-                            }
+                    } else {
-                        default:
+                        naviState.set(act: .RESET, path: .Login)
-                            printLog("선택 업데이트 넘어감")
-                            naviState.set(act: .MOVE, path: .Login)
-                            
-                        }
                     }
                 }
                 .store(in: &cancellables)
@@ -74,6 +72,19 @@ struct IntroView: View {
         }
     }
     
+    private func subscribeAlertAction() {
+        alertController.alertAction
+            .compactMap { $0 }
+            .sink { action in
+                if action == "updateNow" {
+                    exit(1)
+                    //MARK: - TODO (앱스토어 이동 로직 넣을 것)
+                } else {
+                    naviState.set(act: .RESET, path: .Login)
+                }
+            }.store(in: &cancellables)
+    }
+    
     
     private func loadVersion() -> Future<VersionData, Error> {
         return Future { promise in

AcaMate/1. View/1. Intro & Login/LoginView.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct LoginView: View {
+    @EnvironmentObject var alertController: AlertController
     @Binding var naviState : NaviState
     
     var body: some View {
@@ -37,7 +38,10 @@ struct LoginView: View {
             }
             
             Button {
-                naviState.set(act: .MOVE,path: .Intro)
+                alertController.alertData = SetAlertData().setTest()
+                alertController.showAlert.toggle()
+//                naviState.set(act: .MOVE,path: .Intro)
+                
             } label: {
                 Text("111111111")
             }

AcaMate/3. Controller/AlertController.swift

@@ -0,0 +1,19 @@
+//
+//  AlertController.swift
+//  AcaMate
+//
+//  Created by Sean Kim on 12/13/24.
+//
+
+import SwiftUI
+import Combine
+
+
+class AlertController: ObservableObject {
+    @Published var showAlert: Bool = false
+    var alertData: AlertData = .init(body: "")
+    
+    let alertAction = CurrentValueSubject<String?, Never>(nil)
+    
+    
+}

AcaMate/4. Model/Alert.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Combine
 
 struct AlertData {
     var title: String
@@ -24,3 +25,62 @@ struct ButtonType {
     var role: ButtonRole?
     var function: (()->())?
 }
+
+
+
+struct SetAlertData {
+    func setTest() -> AlertData {
+        return AlertData(title: "TEST", body: "TEST용 알럿 입니다.",
+                         button: [
+                            ButtonType(name: "테스트", role: .cancel,
+                                       function: {
+                                           printLog("테스트 중입니다.")
+                                       })
+                         ])
+    }
+    
+    
+    /// 강제 업데이트 안내
+    func setForceUpdate(action: CurrentValueSubject<String?, Never>) -> AlertData {
+        return AlertData(title: "업데이트 안내",
+                         body: """
+                                앱 최신 버전이 나왔습니다.
+                                앱을 종료 후 업데이트를 해주세요.
+                                """,
+                         button: [
+                            ButtonType(name: "업데이트 하기", role: .none,
+                                       function: {
+                                           action.send("updateNow")
+                                       })
+                         ])
+    }
+    
+    /// 선택 업데이트 안내
+    func setSelectUpdate (action: CurrentValueSubject<String?, Never>) -> AlertData {
+        return AlertData(title: "업데이트 안내",
+                         body: """
+                                앱 최신 버전이 새로 나왔습니다.
+                                지금 업데이트 하시겠어요?
+                                """,
+                         button: [
+                            ButtonType(name: "지금 업데이트", role: .cancel,
+                                       function: {
+                                           action.send("updateNow")
+                                       }),
+                            ButtonType(name: "나중에", role: .none,
+                                       function: {
+                                           action.send("updateLater")
+                                       }),
+                         ])
+    }
+    
+    /// 네트워크 문제 발생 시
+    func setErrorNetwork() -> AlertData {
+        return AlertData(title: "네트워크 오류", body: "네트워크가 불안정합니다.\n확인 후 다시 시도해주세요.",
+                         button: [
+                            ButtonType(name: "확인", role: .cancel, function: nil)
+                         ])
+    }
+    
+}
+

AcaMate/5. Modifier/View.swift

@@ -10,17 +10,41 @@ import Combine
 
 struct NetworkModifier: ViewModifier {
     @ObservedObject private var networkMonitor = NetworkMonitor.shared
+    @EnvironmentObject var alertController: AlertController
     
     func body(content: Content) -> some View {
         content
             .onChange(of: networkMonitor.isConnected) { _ , new in
-                if new {
+                if !new {
-                    
+                    alertController.alertData = SetAlertData().setErrorNetwork()
+                    alertController.showAlert.toggle()
                 }
             }
     }
 }
 
+struct AlertModifier: ViewModifier {
+    @EnvironmentObject var controller: AlertController
+    func body(content: Content) -> some View {
+        content
+            .alert(controller.alertData.title,
+                   isPresented: $controller.showAlert,
+                   presenting: $controller.alertData) { data in
+                let btnCount = data.button.count
+                ForEach(0 ..< btnCount, id: \.self) { index in
+                    let btn = data.wrappedValue.button[index]
+                    Button(role: btn.role) {
+                        if let function = btn.function { function() }
+                    } label: {
+                        Text("\(btn.name)")
+                    }
+                }
+            } message: { data in
+                Text("\(data.body.wrappedValue)")
+            }
+    }
+}
+
 extension View {
     func fullView(_ backColor: Color) -> some View {
         return self
@@ -28,6 +52,13 @@ extension View {
             .background(backColor)
     }
     
+    func setAlert() -> some View {
+        self.modifier(AlertModifier())
+    }
+    func setNetwork() -> some View {
+        self.modifier(NetworkModifier())
+    }
+    
     func endTextEditing() {
             UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
     }

AcaMate/AcaMateApp.swift

@@ -15,6 +15,7 @@ import KakaoSDKAuth
 struct AcaMateApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     var cancellables: Set<AnyCancellable> = []
+    var alertController = AlertController()
     
     init() {
         printLog("APP INIT")
@@ -22,11 +23,13 @@ struct AcaMateApp: App {
     
     var body: some Scene {
         WindowGroup {
-            NavigationView().onOpenURL { url in
+            NavigationView()
-                if (AuthApi.isKakaoTalkLoginUrl(url)) {
+                .onOpenURL { url in
-                    _ = AuthController.handleOpenUrl(url: url)
+                    if (AuthApi.isKakaoTalkLoginUrl(url)) {
+                        _ = AuthController.handleOpenUrl(url: url)
+                    }
                 }
-            }
+                .environmentObject(self.alertController)
         }
     }
 }