Merge pull request #943 from Infomaniak/fix-menu-chevron

refactor(ChevronIcon): Update chevron color to 666666
Infomaniak · Aug 23, 2023 · b4d6ac7 · b4d6ac7
2 parents 87d31b7 + b51b1eb
commit b4d6ac7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 25 deletions.
diff --git a/Mail/Components/ChevronIcon.swift b/Mail/Components/ChevronIcon.swift
@@ -37,32 +37,13 @@ struct ChevronIcon: View {
         }
     }
 
-    enum Color {
-        case primary, secondary
-
-        var color: MailResourcesColors {
-            switch self {
-            case .primary:
-                return MailResourcesAsset.textPrimaryColor
-            case .secondary:
-                return MailResourcesAsset.textSecondaryColor
-            }
-        }
-    }
-
     let style: Style
-    let color: Color
-
-    init(style: Style, color: Color = .secondary) {
-        self.style = style
-        self.color = color
-    }
 
     var body: some View {
         MailResourcesAsset.arrowUp.swiftUIImage
             .resizable()
             .frame(width: 12, height: 12)
-            .foregroundColor(color.color)
+            .foregroundColor(MailResourcesAsset.textSecondaryColor)
             .padding(.vertical, 2)
             .padding(.horizontal, 1.5)
             .rotationEffect(style.rotationAngle)

diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
@@ -150,7 +150,7 @@ struct FolderCellContent: View {
         HStack(spacing: UIConstants.menuDrawerHorizontalItemSpacing) {
             if canCollapseSubFolders && cellType == .menuDrawer {
                 Button(action: collapseFolder) {
-                    ChevronIcon(style: folder.isExpanded ? .up : .down, color: .secondary)
+                    ChevronIcon(style: folder.isExpanded ? .up : .down)
                 }
                 .opacity(level == 0 && !folder.children.isEmpty ? 1 : 0)
                 .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonExpandFolder(folder.name))

diff --git a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift
@@ -51,7 +51,7 @@ struct UserFoldersListView: View {
                     }
                 } label: {
                     HStack(spacing: 12) {
-                        ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
+                        ChevronIcon(style: isExpanded ? .up : .down)
                         Text(MailResourcesStrings.Localizable.buttonFolders)
                             .textStyle(.bodySmallSecondary)
                         Spacer()

diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift
@@ -115,7 +115,7 @@ struct MenuDrawerItemsListView<Content: View>: View {
                     }
                 } label: {
                     HStack(spacing: 12) {
-                        ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
+                        ChevronIcon(style: isExpanded ? .up : .down)
                         Text(title)
                             .textStyle(.bodySmallSecondary)
                         Spacer()

diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
@@ -63,7 +63,7 @@ struct MailboxesManagementView: View {
                         .lineLimit(1)
                     Spacer()
                     if hasOtherMailboxes {
-                        ChevronIcon(style: navigationDrawerState.showMailboxes ? .up : .down, color: .primary)
+                        ChevronIcon(style: navigationDrawerState.showMailboxes ? .up : .down)
                     }
                 }
                 .environment(\.isEnabled, true)

diff --git a/Mail/Views/Settings/SettingsSubMenuCell.swift b/Mail/Views/Settings/SettingsSubMenuCell.swift
@@ -47,7 +47,7 @@ struct SettingsSubMenuCell<Content: View>: View {
                     }
                 }
                 Spacer()
-                ChevronIcon(style: .right, color: .secondary)
+                ChevronIcon(style: .right)
             }
         }
     }