Fixed showing of Bcc field.

enzevalos_iphone/SwiftUI/Compose/ComposeView.swift

@@ -10,56 +10,41 @@ import SwiftUI
 /// A view used to compose and send an email.
 struct ComposeView: View {
     @State private var cc = ""
-    @State private var isEditingCcOrBcc = false
-    @ObservedObject var composer: ComposeModel
+    @ObservedObject var model: ComposeModel
     
     /// - Parameter preData: Data of email to reply to or forward.
     init(preData: PreMailData? = nil) {
-        composer = ComposeModel(preData: preData)
+        model = ComposeModel(preData: preData)
     }
     
     var body: some View {
         VStack {
             // Top bar with Cancel and Send button
             ComposeViewHeader()
-                .environmentObject(composer)
+                .environmentObject(model)
             
             Divider()
             
-            // "To" recipient
-            RecipientField(recipientFieldModel: composer.recipientsModel.toModel)
+            // "To" recipients
+            RecipientField(model: model.recipientsModel.toModel)
             Divider()
             
-            // "Cc/Bcc" recipient
-            if isEditingCcOrBcc || !cc.isEmpty {
-                RecipientField(recipientFieldModel: composer.recipientsModel.ccModel)
-                
-                Divider()
-                
-                RecipientField(recipientFieldModel: composer.recipientsModel.bccModel)
-            } else {
-                // TODO: Solve "Cc/Bcc" <--> "Cc", "Bcc" switch more elegantly.
-                // "Cc/Bcc" field never actually gets used, it gets replaced by
-                // separate "Cc" and "Bcc" RecipientFields above, once selected.
-                TextField("Cc" + "/" + "Bcc", text: $cc) { ccSelected in
-                    self.isEditingCcOrBcc = ccSelected
-                }
-            }
-            
-            Divider()
+            // "Cc/Bcc" recipients
+            CcAndBccFields(model: model.recipientsModel)
             
             // Subject
             HStack {
                 Text("Subject")
                     .foregroundColor(Color(UIColor.tertiaryLabel))
-                TextField("", text: $composer.subject)
+                TextField("", text: $model.subject)
                     .autocapitalization(.none)
                     .frame(minWidth: 0, maxWidth: .infinity)
             }
+            
             Divider()
             
             // Email body
-            TextEditor(text: $composer.body)
+            TextEditor(text: $model.body)
         }
         .padding()
         .animation(.default)
@@ -67,23 +52,41 @@ struct ComposeView: View {
     }
 }
 
+struct CcAndBccFields: View {
+    @ObservedObject var model: RecipientsModel
+    
+    var body: some View {
+        VStack {
+            RecipientField(model: model.ccModel)
+            
+            Divider()
+            
+            if model.showBccField {
+                RecipientField(model: model.bccModel)
+                
+                Divider()
+            }
+        }
+    }
+}
+
 /// A view in which recipients get added or removed.
 struct RecipientField: View {
-    @ObservedObject var recipientFieldModel: RecipientFieldModel
+    @ObservedObject var model: RecipientFieldModel
     @State var showList = false
     
     var body: some View {
         VStack {
             HStack {
                 // Recipient text field
-                Text(recipientFieldModel.type.asString)
+                Text(model.type.asString)
                     .foregroundColor(Color(UIColor.tertiaryLabel))
                 
                 // Shows selected recipients as blue capsules
                 // followed by TextField for new recipients
                 ScrollView(.horizontal) {
                     HStack(spacing: 4) {
-                        ForEach(recipientFieldModel.selectedContacts) { (recipient: AddressRecord) in
+                        ForEach(model.selectedContacts) { (recipient: AddressRecord) in
                             Text(recipient.displayname ?? recipient.email)
                                 .foregroundColor(.white)
                                 .padding(.horizontal, 12)
@@ -91,9 +94,18 @@ struct RecipientField: View {
                                 .background(Color.accentColor)
                                 .clipShape(Capsule())
                         }
-                        TextField("", text: $recipientFieldModel.text, onCommit: {
-                            recipientFieldModel.commitText()
-                        })
+                        TextField("", text: $model.text) { isEditing in
+                            model.parent?.isEditingCcOrBcc = isEditing
+                        } onCommit: {
+                            model.commitText()
+                            // TODO: Fix bug on first Cc or Bcc recipient commit
+                            // For some reason, model.selectedContacts.count stays 0
+                            // after the first committed recipient, leading to the Cc
+                            // and Bcc fields getting collapsed again despite the
+                            // first recipient clearly getting rendered as a blue
+                            // capsule in the ForEach loop above. 🤔🤔🤔
+                            print(model.selectedContacts.count)
+                        }
                         .frame(minWidth: 200)
                         .autocapitalization(.none)
                         .keyboardType(.emailAddress)
@@ -101,27 +113,29 @@ struct RecipientField: View {
                 }
                 
                 // Toggles contact list
+                if model.type != .ccBcc {
                     Button(action: { showList.toggle() }) {
                         Image(systemName: !showList ? "plus.circle" : "chevron.up.circle")
                     }
                 }
+            }
             .frame(height: 20)
             
             // Contact list
             if showList {
                 Divider()
                 RecipientListView()
-                    .frame(height: 464)
+                    .frame(height: 460)
             }
         }
-        .environmentObject(recipientFieldModel)
+        .environmentObject(model)
     }
 }
 
 /// A view containing the Cancel and Send buttons for an email.
 struct ComposeViewHeader: View {
     @Environment(\.presentationMode) var presentationMode
-    @EnvironmentObject var composer: ComposeModel
+    @EnvironmentObject var model: ComposeModel
     
     var body: some View {
         VStack {
@@ -130,7 +144,6 @@ struct ComposeViewHeader: View {
                 .fill(Color(.lightGray))
                 .frame(width: 70, height: 5)
             
-            
             HStack {
                 // Cancel button
                 Button("Cancel") {
@@ -140,17 +153,17 @@ struct ComposeViewHeader: View {
                 Spacer()
                 
                 // Send button
-                Button(action: {
-                    composer.sendMail()
+                Button {
+                    model.sendMail()
                     presentationMode.wrappedValue.dismiss()
-                }) {
-                    if composer.encryptionOff {
-                        UnencryptedSendButton(grayedOut: composer.recipientsModel.hasNoRecipients)
+                } label: {
+                    if model.encryptionOff {
+                        UnencryptedSendButton(grayedOut: model.recipientsModel.hasNoRecipients)
                     } else {
-                        EncryptedSendButton(grayedOut: composer.recipientsModel.hasNoRecipients)
+                        EncryptedSendButton(grayedOut: model.recipientsModel.hasNoRecipients)
                     }
                 }
-                .disabled(composer.recipientsModel.hasNoRecipients)
+                .disabled(model.recipientsModel.hasNoRecipients)
             }
         }
     }

enzevalos_iphone/SwiftUI/Compose/RecipientFieldModel.swift

@@ -11,12 +11,13 @@ import SwiftUI
 
 /// A model for a single recipient field.
 class RecipientFieldModel: ObservableObject {
-    @Published var suggestions: [AddressRecord] = []
-    @Published var selectedContacts = [AddressRecord]() // TODO: As AddressProperty???
+    @Published var suggestions = [AddressRecord]()
+    @Published var selectedContacts = [AddressRecord]()
+    @Published var type: RecipientType
     private var dataprovider: PersistentDataProvider
-    let type: RecipientType
+    var parent: RecipientsModel?
     
-    init(type: RecipientType, parent: RecipientsModel?, dataprovider: PersistentDataProvider) {
+    init(type: RecipientType, dataprovider: PersistentDataProvider) {
         self.type = type
         self.dataprovider = dataprovider
     }
@@ -68,16 +69,18 @@ class RecipientFieldModel: ObservableObject {
             addNewAddress(text)
             text = ""
         }
+        print(selectedContacts.count)
     }
     
     func addNewAddress(_ address: String) {
-        guard address.count > 0 else {
-            // TODO: Add email validiation + warning?
+        guard address.count > 0 && address.contains("@") else {
+            // TODO: Add email validation + warning?
             return
         }
         
         dataprovider.importNewData(from: [AddressProperties(email: address)]) { error in
             let frc = self.dataprovider.createFetchResultController(fetchRequest: AddressRecord.lookForExisting(email: address))
+            
             if let addresses = frc.fetchedObjects, let addr = addresses.first {
                 self.selectedContacts.append(addr)
             }

enzevalos_iphone/SwiftUI/Compose/RecipientsModel.swift

@@ -15,6 +15,7 @@ enum RecipientType {
     case to
     case cc
     case bcc
+    case ccBcc
     
     var asString: LocalizedStringKey {
         switch self {
@@ -24,6 +25,8 @@ enum RecipientType {
             return "Cc"
         case .bcc:
             return "Bcc"
+        case .ccBcc:
+            return "CcBcc"
         }
     }
 }
@@ -33,13 +36,25 @@ class RecipientsModel: ObservableObject {
     let toModel: RecipientFieldModel
     let ccModel: RecipientFieldModel
     let bccModel: RecipientFieldModel
+    @Published var showBccField = false
     
     /// Initializes models for "To", "Cc", and "Bcc" fields.
     init() {
         let dataprovider = LetterboxModel.instance.dataProvider
-        toModel = RecipientFieldModel(type: .to, parent: nil, dataprovider: dataprovider)
-        ccModel = RecipientFieldModel(type: .cc, parent: nil, dataprovider: dataprovider)
-        bccModel = RecipientFieldModel(type: .bcc, parent: nil, dataprovider: dataprovider)
+        toModel = RecipientFieldModel(type: .to, dataprovider: dataprovider)
+        ccModel = RecipientFieldModel(type: .ccBcc, dataprovider: dataprovider)
+        bccModel = RecipientFieldModel(type: .bcc, dataprovider: dataprovider)
+        ccModel.parent = self
+        bccModel.parent = self
+    }
+    
+    /// Used to show or hide Bcc field
+    var isEditingCcOrBcc: Bool = false {
+        didSet {
+            print("isEditingCcOrBcc: \(isEditingCcOrBcc)")
+            updateShowBccField()
+            print("showBccField: \(showBccField)")
+        }
     }
     
     /// Used to deactivate Send button if email has no recipients.
@@ -69,4 +84,11 @@ class RecipientsModel: ObservableObject {
             bccModel.selectedContacts.map({ $0.email })
         }
     }
+    
+    func updateShowBccField() {
+        showBccField = isEditingCcOrBcc
+            || !ccModel.selectedContacts.isEmpty
+            || !bccModel.selectedContacts.isEmpty
+        ccModel.type = showBccField ? .cc : .ccBcc
+    }
 }

enzevalos_iphone/de.lproj/Localizable.strings

@@ -22,6 +22,7 @@
 "Bcc" = "Bcc";
 "Cancel" = "Abbrechen";
 "Cc" = "Cc";
+"CcBcc" = "Cc/Bcc";
 "Name" = "Name";
 "SortBy" = "Sortiere nach";
 "LastContacted" = "zuletzt kontaktiert";

enzevalos_iphone/en.lproj/Localizable.strings

@@ -22,6 +22,7 @@
 "Bcc" = "Bcc";
 "Cancel" = "Cancel";
 "Cc" = "Cc";
+"CcBcc" = "Cc/Bcc";
 "SortBy" = "Sort by";
 "Name" = "Name";
 "LastContacted" = "Last Contacted";