From 4edb5f50150c07467fcad4ed90d6d31fe0d86e08 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Wed, 27 Dec 2023 13:03:24 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Use=20generated=20asset=20catalo?=
 =?UTF-8?q?g=20symbol=20extensions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PHP Monitor.xcodeproj/project.pbxproj                |  8 +++++++-
 .../xcshareddata/xcschemes/PHP Monitor DEV.xcscheme  |  2 +-
 .../xcshareddata/xcschemes/PHP Monitor EAP.xcscheme  |  2 +-
 .../xcschemes/PHP Monitor Self-Updater.xcscheme      |  2 +-
 .../xcshareddata/xcschemes/PHP Monitor.xcscheme      |  2 +-
 .../xcshareddata/xcschemes/Unit Tests.xcscheme       |  2 +-
 phpmon/Domain/Menu/MainMenu+Startup.swift            |  2 +-
 phpmon/Domain/Menu/MainMenu.swift                    |  4 ++--
 phpmon/Domain/SwiftUI/Common/SwiftUIHelper.swift     |  4 +++-
 .../Domain List/UI/Cells/DomainListKindCell.swift    | 12 +++++-------
 .../Domain List/UI/Cells/DomainListPhpCell.swift     |  5 ++---
 11 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
index 3355369..f215496 100644
--- a/PHP Monitor.xcodeproj/project.pbxproj	
+++ b/PHP Monitor.xcodeproj/project.pbxproj	
@@ -2327,7 +2327,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "Nico Verbruggen";
 				TargetAttributes = {
 					C406A5EF298AD2CE00B5B85A = {
@@ -3521,6 +3521,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -3585,6 +3586,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -3856,6 +3858,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -3965,6 +3968,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4081,6 +4085,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4269,6 +4274,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme
index 2e915fa..97600cd 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme
index 4aa04cf..fc10a1c 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor EAP.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme
index f2e4baa..5b73e93 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor Self-Updater.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme
index 47d77b1..04d8c56 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme
index 325c87d..fcc974d 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/Unit Tests.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/phpmon/Domain/Menu/MainMenu+Startup.swift b/phpmon/Domain/Menu/MainMenu+Startup.swift
index 58a555b..597b43f 100644
--- a/phpmon/Domain/Menu/MainMenu+Startup.swift
+++ b/phpmon/Domain/Menu/MainMenu+Startup.swift
@@ -15,7 +15,7 @@ extension MainMenu {
     func startup() async {
         // Start with the icon
         Task { @MainActor in
-            self.setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+            self.setStatusBar(image: NSImage.statusBarIcon)
         }
 
         if await Startup().checkEnvironment() {
diff --git a/phpmon/Domain/Menu/MainMenu.swift b/phpmon/Domain/Menu/MainMenu.swift
index 753384c..32d4a3b 100644
--- a/phpmon/Domain/Menu/MainMenu.swift
+++ b/phpmon/Domain/Menu/MainMenu.swift
@@ -155,12 +155,12 @@ class MainMenu: NSObject, NSWindowDelegate, NSMenuDelegate, PhpSwitcherDelegate
         Task { @MainActor [self] in
             if PhpEnvironments.shared.isBusy {
                 Log.perf("Refreshing icon: currently busy")
-                setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIcon"))!)
+                setStatusBar(image: NSImage.statusBarIcon)
             } else {
                 Log.perf("Refreshing icon: no longer busy")
                 if Preferences.preferences[.shouldDisplayDynamicIcon] as! Bool == false {
                     // Static icon has been requested
-                    setStatusBar(image: NSImage(named: NSImage.Name("StatusBarIconStatic"))!)
+                    setStatusBar(image: NSImage.statusBarIconStatic)
                 } else {
                     // The dynamic icon has been requested
                     let long = Preferences.preferences[.fullPhpVersionDynamicIcon] as! Bool
diff --git a/phpmon/Domain/SwiftUI/Common/SwiftUIHelper.swift b/phpmon/Domain/SwiftUI/Common/SwiftUIHelper.swift
index 70f9ae9..a60c423 100644
--- a/phpmon/Domain/SwiftUI/Common/SwiftUIHelper.swift
+++ b/phpmon/Domain/SwiftUI/Common/SwiftUIHelper.swift
@@ -27,7 +27,9 @@ var isRunningSwiftUIPreview: Bool {
 
 extension Color {
     public static var appPrimary: Color = Color("AppColor")
-    public static var appSecondary: Color = Color("AppSecondary")
+
+    // This next one is generated automatically via asset catalogs now
+    // public static var appSecondary: Color = Color("AppSecondary")
 
     public static var debug: Color = {
         if ProcessInfo.processInfo.environment["PAINT_PHPMON_SWIFTUI_VIEWS"] != nil {
diff --git a/phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift
index 359574f..db59276 100644
--- a/phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift	
+++ b/phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift	
@@ -16,21 +16,19 @@ class DomainListKindCell: NSTableCellView, DomainListCellProtocol {
 
     func populateCell(with site: ValetSite) {
         // If the `aliasPath` is nil, we're dealing with a parked site (otherwise: linked).
-        imageViewType.image = NSImage(
-            named: site.aliasPath == nil
-            ? "IconParked"
-            : "IconLinked"
-        )
+        imageViewType.image = site.aliasPath == nil
+            ? NSImage.iconParked
+            : NSImage.iconLinked
 
         // Unless, of course, this is a default site
         if site.absolutePath == Valet.shared.config.defaultSite {
-            imageViewType.image = NSImage(named: "IconDefault")
+            imageViewType.image = NSImage.iconDefault
         }
 
         imageViewType.contentTintColor = NSColor.tertiaryLabelColor
     }
 
     func populateCell(with proxy: ValetProxy) {
-        imageViewType.image = NSImage(named: "IconProxy")
+        imageViewType.image = NSImage.iconProxy
     }
 }
diff --git a/phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift
index a0cbcf7..1e486b4 100644
--- a/phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift	
+++ b/phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift	
@@ -34,14 +34,13 @@ class DomainListPhpCell: NSTableCellView, DomainListCellProtocol {
 
         if site.isolatedPhpVersion != nil {
             imageViewPhpVersionOK.isHidden = false
-            imageViewPhpVersionOK.image = NSImage(named: "Isolated")
+            imageViewPhpVersionOK.image = NSImage.isolated
             imageViewPhpVersionOK.toolTip = "domain_list.tooltips.isolated".localized(site.servingPhpVersion)
         } else {
             imageViewPhpVersionOK.isHidden = (site.preferredPhpVersion == "???"
                                               || !site.isCompatibleWithPreferredPhpVersion)
-            imageViewPhpVersionOK.image = NSImage(named: "Checkmark")
+            imageViewPhpVersionOK.image = NSImage.checkmark
             imageViewPhpVersionOK.toolTip = "domain_list.tooltips.checkmark".localized(site.preferredPhpVersion)
-
         }
     }