Merge pull request #966 from Infomaniak/update-chevron

feat: Update chevron with new icons
Infomaniak · Sep 5, 2023 · 68e79a3 · 68e79a3
2 parents bdf4eda + 1d7866e
commit 68e79a3
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 95 deletions.
diff --git a/Mail/Components/ChevronIcon.swift b/Mail/Components/ChevronIcon.swift
@@ -38,14 +38,13 @@ struct ChevronIcon: View {
     }
 
     let style: Style
+    var color = MailResourcesAsset.textSecondaryColor
 
     var body: some View {
-        MailResourcesAsset.arrowUp.swiftUIImage
+        MailResourcesAsset.chevronUp.swiftUIImage
             .resizable()
             .frame(width: 12, height: 12)
-            .foregroundColor(MailResourcesAsset.textSecondaryColor)
-            .padding(.vertical, 2)
-            .padding(.horizontal, 1.5)
+            .foregroundColor(color)
             .rotationEffect(style.rotationAngle)
     }
 }

diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
@@ -67,10 +67,7 @@ struct MailboxesManagementButtonView: View {
                 } else {
                     switch style {
                     case .blockedPassword:
-                        MailResourcesAsset.arrowRight.swiftUIImage
-                            .resizable()
-                            .frame(width: 12, height: 12)
-                            .foregroundColor(MailResourcesAsset.textPrimaryColor.swiftUIColor)
+                        ChevronIcon(style: .right, color: MailResourcesAsset.textPrimaryColor)
                     case .menuDrawer:
                         if let detailNumber {
                             Text(detailNumber < 100 ? "\(detailNumber)" : "99+")

diff --git a/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift b/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift
@@ -37,7 +37,7 @@ struct AttachmentUploadCell: View {
                     attachmentRemoved(attachment)
                 }
             } label: {
-                MailResourcesAsset.closeSmall.swiftUIImage
+                MailResourcesAsset.close.swiftUIImage
                     .resizable()
                     .foregroundColor(MailResourcesAsset.textSecondaryColor)
                     .frame(width: 12, height: 12)

diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift
@@ -270,7 +270,7 @@ struct ComposeMessageView: View {
                             matomo.track(eventWithCategory: .externals, name: "bannerManuallyClosed")
                             isShowingExternalTag = false
                         } label: {
-                            MailResourcesAsset.closeSmall.swiftUIImage
+                            MailResourcesAsset.close.swiftUIImage
                                 .resizable()
                                 .foregroundColor(MailResourcesAsset.onTagColor)
                                 .frame(width: 16, height: 16)

diff --git a/Mail/Views/Search/SearchFilterFolderCell.swift b/Mail/Views/Search/SearchFilterFolderCell.swift
@@ -77,9 +77,7 @@ struct SearchFilterFolderCell: View {
                 }
                 Text(selectedFolderName)
                     .font(MailTextStyle.bodyMedium.font)
-                MailResourcesAsset.arrowDown.swiftUIImage
-                    .resizable()
-                    .frame(width: 12, height: 12)
+                ChevronIcon(style: .down)
             }
         }
         .filterCellStyle(isSelected: isSelected)

diff --git a/Mail/Views/Search/SearchHistorySectionView.swift b/Mail/Views/Search/SearchHistorySectionView.swift
@@ -40,7 +40,7 @@ struct SearchHistorySectionView: View {
                     Button {
                         deleteSearchTapped(searchItem: searchItem)
                     } label: {
-                        MailResourcesAsset.closeSmall.swiftUIImage
+                        MailResourcesAsset.close.swiftUIImage
                             .resizable()
                             .foregroundColor(MailResourcesAsset.textSecondaryColor.swiftUIColor)
                             .frame(width: 16, height: 16)

diff --git a/Mail/Views/Search/SearchView.swift b/Mail/Views/Search/SearchView.swift
@@ -96,7 +96,8 @@ struct SearchView: View {
                     Constants.globallyResignFirstResponder()
                     splitViewManager.showSearch = false
                 } label: {
-                    Image(isCompactWindow ? MailResourcesAsset.arrowLeft.name : MailResourcesAsset.closeBig.name)
+                    Image(systemName: isCompactWindow ? "chevron.left" : "xmark")
+                        .font(.body.weight(isCompactWindow ? .semibold : .regular))
                 }
                 .accessibilityLabel(MailResourcesStrings.Localizable.contentDescriptionButtonBack)
             }

diff --git a/Mail/Views/Thread List/ThreadListHeader.swift b/Mail/Views/Thread List/ThreadListHeader.swift
@@ -110,7 +110,7 @@ struct UnreadToggleStyle: ToggleStyle {
             HStack(spacing: 8) {
                 configuration.label
                 if configuration.isOn {
-                    MailResourcesAsset.closeSmall.swiftUIImage
+                    MailResourcesAsset.close.swiftUIImage
                         .resizable()
                         .frame(width: 12, height: 12)
                 }

diff --git a/MailResources/Assets.xcassets/arrow-down.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-down.imageset/Contents.json
diff --git a/MailResources/Assets.xcassets/arrow-down.imageset/chevron-down.svg b/MailResources/Assets.xcassets/arrow-down.imageset/chevron-down.svg
diff --git a/MailResources/Assets.xcassets/arrow-left.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-left.imageset/Contents.json
diff --git a/MailResources/Assets.xcassets/arrow-left.imageset/chevron-left.svg b/MailResources/Assets.xcassets/arrow-left.imageset/chevron-left.svg
diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json
diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg b/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg
diff --git a/MailResources/Assets.xcassets/arrow-up.imageset/chevron-up.svg b/MailResources/Assets.xcassets/arrow-up.imageset/chevron-up.svg
diff --git a/....xcassets/arrow-up.imageset/Contents.json → ...cassets/chevron-up.imageset/Contents.json b/....xcassets/arrow-up.imageset/Contents.json → ...cassets/chevron-up.imageset/Contents.json
diff --git a/MailResources/Assets.xcassets/chevron-up.imageset/chevron-up.svg b/MailResources/Assets.xcassets/chevron-up.imageset/chevron-up.svg
diff --git a/...assets/close_small.imageset/Contents.json → ...ets.xcassets/close.imageset/Contents.json b/...assets/close_small.imageset/Contents.json → ...ets.xcassets/close.imageset/Contents.json
diff --git a/...sets/close_small.imageset/close_small.svg → ...s.xcassets/close.imageset/close_small.svg b/...sets/close_small.imageset/close_small.svg → ...s.xcassets/close.imageset/close_small.svg
diff --git a/MailResources/Assets.xcassets/close_big.imageset/Contents.json b/MailResources/Assets.xcassets/close_big.imageset/Contents.json
diff --git a/MailResources/Assets.xcassets/close_big.imageset/close_big.svg b/MailResources/Assets.xcassets/close_big.imageset/close_big.svg