Add UIImage+Assets to test target, at the price of typesafe rsrc IDs

acb-mv · acb-mv · commit 114ec0881b28 · 2025-03-11T17:33:16.000+01:00
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -43,6 +43,8 @@
 		06AC116228F94C450037AF9A /* ApplicationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BFA5CB22A7CE1F00A6173D /* ApplicationConfiguration.swift */; };
 		44075DFB2CDA4F7400F61139 /* UDPOverTCPObfuscationSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44075DFA2CDA4F7400F61139 /* UDPOverTCPObfuscationSettingsViewModel.swift */; };
 		440870822D7A00B70038972F /* UIImage+Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440870812D7A00B00038972F /* UIImage+Assets.swift */; };
+		440870832D809B550038972F /* UIImage+Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440870812D7A00B00038972F /* UIImage+Assets.swift */; };
+		440870842D809C980038972F /* UIImage+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = F062000B2CB7EB5D002E6DB9 /* UIImage+Helpers.swift */; };
 		440E5AB02CDBD67D00B09614 /* StatefulPreviewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440E5AAF2CDBD67D00B09614 /* StatefulPreviewWrapper.swift */; };
 		440E5AB42CDCF24500B09614 /* TunnelObfuscationSettingsWatchingObservableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 440E5AB32CDCF24500B09614 /* TunnelObfuscationSettingsWatchingObservableObject.swift */; };
 		4419AA8B2D2826E5001B13C9 /* DetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4419AA8A2D2826E5001B13C9 /* DetailsView.swift */; };
@@ -5836,6 +5838,7 @@
 				A9A5F9F32ACB05160083449F /* AccountExpirySystemNotificationProvider.swift in Sources */,
 				A9A5F9F52ACB05160083449F /* NewDeviceNotificationProvider.swift in Sources */,
 				F09D04B72AE941DA003D4F89 /* OutgoingConnectionProxyTests.swift in Sources */,
+				440870832D809B550038972F /* UIImage+Assets.swift in Sources */,
 				F09D04B92AE95111003D4F89 /* OutgoingConnectionProxy.swift in Sources */,
 				7A6000F92B6273A4001CF0D9 /* AccessMethodViewModel.swift in Sources */,
 				7ABFB09E2BA316220074A49E /* RelayConstraintsTests.swift in Sources */,
@@ -5927,6 +5930,7 @@
 				44DD7D242B6CFFD70005F67F /* StartTunnelOperationTests.swift in Sources */,
 				44BB5F982BE527F4002520EB /* TunnelState+UI.swift in Sources */,
 				A9A5FA2B2ACB05160083449F /* CustomDateComponentsFormattingTests.swift in Sources */,
+				440870842D809C980038972F /* UIImage+Helpers.swift in Sources */,
 				A9A5FA2C2ACB05160083449F /* DeviceCheckOperationTests.swift in Sources */,
 				A9A5FA2D2ACB05160083449F /* DurationTests.swift in Sources */,
 				A9A5FA2E2ACB05160083449F /* FileCacheTests.swift in Sources */,
