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

Implemented showing 'Discard' instead of 'OK' to discard changes

This commit is contained in:
dankito 2020-08-24 17:53:37 +02:00
parent aaa22bc2c1
commit 974d427e1a
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
View File

@ -2,6 +2,7 @@
"OK" = "OK"; "OK" = "OK";
"Cancel" = "Cancel"; "Cancel" = "Cancel";
"Done" = "Done"; "Done" = "Done";
"Discard" = "Discard";
"Add" = "Add"; "Add" = "Add";
"New" = "New"; "New" = "New";

1
ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings
View File

@ -2,6 +2,7 @@
"OK" = "OK"; "OK" = "OK";
"Cancel" = "Abbrechen"; "Cancel" = "Abbrechen";
"Done" = "Fertig"; "Done" = "Fertig";
"Discard" = "Verwerfen";
"Add" = "Hinzufügen"; "Add" = "Hinzufügen";
"New" = "Neu"; "New" = "Neu";

10
ui/BankingiOSApp/BankingiOSApp/ui/ViewExtensions.swift
View File

@ -107,8 +107,16 @@ extension Color {
extension Alert.Button { extension Alert.Button {
public static func `default`(_ label: String, _ action: (() -> Void)? = {}) -> Alert.Button {
return .default(Text(label), action: action)
}
public static func ok(_ action: (() -> Void)? = {}) -> Alert.Button { public static func ok(_ action: (() -> Void)? = {}) -> Alert.Button {
return .default(Text("OK"), action: action) return .default("OK", action)
}
public static func discard(_ action: (() -> Void)? = {}) -> Alert.Button {
return .destructive(Text("Discard"), action: action)
} }
} }

2
ui/BankingiOSApp/BankingiOSApp/ui/views/BankAccountSettingsDialog.swift
View File

@ -71,7 +71,7 @@ struct BankAccountSettingsDialog: 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.unsavedChangesMessage = Message(title: Text("Unsaved changes"), message: Text("Changed data hasn't been saved. Are you sure you want to discard them?"), primaryButton: .discard(closeDialog), secondaryButton: .cancel())
} }
else { else {
closeDialog() closeDialog()

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

@ -109,7 +109,7 @@ struct BankSettingsDialog: View {
private func cancelPressed() { private func cancelPressed() {
if hasUnsavedData { if hasUnsavedData {
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()) self.askUserToDeleteAccountOrSaveChangesMessage = Message(title: Text("Unsaved changes"), message: Text("Changed data hasn't been saved. Are you sure you want to discard them?"), primaryButton: .discard(closeDialog), secondaryButton: .cancel())
} }
else { else {
closeDialog() closeDialog()