diff --git a/Mail/Components/ChevronIcon.swift b/Mail/Components/ChevronIcon.swift index 5868dc5cf..a58c859f4 100644 --- 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 index 1a9c32bd3..e7db4c811 100644 --- 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 index 8efcf8ec1..6f4b9b1da 100644 --- 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 index 50344804a..508d76d98 100644 --- 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 index 3c9478474..af942e44d 100644 --- 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 index f8af5699a..5c504edc3 100644 --- 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 index cbc2632db..c745ada5e 100644 --- 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 index 60df2bfcd..96b69a496 100644 --- 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 deleted file mode 100644 index 8ee6d69c7..000000000 --- a/MailResources/Assets.xcassets/arrow-down.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "chevron-down.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/MailResources/Assets.xcassets/arrow-down.imageset/chevron-down.svg b/MailResources/Assets.xcassets/arrow-down.imageset/chevron-down.svg deleted file mode 100644 index 66546f59c..000000000 --- a/MailResources/Assets.xcassets/arrow-down.imageset/chevron-down.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/MailResources/Assets.xcassets/arrow-left.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-left.imageset/Contents.json deleted file mode 100644 index f6c88e0b7..000000000 --- a/MailResources/Assets.xcassets/arrow-left.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "chevron-left.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/MailResources/Assets.xcassets/arrow-left.imageset/chevron-left.svg b/MailResources/Assets.xcassets/arrow-left.imageset/chevron-left.svg deleted file mode 100644 index 34e3cc2a0..000000000 --- a/MailResources/Assets.xcassets/arrow-left.imageset/chevron-left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json b/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json deleted file mode 100644 index dbdae09ae..000000000 --- a/MailResources/Assets.xcassets/arrow-right.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "chevron-right.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg b/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg deleted file mode 100644 index 4bd63b3a7..000000000 --- a/MailResources/Assets.xcassets/arrow-right.imageset/chevron-right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/MailResources/Assets.xcassets/arrow-up.imageset/chevron-up.svg b/MailResources/Assets.xcassets/arrow-up.imageset/chevron-up.svg deleted file mode 100644 index 4da047b46..000000000 --- a/MailResources/Assets.xcassets/arrow-up.imageset/chevron-up.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/MailResources/Assets.xcassets/arrow-up.imageset/Contents.json b/MailResources/Assets.xcassets/chevron-up.imageset/Contents.json similarity index 100% rename from MailResources/Assets.xcassets/arrow-up.imageset/Contents.json rename to MailResources/Assets.xcassets/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 new file mode 100644 index 000000000..3c35fe5fe --- /dev/null +++ b/MailResources/Assets.xcassets/chevron-up.imageset/chevron-up.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/MailResources/Assets.xcassets/close_small.imageset/Contents.json b/MailResources/Assets.xcassets/close.imageset/Contents.json similarity index 100% rename from MailResources/Assets.xcassets/close_small.imageset/Contents.json rename to MailResources/Assets.xcassets/close.imageset/Contents.json diff --git a/MailResources/Assets.xcassets/close_small.imageset/close_small.svg b/MailResources/Assets.xcassets/close.imageset/close_small.svg similarity index 100% rename from MailResources/Assets.xcassets/close_small.imageset/close_small.svg rename to MailResources/Assets.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 deleted file mode 100644 index 4cb3b0713..000000000 --- a/MailResources/Assets.xcassets/close_big.imageset/Contents.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "images" : [ - { - "filename" : "close_big.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true, - "template-rendering-intent" : "template" - } -} diff --git a/MailResources/Assets.xcassets/close_big.imageset/close_big.svg b/MailResources/Assets.xcassets/close_big.imageset/close_big.svg deleted file mode 100644 index cd670d0a4..000000000 --- a/MailResources/Assets.xcassets/close_big.imageset/close_big.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -