Merge pull request #901 from Infomaniak/missing-matomo-and-accessibility

feat: Add missing matomo and accessibility

Mail/Views/Menu Drawer/Folders/FolderCell.swift

@@ -153,6 +153,7 @@ struct FolderCellContent: View {
                     ChevronIcon(style: folder.isExpanded ? .up : .down, color: .secondary)
                 }
                 .opacity(level == 0 && !folder.children.isEmpty ? 1 : 0)
+                .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonExpandFolder(folder.name))
             }
 
             folder.icon
@@ -202,6 +203,9 @@ struct FolderCellContent: View {
     }
 
     private func collapseFolder() {
+        @InjectService var matomo: MatomoUtils
+        matomo.track(eventWithCategory: .menuDrawer, name: "collapseFolder", value: !folder.isExpanded)
+
         guard let liveFolder = folder.thaw() else { return }
         try? liveFolder.realm?.write {
             liveFolder.isExpanded = !folder.isExpanded

Mail/Views/New Message/Header Cells/SenderMenuCell.swift

@@ -16,6 +16,8 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import InfomaniakCoreUI
+import InfomaniakDI
 import MailCore
 import MailResources
 import SwiftUI
@@ -29,6 +31,9 @@ struct SenderMenuCell: View {
 
     var body: some View {
         Button {
+            @InjectService var matomo: MatomoUtils
+            matomo.track(eventWithCategory: .newMessage, name: "switchIdentity")
+
             withAnimation {
                 self.currentSignature = signature
             }
@@ -41,6 +46,7 @@ struct SenderMenuCell: View {
                     MailResourcesAsset.check.swiftUIImage
                 }
             }
+            .accessibilityHint(MailResourcesStrings.Localizable.contentDescriptionButtonSelectSignature)
 
             Text(signature.senderEmailIdn)
         }

Mail/Views/New Message/Recipients/FullRecipientsList.swift

@@ -20,6 +20,8 @@ import MailCore
 import RealmSwift
 import SwiftUI
 import WrappingHStack
+import InfomaniakDI
+import InfomaniakCoreUI
 
 struct FullRecipientsList: View {
     @EnvironmentObject private var mailboxManager: MailboxManager
@@ -42,6 +44,9 @@ struct FullRecipientsList: View {
     }
 
     @MainActor private func remove(recipientAt: Int) {
+        @InjectService var matomo: MatomoUtils
+        matomo.track(eventWithCategory: .newMessage, name: "deleteRecipient")
+
         withAnimation {
             $recipients.remove(at: recipientAt)
         }

Mail/Views/Switch User/AddMailboxView.swift

@@ -35,11 +35,11 @@ struct AddMailboxView: View {
 
     var body: some View {
         VStack(alignment: .leading) {
-            Text(MailResourcesStrings.Localizable.attachAddressDescription)
+            Text(MailResourcesStrings.Localizable.attachMailboxDescription1)
                 .textStyle(.bodySecondary)
                 .padding(.bottom, 32)
 
-            TextField(MailResourcesStrings.Localizable.attachAddressInputHint, text: $newAddress)
+            TextField(MailResourcesStrings.Localizable.attachMailboxInputHint, text: $newAddress)
                 .textContentType(.emailAddress)
                 .keyboardType(.emailAddress)
                 .autocorrectionDisabled()
@@ -53,11 +53,11 @@ struct AddMailboxView: View {
                 }
                 .padding(.bottom, 4)
 
-            Text(MailResourcesStrings.Localizable.attachAddressInputHelper)
+            Text(MailResourcesStrings.Localizable.attachMailboxDescription2)
                 .textStyle(showError ? .labelError : .labelSecondary)
                 .padding(.bottom, 8)
 
-            SecureField(MailResourcesStrings.Localizable.attachAddressPasswordInputHint, text: $password)
+            SecureField(MailResourcesStrings.Localizable.attachMailboxPasswordInputHint, text: $password)
                 .textContentType(.password)
                 .padding([.vertical, .leading], 12)
                 .padding(.trailing, 16)
@@ -76,13 +76,13 @@ struct AddMailboxView: View {
 
             Spacer()
 
-            MailButton(label: MailResourcesStrings.Localizable.buttonAttachEmailAddress) {
+            MailButton(label: MailResourcesStrings.Localizable.buttonAttachMailbox) {
                 addMailbox()
             }
             .disabled(buttonDisabled)
             .mailButtonFullWidth(true)
         }
-        .navigationBarTitle(MailResourcesStrings.Localizable.attachAddressTitle, displayMode: .inline)
+        .navigationBarTitle(MailResourcesStrings.Localizable.attachMailboxTitle, displayMode: .inline)
         .padding(.horizontal, 16)
         .padding(.vertical, 32)
     }