Add FXIOS-15840 [Ad Blocker] Add ad blocker badge to menu #33889
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import UIKit | ||
| import Common | ||
|
|
||
| final class MenuSiteBadge: UIView, ThemeApplicable { | ||
| private struct UX { | ||
| static let cornerRadius: CGFloat = 12 | ||
| static let borderWidth: CGFloat = 1 | ||
| static let horizontalPadding: CGFloat = 10 | ||
| static let verticalPadding: CGFloat = 6 | ||
| static let contentSpacing: CGFloat = 4 | ||
| static let iconSize: CGFloat = 16 | ||
| static let chevronSize: CGFloat = 20 | ||
| } | ||
|
|
||
| var tapHandler: (() -> Void)? | ||
| private let mainMenuHelper: MainMenuInterface | ||
|
|
||
| private lazy var stack: UIStackView = .build { [weak self] stack in | ||
| guard let self else { return } | ||
| stack.isLayoutMarginsRelativeArrangement = true | ||
| stack.layoutMargins = UIEdgeInsets(top: UX.verticalPadding, | ||
| left: UX.horizontalPadding, | ||
| bottom: UX.verticalPadding, | ||
| right: UX.horizontalPadding) | ||
| stack.distribution = .fill | ||
| stack.axis = .horizontal | ||
| stack.clipsToBounds = true | ||
| stack.spacing = UX.contentSpacing | ||
| let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.tapped)) | ||
| stack.isUserInteractionEnabled = true | ||
| stack.addGestureRecognizer(tapGesture) | ||
| } | ||
|
|
||
| private var label: UILabel = .build { label in | ||
| label.font = FXFontStyles.Regular.footnote.scaledFont() | ||
| label.numberOfLines = 0 | ||
| label.lineBreakMode = .byWordWrapping | ||
| label.adjustsFontForContentSizeCategory = true | ||
| label.accessibilityTraits = .button | ||
| } | ||
|
|
||
| private var icon: UIImageView = .build { imageView in | ||
| imageView.contentMode = .scaleAspectFit | ||
| } | ||
|
|
||
| private var chevron: UIImageView = .build { imageView in | ||
| let imageName = StandardImageIdentifiers.Large.chevronRight | ||
| let image = UIImage(named: imageName)? | ||
| .withRenderingMode(.alwaysTemplate) | ||
| .imageFlippedForRightToLeftLayoutDirection() ?? UIImage() | ||
| imageView.image = image | ||
| imageView.contentMode = .scaleAspectFit | ||
| } | ||
|
|
||
| init(mainMenuHelper: MainMenuInterface) { | ||
| self.mainMenuHelper = mainMenuHelper | ||
| super.init(frame: .zero) | ||
| setupViews() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| override func layoutSubviews() { | ||
| super.layoutSubviews() | ||
| if #available(iOS 26.0, *) { | ||
| stack.layer.cornerRadius = stack.frame.height / 2 | ||
| } else { | ||
| stack.layer.cornerRadius = UX.cornerRadius | ||
| stack.layer.borderWidth = UX.borderWidth | ||
| } | ||
| } | ||
|
|
||
| private func setupViews() { | ||
| addSubview(stack) | ||
| stack.addArrangedSubview(icon) | ||
| stack.addArrangedSubview(label) | ||
| stack.addArrangedSubview(chevron) | ||
|
|
||
| NSLayoutConstraint.activate([ | ||
| stack.topAnchor.constraint(equalTo: topAnchor), | ||
| stack.bottomAnchor.constraint(equalTo: bottomAnchor), | ||
| stack.leadingAnchor.constraint(equalTo: leadingAnchor), | ||
| stack.trailingAnchor.constraint(equalTo: trailingAnchor), | ||
|
|
||
| icon.widthAnchor.constraint(equalToConstant: UX.iconSize), | ||
| chevron.widthAnchor.constraint(equalToConstant: UX.chevronSize) | ||
| ]) | ||
| } | ||
|
|
||
| func configure(text: String, iconName: String, useTemplate: Bool) { | ||
| label.text = text | ||
| let image: UIImage = useTemplate | ||
| ? UIImage(named: iconName)?.withRenderingMode(.alwaysTemplate) ?? UIImage() | ||
| : UIImage(named: iconName) ?? UIImage() | ||
| icon.image = image | ||
| } | ||
|
|
||
| func applyTheme(theme: Theme) { | ||
| label.textColor = theme.colors.textSecondary | ||
| stack.layer.borderColor = theme.colors.actionSecondaryHover.cgColor | ||
| if #available(iOS 26.0, *) { | ||
| stack.backgroundColor = theme.colors.layerSurfaceMedium | ||
| .withAlphaComponent(mainMenuHelper.backgroundAlpha()) | ||
| } else { | ||
| stack.backgroundColor = .clear | ||
| } | ||
| icon.tintColor = theme.colors.iconSecondary | ||
| chevron.tintColor = theme.colors.iconSecondary | ||
| } | ||
|
|
||
| @objc | ||
| private func tapped() { | ||
| tapHandler?() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should make the entire view the a11y element here instead of the label, that way during voiceover the whole view is focused.
Would remove
label.accessibilityTraits = .buttonand addlabel.isAccessibilityElement = falsethen add this to the init:
and
accessibilityLabel = textinconfigure()