Infomaniak · valentinperignon · Apr 13, 2023 · Apr 5, 2023 · Apr 5, 2023 · Apr 12, 2023
diff --git a/Mail/Components/AvatarView.swift b/Mail/Components/AvatarView.swift
@@ -18,6 +18,7 @@
 
 import InfomaniakCore
 import MailCore
+import MailResources
 import NukeUI
 import SwiftUI
 
@@ -26,20 +27,23 @@ struct AvatarView: View {
     var size: CGFloat = 28
 
     var body: some View {
-        if let avatarImageRequest = avatarDisplayable.avatarImageRequest {
-            LazyImage(request: avatarImageRequest) { state in
-                if let image = state.image {
-                    ContactImage(image: image, size: size)
-                } else {
-                    InitialsView(
-                        initials: avatarDisplayable.initials,
-                        color: avatarDisplayable.initialsBackgroundColor,
-                        size: size
-                    )
+        Group {
+            if let avatarImageRequest = avatarDisplayable.avatarImageRequest {
+                LazyImage(request: avatarImageRequest) { state in
+                    if let image = state.image {
+                        ContactImage(image: image, size: size)
+                    } else {
+                        InitialsView(
+                            initials: avatarDisplayable.initials,
+                            color: avatarDisplayable.initialsBackgroundColor,
+                            size: size
+                        )
+                    }
                 }
+            } else {
+                InitialsView(initials: avatarDisplayable.initials, color: avatarDisplayable.initialsBackgroundColor, size: size)
             }
-        } else {
-            InitialsView(initials: avatarDisplayable.initials, color: avatarDisplayable.initialsBackgroundColor, size: size)
         }
+        .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionUserAvatar)
     }
 }
diff --git a/Mail/Components/RecipientAutocompletionCell.swift b/Mail/Components/RecipientAutocompletionCell.swift
@@ -25,6 +25,7 @@ struct RecipientAutocompletionCell: View {
     var body: some View {
         HStack {
             AvatarView(avatarDisplayable: recipient, size: 40)
+                .accessibilityHidden(true)
 
             if recipient.name.isEmpty {
                 Text(recipient.email)
@@ -40,6 +41,8 @@ struct RecipientAutocompletionCell: View {
             Spacer()
         }
         .lineLimit(1)
+        .accessibilityElement(children: .combine)
+        .accessibilityAddTraits(.isButton)
     }
 }
 

diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
@@ -93,6 +93,17 @@ struct ThreadCell: View {
         density == .large ? UIConstants.checkboxLargeSize : UIConstants.checkboxSize
     }
 
+    private var additionalAccessibilityLabel: String {
+        var label = ""
+        if isSelected {
+            label.append("\(MailResourcesStrings.Localizable.contentDescriptionSelectedItem). ")
+        }
+        if thread.hasUnseenMessages {
+            label.append(MailResourcesStrings.Localizable.actionShortMarkAsUnread)
+        }
+        return label
+    }
+
     init(
         thread: Thread,
         mailboxManager: MailboxManager,
@@ -119,6 +130,8 @@ struct ThreadCell: View {
                     .threadListSlide(density: density, isMultipleSelectionEnabled: isMultipleSelectionEnabled),
                     value: isMultipleSelectionEnabled
                 )
+                .accessibilityLabel(additionalAccessibilityLabel)
+                .accessibilityHidden(additionalAccessibilityLabel.isEmpty)
 
             Group {
                 if density == .large, let recipient = dataHolder.recipientToDisplay {
@@ -127,6 +140,7 @@ struct ThreadCell: View {
                         CheckboxView(isSelected: isSelected, density: density)
                             .opacity(isSelected ? 1 : 0)
                     }
+                    .accessibility(hidden: true)
                 } else if isMultipleSelectionEnabled {
                     CheckboxView(isSelected: isSelected, density: density)
                         .animation(
@@ -155,6 +169,7 @@ struct ThreadCell: View {
         .padding(.trailing, 16)
         .padding(.vertical, density.cellVerticalPadding)
         .clipped()
+        .accessibilityElement(children: .combine)
     }
 }
 

diff --git a/Mail/Components/ThreadCellHeaderView.swift b/Mail/Components/ThreadCellHeaderView.swift
@@ -36,13 +36,15 @@ struct ThreadCellHeaderView: View {
 
             if thread.messages.count > 1 {
                 ThreadCountIndicatorView(messagesCount: thread.messages.count, hasUnseenMessages: thread.hasUnseenMessages)
+                    .accessibilityHidden(true)
             }
 
             Spacer()
 
             Text(dataHolder.date)
                 .textStyle(.bodySmallSecondary)
                 .lineLimit(1)
+                .accessibilityHidden(true)
         }
     }
 }
diff --git a/Mail/Utils/FloatingActionButtonModifier.swift b/Mail/Utils/FloatingActionButtonModifier.swift
@@ -34,6 +34,7 @@ struct FloatingActionButtonModifier: ViewModifier {
                 MailButton(icon: icon, label: title, action: action)
                     .padding(.trailing, 24)
                     .padding(.bottom, UIConstants.floatingButtonBottomPadding)
+                    .accessibilityLabel(title)
             }
         }
         .ignoresSafeArea(.keyboard)

diff --git a/Mail/Views/Bottom sheets/ContactActionsView.swift b/Mail/Views/Bottom sheets/ContactActionsView.swift
@@ -65,6 +65,7 @@ struct ContactActionsView: View {
         VStack(alignment: .leading, spacing: 16) {
             HStack {
                 AvatarView(avatarDisplayable: recipient, size: 32)
+                    .accessibilityHidden(true)
                 VStack(alignment: .leading) {
                     Text(recipient.contact?.name ?? recipient.formattedName)
                         .textStyle(.bodyMedium)
@@ -73,6 +74,7 @@ struct ContactActionsView: View {
                 }
             }
             .padding(.bottom, 8)
+            .accessibilityElement(children: .combine)
 
             ForEach(actions, id: \.self) { action in
                 Button {

diff --git a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift
@@ -39,26 +39,32 @@ struct UserFoldersListView: View {
 
     var body: some View {
         VStack(spacing: 0) {
-            Button {
-                withAnimation {
-                    isExpanded.toggle()
-                    matomo.track(eventWithCategory: .menuDrawer, name: "customFolders", value: isExpanded)
-                }
-            } label: {
-                HStack(spacing: 12) {
-                    ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
-                    Text(MailResourcesStrings.Localizable.buttonFolders)
-                        .textStyle(.bodySmallSecondary)
-                    Spacer()
-                    Button {
-                        matomo.track(eventWithCategory: .createFolder, name: "fromMenuDrawer")
-                        globalAlert.state = .createNewFolder(mode: .create)
-                    } label: {
-                        MailResourcesAsset.addCircle.swiftUIImage
-                            .resizable()
-                            .frame(width: 16, height: 16)
+            HStack(spacing: 12) {
+                Button {
+                    withAnimation {
+                        isExpanded.toggle()
+                        matomo.track(eventWithCategory: .menuDrawer, name: "customFolders", value: isExpanded)
+                    }
+                } label: {
+                    HStack(spacing: 12) {
+                        ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
+                        Text(MailResourcesStrings.Localizable.buttonFolders)
+                            .textStyle(.bodySmallSecondary)
+                        Spacer()
                     }
                 }
+                .frame(maxWidth: .infinity)
+                .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonExpandCustomFolders)
+
+                Button {
+                    matomo.track(eventWithCategory: .createFolder, name: "fromMenuDrawer")
+                    globalAlert.state = .createNewFolder(mode: .create)
+                } label: {
+                    MailResourcesAsset.addCircle.swiftUIImage
+                        .resizable()
+                        .frame(width: 16, height: 16)
+                }
+                .accessibilityLabel(MailResourcesStrings.Localizable.newFolderDialogTitle)
             }
             .padding(.horizontal, UIConstants.menuDrawerHorizontalPadding)
             .padding(.vertical, UIConstants.menuDrawerVerticalPadding)

diff --git a/Mail/Views/Menu Drawer/MenuDrawerView.swift b/Mail/Views/Menu Drawer/MenuDrawerView.swift
@@ -105,6 +105,10 @@ struct NavigationDrawer: View {
                 }
             }
         }
+        .accessibilityAction(.escape) {
+            matomo.track(eventWithCategory: .menuDrawer, name: "closeByAccessibility")
+            navigationDrawerState.close()
+        }
         .gesture(dragGesture)
         .statusBarHidden(navigationDrawerState.isOpen)
         .onChange(of: navigationDrawerState.isOpen) { isOpen in

diff --git a/Mail/Views/Menu Drawer/MenuHeaderView.swift b/Mail/Views/Menu Drawer/MenuHeaderView.swift
@@ -44,6 +44,7 @@ struct MenuHeaderView: View {
                     .frame(width: 24)
             }
             .buttonStyle(.borderless)
+            .accessibilityLabel(MailResourcesStrings.Localizable.settingsTitle)
         }
         .padding(.top, 12)
         .padding(.bottom, 15)

diff --git a/Mail/Views/Search/SearchHistorySectionView.swift b/Mail/Views/Search/SearchHistorySectionView.swift
@@ -46,6 +46,7 @@ struct SearchHistorySectionView: View {
                             .frame(width: 16, height: 16)
                     }
                     .buttonStyle(BorderlessButtonStyle())
+                    .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonDeleteHistory)
                 }
                 .contentShape(Rectangle())
                 .onTapGesture {

diff --git a/Mail/Views/Search/SearchView.swift b/Mail/Views/Search/SearchView.swift
@@ -55,12 +55,15 @@ struct SearchView: View {
                     ForEach(viewModel.filters) { filter in
                         if filter == .folder {
                             SearchFilterFolderCell(selection: $viewModel.selectedSearchFolderId, folders: viewModel.folderList)
+                                .accessibilityHint(MailResourcesStrings.Localizable.contentDescriptionButtonFilterSearch)
                                 .padding(.horizontal, 12)
                         } else {
                             SearchFilterCell(
                                 title: filter.title,
                                 isSelected: viewModel.selectedFilters.contains(filter)
                             )
+                            .accessibilityHint(MailResourcesStrings.Localizable.contentDescriptionButtonFilterSearch)
+                            .accessibilityAddTraits(viewModel.selectedFilters.contains(filter) ? [.isSelected] : [])
                             .padding(.vertical, 2)
                             .padding(.trailing, 0)
                             .padding(.leading, 12)
@@ -120,6 +123,7 @@ struct SearchView: View {
                 } label: {
                     Image(isCompact ? MailResourcesAsset.arrowLeft.name : MailResourcesAsset.closeBig.name)
                 }
+                .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonBack)
             }
 
             ToolbarItem(placement: .navigation) {

diff --git a/Mail/Views/SplitView.swift b/Mail/Views/SplitView.swift
@@ -83,6 +83,7 @@ struct SplitView: View {
                             mailboxManager: mailboxManager,
                             isCompact: isCompact
                         )
+                        .accessibilityHidden(navigationDrawerController.isOpen)
                     }
                     .navigationViewStyle(.stack)
 

diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -322,6 +322,7 @@ private struct ThreadListToolbar: ViewModifier {
                                         .scaledToFit()
                                         .frame(width: UIConstants.navbarIconSize, height: UIConstants.navbarIconSize)
                                 }
+                                .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonMenu)
                             }
                         }
                     }
@@ -357,6 +358,7 @@ private struct ThreadListToolbar: ViewModifier {
                             } label: {
                                 AvatarView(avatarDisplayable: AccountManager.instance.currentAccount.user)
                             }
+                            .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionUserAvatar)
                         }
                     }
 

diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -73,6 +73,7 @@ struct MessageHeaderSummaryView: View {
                                 .lineLimit(1)
                                 .textStyle(.bodySmallSecondary)
                             ChevronButton(isExpanded: $isHeaderExpanded)
+                                .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonExpandRecipients)
                                 .onChange(of: isHeaderExpanded) { isExpanded in
                                     matomo.track(eventWithCategory: .message, name: "openDetails", value: isExpanded)
                                 }

diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings
diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings
diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings
diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings
diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings