diff --git a/WMFComponents/Sources/WMFComponents/Components/Suggested Edits/Image Recommendations/WMFImageRecommendationsViewController.swift b/WMFComponents/Sources/WMFComponents/Components/Suggested Edits/Image Recommendations/WMFImageRecommendationsViewController.swift index a6f2df8253..7bd424ec88 100644 --- a/WMFComponents/Sources/WMFComponents/Components/Suggested Edits/Image Recommendations/WMFImageRecommendationsViewController.swift +++ b/WMFComponents/Sources/WMFComponents/Components/Suggested Edits/Image Recommendations/WMFImageRecommendationsViewController.swift @@ -247,7 +247,7 @@ public final class WMFImageRecommendationsViewController: WMFCanvasViewControlle } private func setupOverflowMenu() { - let rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu) + let rightBarButtonItem = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu) navigationItem.rightBarButtonItem = rightBarButtonItem rightBarButtonItem.tintColor = theme.link } diff --git a/Wikipedia/Code/ArticleToolbarController.swift b/Wikipedia/Code/ArticleToolbarController.swift index 21eedaafa9..2a5b7f1ce0 100644 --- a/Wikipedia/Code/ArticleToolbarController.swift +++ b/Wikipedia/Code/ArticleToolbarController.swift @@ -108,9 +108,9 @@ class ArticleToolbarController: Themeable { actions.append(UIAction(title: CommonStrings.shortShareTitle, image: UIImage(systemName: "square.and.arrow.up"), handler: { [weak self] _ in self?.share()})) let menu = UIMenu(title: "", options: .displayInline, children: actions) - - let moreImage = UIImage(systemName: "ellipsis.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .light)) - + + let moreImage = WMFSFSymbolIcon.for(symbol: .ellipsisCircle)?.withConfiguration(UIImage.SymbolConfiguration(weight: .light)) + let item = IconBarButtonItem(image: moreImage, menu: menu) item.accessibilityLabel = CommonStrings.moreButton diff --git a/Wikipedia/Code/DiffToolbarView.swift b/Wikipedia/Code/DiffToolbarView.swift index fc3276cee8..c7ecd326ed 100644 --- a/Wikipedia/Code/DiffToolbarView.swift +++ b/Wikipedia/Code/DiffToolbarView.swift @@ -1,4 +1,4 @@ -import UIKit +import WMFComponents protocol DiffToolbarViewDelegate: AnyObject { func tappedPrevious() @@ -163,7 +163,7 @@ class DiffToolbarView: UIView { let menu = UIMenu(title: "", options: .displayInline, children: actions) - let item = IconBarButtonItem(title: nil, image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: menu) + let item = IconBarButtonItem(title: nil, image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: menu) item.accessibilityLabel = CommonStrings.moreButton return item diff --git a/Wikipedia/Code/SavedViewController.swift b/Wikipedia/Code/SavedViewController.swift index d01c981ed6..1ae92b06e7 100644 --- a/Wikipedia/Code/SavedViewController.swift +++ b/Wikipedia/Code/SavedViewController.swift @@ -366,7 +366,7 @@ class SavedViewController: ThemeableViewController, WMFNavigationBarConfiguring, } private lazy var moreBarButtonItem: UIBarButtonItem = { - let button = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu) + let button = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu) button.accessibilityLabel = CommonStrings.moreButton return button }() diff --git a/Wikipedia/Code/TalkPageViewController.swift b/Wikipedia/Code/TalkPageViewController.swift index 1ae4249970..a200b4ccf4 100644 --- a/Wikipedia/Code/TalkPageViewController.swift +++ b/Wikipedia/Code/TalkPageViewController.swift @@ -268,7 +268,7 @@ class TalkPageViewController: ThemeableViewController, WMFNavigationBarConfiguri } private func setupOverflowMenu() { - let rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu) + let rightBarButtonItem = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu) rightBarButtonItem.accessibilityLabel = Self.TalkPageLocalizedStrings.overflowMenuAccessibilityLabel navigationItem.rightBarButtonItem = rightBarButtonItem rightBarButtonItem.tintColor = theme.colors.link