Skip to content

Commit

Permalink
Resolved conflicts on RegionTileCollectionViewCell
Browse files Browse the repository at this point in the history
  • Loading branch information
kp-geneva-parayno committed Nov 23, 2023
2 parents 838708e + 49ec8a1 commit 00ba79f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions PIA VPN/Tiles/RegionTileCollectionViewCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class RegionTileCollectionViewCell: UICollectionViewCell, TileableCell {
}

func setupCellForStatus(_ status: TileStatus) {
self.accessibilityLabel = L10n.Localizable.Tiles.Region.title
self.accessibilityIdentifier = "RegionTileCollectionViewCell"
self.accessibilityLabel = L10n.Tiles.Region.title
Theme.current.applyPrincipalBackground(self)
Theme.current.applyPrincipalBackground(self.contentView)
tile.status = status
Expand All @@ -57,7 +57,7 @@ class RegionTileCollectionViewCell: UICollectionViewCell, TileableCell {
case .normal:
self.accessibilityTraits = UIAccessibilityTraits.button
self.isAccessibilityElement = true
self.accessoryImageRight.image = Asset.Piax.Tiles.openTileDetails.image
self.accessoryImageRight.image = Asset.Images.Piax.Tiles.openTileDetails.image
self.tileLeftConstraint.constant = 0
self.accessoryButtonLeft.isHidden = true
case .edit:
Expand Down Expand Up @@ -94,11 +94,11 @@ class RegionTileCollectionViewCell: UICollectionViewCell, TileableCell {
if Client.providers.tileProvider.visibleTiles.contains(tileType) {
accessoryButtonLeft.setImage(Theme.current.activeEyeImage(), for: .normal)
accessoryButtonLeft.setImage(Theme.current.inactiveEyeImage(), for: .highlighted)
accessoryButtonLeft.accessibilityLabel = L10n.Tiles.Accessibility.Visible.Tile.action
accessoryButtonLeft.accessibilityLabel = L10n.Localizable.Tiles.Accessibility.Visible.Tile.action
} else {
accessoryButtonLeft.setImage(Theme.current.inactiveEyeImage(), for: .normal)
accessoryButtonLeft.setImage(Theme.current.activeEyeImage(), for: .highlighted)
accessoryButtonLeft.accessibilityLabel = L10n.Tiles.Accessibility.Invisible.Tile.action
accessoryButtonLeft.accessibilityLabel = L10n.Localizable.Tiles.Accessibility.Invisible.Tile.action
}
}

Expand Down

0 comments on commit 00ba79f

Please sign in to comment.