From b4efa42c21c05330fe45f1c71d48a254e73ca906 Mon Sep 17 00:00:00 2001
From: Aylin <a.akkus@fu-berlin.de>
Date: Sat, 27 Mar 2021 11:48:13 +0100
Subject: [PATCH] AttachmentAlert works now

---
 enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift | 3 ++-
 enzevalos_iphone/SwiftUI/Compose/ComposeModel.swift      | 6 +++---
 enzevalos_iphone/SwiftUI/Compose/ComposeView.swift       | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift b/enzevalos_iphone/SwiftUI/Compose/ComposeHeaderView.swift
index b759ac4f..c0df6523 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 63c63d87..a3583080 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 ea74db1d..03f8a855 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
             }
         )
     }
-- 
GitLab