[] Alert 관리 기능 추가

This commit is contained in:
김선규 2024-12-13 17:31:44 +09:00
parent eb726b0c7d
commit dfce91f13c
9 changed files with 158 additions and 27 deletions

View File

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

View File

@ -9,6 +9,7 @@ import SwiftUI
import Combine import Combine
struct IntroView: View { struct IntroView: View {
@EnvironmentObject var alertController: AlertController
@State var cancellables: Set<AnyCancellable> = [] @State var cancellables: Set<AnyCancellable> = []
@Binding var naviState : NaviState @Binding var naviState : NaviState
@ -37,9 +38,10 @@ struct IntroView: View {
.foregroundStyle(Color(.Text.detail)) .foregroundStyle(Color(.Text.detail))
.padding(.bottom,50) .padding(.bottom,50)
} }
.fullView(.Normal.normal)
.onAppear { .onAppear {
printLog("IntroView_onAppear") printLog("IntroView_onAppear")
subscribeAlertAction()
loadVersion() loadVersion()
.sink { completion in .sink { completion in
switch completion { switch completion {
@ -48,24 +50,20 @@ struct IntroView: View {
case .finished: break case .finished: break
} }
} receiveValue: { version in } 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) .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> { private func loadVersion() -> Future<VersionData, Error> {
return Future { promise in return Future { promise in

View File

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

View File

@ -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)
}

View File

@ -6,6 +6,7 @@
// //
import SwiftUI import SwiftUI
import Combine
struct AlertData { struct AlertData {
var title: String var title: String
@ -24,3 +25,62 @@ struct ButtonType {
var role: ButtonRole? var role: ButtonRole?
var function: (()->())? 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)
])
}
}

View File

@ -10,17 +10,41 @@ import Combine
struct NetworkModifier: ViewModifier { struct NetworkModifier: ViewModifier {
@ObservedObject private var networkMonitor = NetworkMonitor.shared @ObservedObject private var networkMonitor = NetworkMonitor.shared
@EnvironmentObject var alertController: AlertController
func body(content: Content) -> some View { func body(content: Content) -> some View {
content content
.onChange(of: networkMonitor.isConnected) { _ , new in .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 { extension View {
func fullView(_ backColor: Color) -> some View { func fullView(_ backColor: Color) -> some View {
return self return self
@ -28,6 +52,13 @@ extension View {
.background(backColor) .background(backColor)
} }
func setAlert() -> some View {
self.modifier(AlertModifier())
}
func setNetwork() -> some View {
self.modifier(NetworkModifier())
}
func endTextEditing() { func endTextEditing() {
UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil) UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
} }

View File

@ -15,6 +15,7 @@ import KakaoSDKAuth
struct AcaMateApp: App { struct AcaMateApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
var cancellables: Set<AnyCancellable> = [] var cancellables: Set<AnyCancellable> = []
var alertController = AlertController()
init() { init() {
printLog("APP INIT") printLog("APP INIT")
@ -22,11 +23,13 @@ struct AcaMateApp: App {
var body: some Scene { var body: some Scene {
WindowGroup { 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)
} }
} }
} }