Skip to content

Commit 2f69caf

Browse files
kp-diego-trevisankp-diego-trevisan
authored
KM-13431 Fix image assets references from Xibs and Storyboards (#218)
* KM-13431 Fix image references in all xib and storyboard files * KM-13431 Replace image initializations from image name to asset
1 parent f104849 commit 2f69caf

32 files changed

Lines changed: 118 additions & 117 deletions

‎PIA VPN/Core/Cards/Card.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ class Card: Collectable {
2727

2828
var title: String
2929
var description: String
30-
var cardImage: String
31-
var cardFrontImage: String
30+
var cardImage: ImageAsset
31+
var cardFrontImage: ImageAsset
3232
var ctaLabel: String
3333
var cta: CTAFunc
3434
var learnMoreLink: URL?
3535

3636
private(set) var showCTA = true
3737

38-
init(_ version: String, _ title: String, _ description: String, _ cardImage: String, _ cardFrontImage: String, _ ctaLabel: String, _ learnMoreLink: URL? = nil, _ cta: @escaping CTAFunc ) {
38+
init(_ version: String, _ title: String, _ description: String, _ cardImage: ImageAsset, _ cardFrontImage: ImageAsset, _ ctaLabel: String, _ learnMoreLink: URL? = nil, _ cta: @escaping CTAFunc ) {
3939
self.version = version
4040
self.title = title
4141
self.description = description

‎PIA VPN/Core/Cards/CardFactory.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ struct CardFactory {
4343
Card("3.7.1",
4444
L10n.Localizable.Card.Wireguard.title,
4545
L10n.Localizable.Card.Wireguard.description,
46-
"wg-background-",
47-
"wg-main",
46+
Theme.current.palette.appearance == .dark ? Asset.Images.Cards.WireGuard.wgBackgroundDark : Asset.Images.Cards.WireGuard.wgBackgroundLight,
47+
Asset.Images.Cards.WireGuard.wgMain,
4848
L10n.Localizable.Card.Wireguard.Cta.activate,
4949
URL(string: "https://www.privateinternetaccess.com/blog/wireguide-all-about-the-wireguard-vpn-protocol/"), {
5050

‎PIA VPN/Core/Cards/Collectable.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import UIKit
2424

2525
public typealias CTAFunc = () -> Void
2626

27-
public protocol Collectable {
27+
protocol Collectable {
2828

2929
var title: String {get set}
3030
var description: String {get set}
31-
var cardImage: String {get set}
32-
var cardFrontImage: String {get set}
31+
var cardImage: ImageAsset {get set}
32+
var cardFrontImage: ImageAsset {get set}
3333
var ctaLabel: String {get set}
3434
var cta: CTAFunc {get set}
3535
var learnMoreLink: URL? {get set}
@@ -39,7 +39,7 @@ public protocol Collectable {
3939

4040
}
4141

42-
public extension Collectable {
42+
extension Collectable {
4343

4444
///Check if we need to show a second call to action button
4545
/// - Returns: Bool

‎PIA VPN/Core/Extensions/Server+UI.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ extension Server: CustomStringConvertible {
7070

7171
extension UIImageView {
7272
func setImage(fromServer server: Server) {
73-
let imageName = "flag-\(server.country.lowercased())"
73+
let imageName = "flags/flag-\(server.country.lowercased())"
7474
guard let image = UIImage(named: imageName) else {
7575
return
7676
}
@@ -80,7 +80,7 @@ extension UIImageView {
8080

8181
extension UIButton {
8282
func setImage(fromServer server: Server) {
83-
let imageName = "flag-\(server.country.lowercased())"
83+
let imageName = "flags/flag-\(server.country.lowercased())"
8484
guard let image = UIImage(named: imageName) else {
8585
return
8686
}

‎PIA VPN/Core/Extensions/Theme+App.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ extension Theme {
197197

198198
public func mapImage() -> UIImage? {
199199

200-
let image = UIImage(named: "Dark-Map")
200+
let image = UIImage(asset: Asset.Images.Piax.DarkMap.darkMap)
201201

202202
if palette.appearance == .light {
203203
return image?.image(alpha: 0.15)

‎PIA VPN/UI/Cards/PIACard.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import PIALibrary
1111

1212
class PIACard: UIView {
1313

14-
var cardBackgroundImagePrefix = ""
14+
var cardBackgroundImage: ImageAsset!
1515

1616
@IBOutlet weak var contentView: UIView!
1717
@IBOutlet weak var cardBgImageView: UIImageView!
@@ -34,7 +34,7 @@ class PIACard: UIView {
3434
@objc private func viewShouldRestyle() {
3535

3636
self.closeButton.tintColor = Theme.current.palette.appearance == .dark ? .white : Macros.color(hex: "111621", alpha: 1)
37-
self.cardBgImageView.image = Theme.current.palette.appearance == .dark ? UIImage(named: cardBackgroundImagePrefix+"dark") : UIImage(named: cardBackgroundImagePrefix+"light")
37+
self.cardBgImageView.image = UIImage(asset: cardBackgroundImage)
3838
self.cardTitle.style(style: Theme.current.palette.appearance == .dark ? TextStyle.textStyleCardTitleDark : TextStyle.textStyleCardTitleLight)
3939
self.cardDescription.style(style: Theme.current.palette.appearance == .dark ? TextStyle.textStyle6 : TextStyle.textStyle7)
4040
self.contentView.layer.cornerRadius = 10.0

‎PIA VPN/UI/Cards/PIACardsViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PIACardsViewController: UIViewController {
4242
var collectingCards = [PIACard]()
4343
for card in cards {
4444
let slide:PIACard = Bundle.main.loadNibNamed("PIACard", owner: self, options: nil)?.first as! PIACard
45-
slide.cardParallaxImageView.image = UIImage(named: card.cardFrontImage)
45+
slide.cardParallaxImageView.image = UIImage(asset: card.cardFrontImage)
4646
slide.cardTitle.text = card.title
4747
slide.cardDescription.text = card.description
4848
slide.closeButton.setImage(closeImage, for: [])
@@ -74,7 +74,7 @@ class PIACardsViewController: UIViewController {
7474
slide.cardSecondaryCTAButton.isHidden = true
7575
}
7676

77-
slide.cardBackgroundImagePrefix = card.cardImage
77+
slide.cardBackgroundImage = card.cardImage
7878
collectingCards.append(slide)
7979
}
8080

‎PIA VPN/UI/Menu/Cells/CustomNetworkCollectionViewCell.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<rect key="frame" x="0.0" y="0.0" width="522" height="44"/>
1818
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1919
<subviews>
20-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-nmt-wifi" translatesAutoresizingMaskIntoConstraints="NO" id="rMj-Qt-vdY">
20+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="PIAX/NMT/icon-nmt-wifi" translatesAutoresizingMaskIntoConstraints="NO" id="rMj-Qt-vdY">
2121
<rect key="frame" x="19" y="12" width="20" height="20"/>
2222
<constraints>
2323
<constraint firstAttribute="width" constant="20" id="C5D-QJ-WFC"/>
@@ -50,6 +50,6 @@
5050
</collectionViewCell>
5151
</objects>
5252
<resources>
53-
<image name="icon-nmt-wifi" width="18" height="13"/>
53+
<image name="PIAX/NMT/icon-nmt-wifi" width="18" height="13"/>
5454
</resources>
5555
</document>

‎PIA VPN/UI/Menu/Cells/NetworkCollectionViewCell.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<constraint firstAttribute="height" constant="40" id="jqF-ha-ufj"/>
4545
</constraints>
4646
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="19" maxY="0.0"/>
47-
<state key="normal" image="icon-options"/>
47+
<state key="normal" image="PIAX/NMT/icon-options"/>
4848
<connections>
4949
<action selector="showOptions" destination="gTV-IL-0wX" eventType="touchUpInside" id="0bB-fj-tOY"/>
5050
</connections>
@@ -96,6 +96,6 @@
9696
</collectionViewCell>
9797
</objects>
9898
<resources>
99-
<image name="icon-options" width="18" height="4"/>
99+
<image name="PIAX/NMT/icon-options" width="18" height="4"/>
100100
</resources>
101101
</document>

‎PIA VPN/UI/Menu/Cells/NetworkFooterCollectionViewCell.xib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<constraint firstAttribute="height" constant="44" id="8Tu-bR-lS0"/>
2424
</constraints>
2525
<inset key="titleEdgeInsets" minX="19" minY="0.0" maxX="0.0" maxY="0.0"/>
26-
<state key="normal" title="Add new rule" image="icon-add-rule"/>
26+
<state key="normal" title="Add new rule" image="PIAX/NMT/icon-add-rule"/>
2727
<connections>
2828
<action selector="addNewRule" destination="gTV-IL-0wX" eventType="touchUpInside" id="mbx-gT-nlW"/>
2929
</connections>
@@ -45,6 +45,6 @@
4545
</collectionViewCell>
4646
</objects>
4747
<resources>
48-
<image name="icon-add-rule" width="18" height="18"/>
48+
<image name="PIAX/NMT/icon-add-rule" width="18" height="18"/>
4949
</resources>
5050
</document>

0 commit comments

Comments
 (0)