diff --git a/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift b/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift index b759ac4f29d1993a7cbd596cf24d7cb2bd0a089c..c0df652358d21d71ee75d4bdccbad65ede688238 100644 --- a/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift +++ b/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift @@ -32,9 +32,10 @@ struct ComposeViewHeader: View { if model.mentionsAttachments && model.attachments == [] { model.showAttachmentAlert = true model.resumeSend = false + print("You forgot the attachments") } if model.resumeSend { - model.sendMail() + // model.sendMail() presentationMode.wrappedValue.dismiss() } model.resumeSend = true diff --git a/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift b/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift index 63c63d878fb0fc2948df92499ea52658aebf3a74..a35830804f5328c814181660018d9c6833215b86 100644 --- a/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift +++ b/enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift @@ -33,8 +33,8 @@ class ComposeModel: ObservableObject { /// computed property checks whether an attachment is mentioned in the mail (subject or body) var mentionsAttachments: Bool { - let germanWords = ["Anhang", "anhang", "angehängt", "angehangen", "Anhänge"] - let englishWords = ["attachment", "attachments", "attached", "attach"] + let germanWords = ["Anhang", "anhang", "Angehängt", "angehängt", "Angehangen", "angehangen", "Anhänge", "anhänge"] + let englishWords = ["Attachment", "attachment", "Attachments", "attachments", "Attached", "attached", "Attach", "attach"] // TODO: more languages? let allWords = germanWords + englishWords return allWords.contains(where: self.body.contains) || allWords.contains(where: self.subject.contains) @@ -44,7 +44,7 @@ class ComposeModel: ObservableObject { /// Generates mail and sends it. func sendMail() { - //generateMail().send() + generateMail().send() } /// Adds email addresses to given RecipientFieldModel. diff --git a/enzevalos_iphone/SwiftUI/Compose/ComposeView.swift b/enzevalos_iphone/SwiftUI/Compose/ComposeView.swift index ea74db1d8496d0e955e258b4751bfe68644b857f..03f8a855c6148a061931e6dd356aca86856cd154 100644 --- a/enzevalos_iphone/SwiftUI/Compose/ComposeView.swift +++ b/enzevalos_iphone/SwiftUI/Compose/ComposeView.swift @@ -87,13 +87,13 @@ struct ComposeView: View { Alert( title: Text("Attachment.Alert.Title"), message: Text("Attachment.Alert.Text"), - primaryButton: .destructive(Text("Attachment.Alert.PrimaryButton")) { + primaryButton: .destructive(Text("Attachment.Alert.PrimaryButton").foregroundColor(Color.blue)) { // send the mail anyway model.sendMail() presentationMode.wrappedValue.dismiss() }, - secondaryButton: .destructive(Text("Attachment.Alert.SecondaryButton")) { - // quit send, edit again + secondaryButton: .destructive(Text("Attachment.Alert.SecondaryButton").foregroundColor(Color.blue)) { + // quit sending, enable further editing } ) }