codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed that only one Alert can be declared (first one, unsavedChangesMessage, didn't work)

This commit is contained in:
dankito 2020-08-24 17:42:21 +02:00
parent 5bdc17e9ce
commit aaa22bc2c1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/BankingiOSApp/BankingiOSApp/ui/views/BankSettingsDialog.swift
View File

@ -19,9 +19,7 @@ struct BankSettingsDialog: View {
@State private var selectedTanProcedure: TanProcedure? @State private var selectedTanProcedure: TanProcedure?
@State private var unsavedChangesMessage: Message? = nil @State private var askUserToDeleteAccountOrSaveChangesMessage: Message? = nil
@State private var askToDeleteAccountMessage: Message? = nil
private var hasUnsavedData: Bool { private var hasUnsavedData: Bool {
@ -89,10 +87,7 @@ struct BankSettingsDialog: View {
Spacer() Spacer()
} }
} }
.alert(item: $unsavedChangesMessage) { message in .alert(item: $askUserToDeleteAccountOrSaveChangesMessage) { message in
Alert(title: message.title, message: message.message, primaryButton: message.primaryButton, secondaryButton: message.secondaryButton!)
}
.alert(item: $askToDeleteAccountMessage) { message in
Alert(title: message.title, message: message.message, primaryButton: message.primaryButton, secondaryButton: message.secondaryButton!) Alert(title: message.title, message: message.message, primaryButton: message.primaryButton, secondaryButton: message.secondaryButton!)
} }
.fixKeyboardCoversLowerPart() .fixKeyboardCoversLowerPart()
@ -102,7 +97,7 @@ struct BankSettingsDialog: View {
func askUserToDeleteAccount() { func askUserToDeleteAccount() {
self.askToDeleteAccountMessage = Message(title: Text("Delete account?"), message: Text("Really delete account '\(bank.displayName)'? This cannot be undone and data will be lost."), primaryButton: .destructive(Text("Delete"), action: deleteAccount), secondaryButton: .cancel()) self.askUserToDeleteAccountOrSaveChangesMessage = Message(title: Text("Delete account?"), message: Text("Really delete account '\(bank.displayName)'? This cannot be undone and data will be lost."), primaryButton: .destructive(Text("Delete"), action: deleteAccount), secondaryButton: .cancel())
} }
func deleteAccount() { func deleteAccount() {
@ -114,7 +109,7 @@ struct BankSettingsDialog: View {
private func cancelPressed() { private func cancelPressed() {
if hasUnsavedData { if hasUnsavedData {
self.unsavedChangesMessage = Message(title: Text("Unsaved changes"), message: Text("Changed data hasn't been saved. Are you sure you want to discard them?"), primaryButton: .ok(closeDialog), secondaryButton: .cancel()) self.askUserToDeleteAccountOrSaveChangesMessage = Message(title: Text("Unsaved changes"), message: Text("Changed data hasn't been saved. Are you sure you want to discard them?"), primaryButton: .ok(closeDialog), secondaryButton: .cancel())
} }
else { else {
closeDialog() closeDialog()