diff --git a/ios/MullvadVPN/Extensions/UIImage+Assets.swift b/ios/MullvadVPN/Extensions/UIImage+Assets.swift
@@ -12,44 +12,44 @@ extension UIImage {
     enum Buttons {
         // Button images we expect as tightly cropped 24x24 images. The SVGs are 20x20 with a 2px border
         static var account: UIImage {
-            UIImage(resource: .iconAccount).rescaled(by: 24 / 20)
+            UIImage(named: "IconAccount")!.rescaled(by: 24 / 20)
         }
 
         static var alert: UIImage {
-            UIImage(resource: .iconAlert).rescaled(by: 24 / 20)
+            UIImage(named: "IconAlert")!.rescaled(by: 24 / 20)
         }
 
         static var info: UIImage {
             // the info icon was 18x18 cropped
-            UIImage(resource: .iconInfo).resizeImage(targetSize: CGSize(width: 21.5, height: 21.5))
+            UIImage(named: "IconInfo")!.resizeImage(targetSize: CGSize(width: 21.5, height: 21.5))
         }
 
         static var settings: UIImage {
-            UIImage(resource: .iconSettings).rescaled(by: 24 / 20)
+            UIImage(named: "IconSettings")!.rescaled(by: 24 / 20)
         }
 
         static var back: UIImage {
-            UIImage(resource: .iconBack)
+            UIImage(named: "IconBack")!
         }
 
         static var copy: UIImage {
-            UIImage(resource: .iconCopy)
+            UIImage(named: "IconCopy")!
         }
 
         static var hide: UIImage {
-            UIImage(resource: .iconObscure)
+            UIImage(named: "IconObscure")!
         }
 
         static var reload: UIImage {
-            UIImage(resource: .iconReload)
+            UIImage(named: "IconReload")!
         }
 
         static var rightArrow: UIImage {
-            UIImage(resource: .iconArrow)
+            UIImage(named: "IconArrow")!
         }
 
         static var show: UIImage {
-            UIImage(resource: .iconUnobscure)
+            UIImage(named: "IconUnobscure")!
         }
 
         // the close button, which comes we consume in two sizes, both of which come from the same asset
@@ -65,43 +65,43 @@ extension UIImage {
 
     enum CellDecoration {
         static var chevronRight: UIImage {
-            UIImage(resource: .iconChevron)
+            UIImage(named: "IconChevron")!
         }
 
         static var chevronDown: UIImage {
-            UIImage(resource: .iconChevronDown)
+            UIImage(named: "IconChevronDown")!
         }
 
         static var chevronUp: UIImage {
-            UIImage(resource: .iconChevronUp)
+            UIImage(named: "IconChevronUp")!
         }
 
         static var externalLink: UIImage {
-            UIImage(resource: .iconExtlink)
+            UIImage(named: "IconExtlink")!
         }
 
         static var tick: UIImage {
-            UIImage(resource: .iconTickSml)
+            UIImage(named: "IconTickSml")!
                 .resizeImage(targetSize: CGSize(width: 16, height: 16))
         }
     }
 
     enum Status {
-        static var failure: UIImage { UIImage(resource: .iconFail) }
-        static var success: UIImage { UIImage(resource: .iconSuccess) }
+        static var failure: UIImage { UIImage(named: "IconFail")! }
+        static var success: UIImage { UIImage(named: "IconSuccess")! }
     }
 
     // miscellaneous images
     static var backTransitionMask: UIImage {
-        UIImage(resource: .iconBackTransitionMask)
+        UIImage(named: "IconBackTransitionMask")!
     }
 
     static var spinner: UIImage {
-        UIImage(resource: .iconSpinner)
+        UIImage(named: "IconSpinner")!
     }
 
     static var tick: UIImage {
-        UIImage(resource: .iconTickSml)
+        UIImage(named: "IconTickSml")!
             .resizeImage(targetSize: CGSize(width: 24, height: 24))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,44 +12,44 @@ extension UIImage {`
`12`	`12`	`enum Buttons {`
`13`	`13`	`// Button images we expect as tightly cropped 24x24 images. The SVGs are 20x20 with a 2px border`
`14`	`14`	`static var account: UIImage {`
`15`		`- UIImage(resource: .iconAccount).rescaled(by: 24 / 20)`
	`15`	`+ UIImage(named: "IconAccount")!.rescaled(by: 24 / 20)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`static var alert: UIImage {`
`19`		`- UIImage(resource: .iconAlert).rescaled(by: 24 / 20)`
	`19`	`+ UIImage(named: "IconAlert")!.rescaled(by: 24 / 20)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`static var info: UIImage {`
`23`	`23`	`// the info icon was 18x18 cropped`
`24`		`- UIImage(resource: .iconInfo).resizeImage(targetSize: CGSize(width: 21.5, height: 21.5))`
	`24`	`+ UIImage(named: "IconInfo")!.resizeImage(targetSize: CGSize(width: 21.5, height: 21.5))`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`static var settings: UIImage {`
`28`		`- UIImage(resource: .iconSettings).rescaled(by: 24 / 20)`
	`28`	`+ UIImage(named: "IconSettings")!.rescaled(by: 24 / 20)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`static var back: UIImage {`
`32`		`- UIImage(resource: .iconBack)`
	`32`	`+ UIImage(named: "IconBack")!`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`static var copy: UIImage {`
`36`		`- UIImage(resource: .iconCopy)`
	`36`	`+ UIImage(named: "IconCopy")!`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`static var hide: UIImage {`
`40`		`- UIImage(resource: .iconObscure)`
	`40`	`+ UIImage(named: "IconObscure")!`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static var reload: UIImage {`
`44`		`- UIImage(resource: .iconReload)`
	`44`	`+ UIImage(named: "IconReload")!`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`static var rightArrow: UIImage {`
`48`		`- UIImage(resource: .iconArrow)`
	`48`	`+ UIImage(named: "IconArrow")!`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`static var show: UIImage {`
`52`		`- UIImage(resource: .iconUnobscure)`
	`52`	`+ UIImage(named: "IconUnobscure")!`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// the close button, which comes we consume in two sizes, both of which come from the same asset`
`@@ -65,43 +65,43 @@ extension UIImage {`
`65`	`65`
`66`	`66`	`enum CellDecoration {`
`67`	`67`	`static var chevronRight: UIImage {`
`68`		`- UIImage(resource: .iconChevron)`
	`68`	`+ UIImage(named: "IconChevron")!`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`static var chevronDown: UIImage {`
`72`		`- UIImage(resource: .iconChevronDown)`
	`72`	`+ UIImage(named: "IconChevronDown")!`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`static var chevronUp: UIImage {`
`76`		`- UIImage(resource: .iconChevronUp)`
	`76`	`+ UIImage(named: "IconChevronUp")!`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`static var externalLink: UIImage {`
`80`		`- UIImage(resource: .iconExtlink)`
	`80`	`+ UIImage(named: "IconExtlink")!`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`static var tick: UIImage {`
`84`		`- UIImage(resource: .iconTickSml)`
	`84`	`+ UIImage(named: "IconTickSml")!`
`85`	`85`	`.resizeImage(targetSize: CGSize(width: 16, height: 16))`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`enum Status {`
`90`		`- static var failure: UIImage { UIImage(resource: .iconFail) }`
`91`		`- static var success: UIImage { UIImage(resource: .iconSuccess) }`
	`90`	`+ static var failure: UIImage { UIImage(named: "IconFail")! }`
	`91`	`+ static var success: UIImage { UIImage(named: "IconSuccess")! }`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// miscellaneous images`
`95`	`95`	`static var backTransitionMask: UIImage {`
`96`		`- UIImage(resource: .iconBackTransitionMask)`
	`96`	`+ UIImage(named: "IconBackTransitionMask")!`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`static var spinner: UIImage {`
`100`		`- UIImage(resource: .iconSpinner)`
	`100`	`+ UIImage(named: "IconSpinner")!`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`static var tick: UIImage {`
`104`		`- UIImage(resource: .iconTickSml)`
	`104`	`+ UIImage(named: "IconTickSml")!`
`105`	`105`	`.resizeImage(targetSize: CGSize(width: 24, height: 24))`
`106`	`106`	`}`
`107`	`107`