Using UIImageView instead of BPKIconView for airline logo (#1628)

* Using UIImageView instead of BPKIconView for airline logo * Updated with PR comments * Fixed snapshot colours * Used correct color value * Updated snapshot after color change
Skyscanner · Apr 6, 2023 · 7f0410f · 7f0410f
1 parent f16af78
commit 7f0410f
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 16 deletions.
diff --git a/Backpack/FlightLeg/Classes/BPKFlightLeg.swift b/Backpack/FlightLeg/Classes/BPKFlightLeg.swift
@@ -20,6 +20,8 @@ import Foundation
 import UIKit
 
 public final class BPKFlightLeg: UIView {
+    private let airlineLogoSize = 24.0
+
     private let departureArrivalTime: String
     private let nextDayArrival: String?
     private let flightDescription: NSAttributedString
@@ -28,7 +30,7 @@ public final class BPKFlightLeg: UIView {
     private let duration: String
     private let operatedBy: String?
     private let warning: String?
-    private let carrierLogo: BPKIconName
+    private let carrierLogo: UIImage?
 
     private let departureArrivalTimeLabel: BPKLabel = {
         let departureArrtvalTimeLabel = BPKLabel()
@@ -73,8 +75,8 @@ public final class BPKFlightLeg: UIView {
         warningLabel.lineBreakMode = .byWordWrapping
         return warningLabel
     }()
-    private let carrierLogoIcon: BPKLargeIconView = {
-        let carrierLogoIcon = BPKLargeIconView()
+    private let carrierLogoIcon: UIImageView = {
+        let carrierLogoIcon = UIImageView()
         carrierLogoIcon.tintColor = BPKColor.textOnLightColor
         return carrierLogoIcon
     }()
@@ -97,7 +99,7 @@ public final class BPKFlightLeg: UIView {
         duration: String,
         operatedBy: String?,
         warning: String?,
-        carrierLogo: BPKIconName
+        carrierLogo: UIImage?
     ) {
         self.departureArrivalTime = departureArrivalTime
         self.nextDayArrival = nextDayArrival
@@ -146,15 +148,18 @@ public final class BPKFlightLeg: UIView {
         let verticalStackView = UIView()
         verticalStackView.translatesAutoresizingMaskIntoConstraints = false
 
-        carrierLogoIcon.iconName = carrierLogo
+        carrierLogoIcon.image = carrierLogo
         leadingStackView.addArrangedSubview(carrierLogoIcon)
         verticalStackView.addSubview(leadingStackView)
 
         NSLayoutConstraint.activate([
             leadingStackView.topAnchor.constraint(equalTo: verticalStackView.topAnchor, constant: BPKSpacingSm),
             leadingStackView.bottomAnchor.constraint(equalTo: verticalStackView.bottomAnchor),
             leadingStackView.leadingAnchor.constraint(equalTo: verticalStackView.leadingAnchor),
-            leadingStackView.trailingAnchor.constraint(equalTo: verticalStackView.trailingAnchor)
+            leadingStackView.trailingAnchor.constraint(equalTo: verticalStackView.trailingAnchor),
+
+            carrierLogoIcon.widthAnchor.constraint(equalToConstant: airlineLogoSize),
+            carrierLogoIcon.heightAnchor.constraint(equalToConstant: airlineLogoSize)
         ])
         return verticalStackView
     }

diff --git a/Backpack/Tests/SnapshotTests/BPKFlightLegSnapshotTest.swift b/Backpack/Tests/SnapshotTests/BPKFlightLegSnapshotTest.swift
@@ -47,7 +47,7 @@ final class BPKFlightLegSnapshotTest: XCTestCase {
         duration: String = "7h 55m",
         operatedBy: String? = nil,
         warning: String? = nil,
-        carrierLogo: BPKIconName = .airline
+        carrierLogo: UIImage? = BPKIcon.makeLargeIcon(name: .airline, color: BPKColor.textOnLightColor)
     ) -> UIView {
         let parentView = UIView(frame: .zero)
         parentView.backgroundColor = BPKColor.surfaceDefaultColor
@@ -106,7 +106,7 @@ final class BPKFlightLegSnapshotTest: XCTestCase {
             highlightStopsInfo: true,
             operatedBy: "Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airline
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airline, color: BPKColor.textOnLightColor)
         )
         assertSnapshot(flightLegStackView)
     }
@@ -121,7 +121,7 @@ final class BPKFlightLegSnapshotTest: XCTestCase {
             duration: "7h 55m",
             operatedBy: "Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
         assertSnapshot(flightLegStackView)
     }
@@ -137,7 +137,7 @@ final class BPKFlightLegSnapshotTest: XCTestCase {
             operatedBy: "Operated by WestJet Operated by WestJet Operated" +
             "by WestJet Operated by WestJet Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
         assertSnapshot(flightLegStackView)
     }
@@ -152,7 +152,7 @@ final class BPKFlightLegSnapshotTest: XCTestCase {
             duration: "نس 10د",
             operatedBy: "Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
         assertSnapshot(flightLegStackView)
     }

diff --git a/...KFlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.dark-mode.png b/...KFlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.dark-mode.png
diff --git a/...FlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.light-mode.png b/...FlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.light-mode.png
diff --git a/...s__/BPKFlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.rtl.png b/...s__/BPKFlightLegSnapshotTest/testBPKFlightLegSnapshotDefaultDescription.rtl.png
diff --git a/...ightLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.dark-mode.png b/...ightLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.dark-mode.png
diff --git a/...ghtLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.light-mode.png b/...ghtLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.light-mode.png
diff --git a/.../BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.rtl.png b/.../BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteArabicDescription.rtl.png
diff --git a/.../BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.dark-mode.png b/.../BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.dark-mode.png
diff --git a/...BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.light-mode.png b/...BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.light-mode.png
diff --git a/...hots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.rtl.png b/...hots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteDescription.rtl.png
diff --git a/...FlightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.dark-mode.png b/...FlightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.dark-mode.png
diff --git a/...lightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.light-mode.png b/...lightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.light-mode.png
diff --git a/...__/BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.rtl.png b/...__/BPKFlightLegSnapshotTest/testBPKFlightLegWithCompleteLongDescription.rtl.png
diff --git a/...SnapshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.dark-mode.png b/...SnapshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.dark-mode.png
diff --git a/...napshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.light-mode.png b/...napshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.light-mode.png
diff --git a/...ghtLegSnapshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.rtl.png b/...ghtLegSnapshotTest/testBPKFlightLegWithCompleteLongStopsInfoDescription.rtl.png
diff --git a/...apshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.dark-mode.png b/...apshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.dark-mode.png
diff --git a/...pshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.light-mode.png b/...pshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.light-mode.png
diff --git a/...s/__Snapshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.rtl.png b/...s/__Snapshots__/BPKFlightLegSnapshotTest/testBPKFlightLegWithExtraStops.rtl.png
diff --git a/Example/Backpack/UIKit/Components/Flight Leg/BPKFlightLegViewController.swift b/Example/Backpack/UIKit/Components/Flight Leg/BPKFlightLegViewController.swift
@@ -81,7 +81,7 @@ class BPKFlightLegViewController: UIViewController {
         duration: String,
         operatedBy: String? = nil,
         warning: String? = nil,
-        carrierLogo: BPKIconName
+        carrierLogo: UIImage? = nil
     ) -> BPKFlightLeg {
 
         return BPKFlightLeg(
@@ -103,7 +103,7 @@ class BPKFlightLegViewController: UIViewController {
             flightDescription: defaultDescription,
             stopsInfo: "Direct",
             duration: "7h 55m",
-            carrierLogo: .airline
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airline, color: BPKColor.textOnLightColor)
         )
     }
 
@@ -117,7 +117,7 @@ class BPKFlightLegViewController: UIViewController {
             duration: "7h 55m",
             operatedBy: "Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
     }
 
@@ -132,7 +132,7 @@ class BPKFlightLegViewController: UIViewController {
             operatedBy: "Operated by WestJet Operated by WestJet Operated" +
             "by WestJet Operated by WestJet Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
     }
 
@@ -146,7 +146,7 @@ class BPKFlightLegViewController: UIViewController {
             duration: "7h 55m",
             operatedBy: "Operated by WestJet",
             warning: "Change airports in London",
-            carrierLogo: .airlineMultiple
+            carrierLogo: BPKIcon.makeLargeIcon(name: .airlineMultiple, color: BPKColor.textOnLightColor)
         )
     }