Skip to content

Commit 1287981

Browse files
authored
Merge pull request #5195 from wikimedia/fix-header-button
Use WMFSFSymbolIcon for more button icon
2 parents e5e59ad + f5e663d commit 1287981

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

WMFComponents/Sources/WMFComponents/Components/Suggested Edits/Image Recommendations/WMFImageRecommendationsViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public final class WMFImageRecommendationsViewController: WMFCanvasViewControlle
247247
}
248248

249249
private func setupOverflowMenu() {
250-
let rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu)
250+
let rightBarButtonItem = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu)
251251
navigationItem.rightBarButtonItem = rightBarButtonItem
252252
rightBarButtonItem.tintColor = theme.link
253253
}

Wikipedia/Code/ArticleToolbarController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ class ArticleToolbarController: Themeable {
108108
actions.append(UIAction(title: CommonStrings.shortShareTitle, image: UIImage(systemName: "square.and.arrow.up"), handler: { [weak self] _ in self?.share()}))
109109

110110
let menu = UIMenu(title: "", options: .displayInline, children: actions)
111-
112-
let moreImage = UIImage(systemName: "ellipsis.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .light))
113-
111+
112+
let moreImage = WMFSFSymbolIcon.for(symbol: .ellipsisCircle)?.withConfiguration(UIImage.SymbolConfiguration(weight: .light))
113+
114114
let item = IconBarButtonItem(image: moreImage, menu: menu)
115115

116116
item.accessibilityLabel = CommonStrings.moreButton

Wikipedia/Code/DiffToolbarView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import UIKit
1+
import WMFComponents
22

33
protocol DiffToolbarViewDelegate: AnyObject {
44
func tappedPrevious()
@@ -163,7 +163,7 @@ class DiffToolbarView: UIView {
163163

164164
let menu = UIMenu(title: "", options: .displayInline, children: actions)
165165

166-
let item = IconBarButtonItem(title: nil, image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: menu)
166+
let item = IconBarButtonItem(title: nil, image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: menu)
167167

168168
item.accessibilityLabel = CommonStrings.moreButton
169169
return item

Wikipedia/Code/SavedViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ class SavedViewController: ThemeableViewController, WMFNavigationBarConfiguring,
366366
}
367367

368368
private lazy var moreBarButtonItem: UIBarButtonItem = {
369-
let button = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu)
369+
let button = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu)
370370
button.accessibilityLabel = CommonStrings.moreButton
371371
return button
372372
}()

Wikipedia/Code/TalkPageViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class TalkPageViewController: ThemeableViewController, WMFNavigationBarConfiguri
268268
}
269269

270270
private func setupOverflowMenu() {
271-
let rightBarButtonItem = UIBarButtonItem(image: UIImage(systemName: "ellipsis.circle"), primaryAction: nil, menu: overflowMenu)
271+
let rightBarButtonItem = UIBarButtonItem(image: WMFSFSymbolIcon.for(symbol: .ellipsisCircle), primaryAction: nil, menu: overflowMenu)
272272
rightBarButtonItem.accessibilityLabel = Self.TalkPageLocalizedStrings.overflowMenuAccessibilityLabel
273273
navigationItem.rightBarButtonItem = rightBarButtonItem
274274
rightBarButtonItem.tintColor = theme.colors.link

0 commit comments

Comments
 (0)