Update Project Settings - Generate Asset Symbols (#2009)

Updates the project settings to include generated asset symbols for cleaner asset use project-wide. This allows us to use type-safe, auto-generated symbols for referencing assets rather than string based APIs.

This also allows for some cleaning around the use of these symbols, removing nil-coalescing operators and other optional unwrapping boilerplate that was previously required for safe use.

For more info on generated asset symbols, see [Xcode 15 release notes here](https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#New-Features).

### Related Issues

* N/A

### Checklist

<!--- Add things that are not yet implemented above -->

- [x] I read and understood the [contributing guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md) as well as the [code of conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md)
- [x] The issues this PR addresses are related to each other
- [x] My changes generate no new warnings
- [x] My code builds and runs on my machine
- [x] My changes are all related to the related issue above
- [x] I documented my code

### Screenshots

N/A

Author: thecoolwinter

CodeEdit.xcodeproj/project.pbxproj

@@ -380,7 +380,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1540;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					2BE487EB28245162003F3F64 = {
 						CreatedOnToolsVersion = 13.3.1;
@@ -577,6 +577,7 @@
 			baseConfigurationReferenceRelativePath = Alpha.xcconfig;
 			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;
@@ -771,6 +772,7 @@
 			baseConfigurationReferenceRelativePath = Beta.xcconfig;
 			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;
@@ -1033,6 +1035,7 @@
 			baseConfigurationReferenceRelativePath = Alpha.xcconfig;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CE_APPICON_NAME = AppIconPre;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1229,6 +1232,7 @@
 			baseConfigurationReferenceRelativePath = Debug.xcconfig;
 			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;
@@ -1300,6 +1304,7 @@
 			baseConfigurationReferenceRelativePath = Release.xcconfig;
 			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;

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileIcon.swift

@@ -180,13 +180,13 @@ enum FileIcon {
         case .css:
             return .teal
         case .js, .mjs, .py, .entitlements, .LICENSE:
-            return Color("Amber")
+            return Color.amber
         case .json, .resolved, .rb, .strings, .yml:
-            return Color("Scarlet")
+            return Color.scarlet
         case .jsx, .tsx:
             return .cyan
         case .plist, .xcconfig, .sh:
-            return Color("Steel")
+            return Color.steel
         case .c, .cetheme:
             return .purple
         case .vue:
@@ -204,7 +204,7 @@ enum FileIcon {
         case .rs:
             return .orange
         default:
-            return Color("Steel")
+            return Color.steel
         }
     }
 }

CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarMenu.swift

@@ -76,10 +76,10 @@ final class JumpBarMenuItem: NSMenuItem {
         if fileItem.isFolder {
             let subMenu = NSMenu()
             submenu = subMenu
-            color = NSColor(named: "FolderBlue") ?? NSColor(.secondary)
+            color = NSColor.folderBlue
         }
         if generalSettings.fileIconStyle == .monochrome {
-            color = NSColor(named: "CoolGray") ?? NSColor(.gray)
+            color = NSColor.coolGray
         }
         let image = fileItem.nsIcon.withSymbolConfiguration(.init(paletteColors: [color]))
         self.image = image

CodeEdit/Features/NavigatorArea/OutlineView/FileSystemTableViewCell.swift

@@ -138,10 +138,10 @@ class FileSystemTableViewCell: StandardTableViewCell {
             if !item.isFolder {
                 return NSColor(item.iconColor)
             } else {
-                return NSColor(named: "FolderBlue") ?? NSColor(.cyan)
+                return NSColor.folderBlue
             }
         } else {
-            return NSColor(named: "CoolGray") ?? NSColor(.gray)
+            return NSColor.coolGray
         }
     }
 

CodeEdit/Features/NavigatorArea/ProjectNavigator/ProjectNavigatorToolbarBottom.swift

@@ -168,10 +168,10 @@ struct FilterDropDownIconButton<MenuView: View>: View {
         Menu { menu() } label: {}
             .background {
                 if isOn == true {
-                    Image("line.3.horizontal.decrease.chevron.filled")
+                    Image(ImageResource.line3HorizontalDecreaseChevronFilled)
                         .foregroundStyle(.tint)
                 } else {
-                    Image("line.3.horizontal.decrease.chevron")
+                    Image(ImageResource.line3HorizontalDecreaseChevron)
                 }
             }
             .menuStyle(.borderlessButton)

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Models/RepoOutlineGroupItem.swift

@@ -8,12 +8,16 @@
 import SwiftUI
 
 struct RepoOutlineGroupItem: Hashable, Identifiable {
+    enum ImageType: Hashable {
+        case system(name: String)
+        case symbol(name: String)
+    }
+
     var id: String
     var label: String
     var description: String?
-    var systemImage: String?
-    var symbolImage: String?
-    var imageColor: Color?
+    var image: ImageType
+    var imageColor: Color
     var children: [RepoOutlineGroupItem]?
     var branch: GitBranch?
     var stashEntry: GitStashEntry?

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift

@@ -17,53 +17,49 @@ struct SourceControlNavigatorRepositoryItem: View {
     var controlActiveState
 
     var body: some View {
-        if item.systemImage != nil || item.symbolImage != nil {
-            Label(title: {
-                Text(item.label)
+        Label(title: {
+            Text(item.label)
+                .lineLimit(1)
+                .truncationMode(.middle)
+            if let description = item.description {
+                Text(description)
                     .lineLimit(1)
-                    .truncationMode(.middle)
-                if let description = item.description {
-                    Text(description)
-                        .lineLimit(1)
-                        .foregroundStyle(.secondary)
-                        .font(.system(size: 11))
-                        .layoutPriority(-1)
-                }
-                Spacer()
-                HStack(spacing: 5) {
-                    if let behind = item.branch?.behind, behind > 0 {
-                        HStack(spacing: 0) {
-                            Image(systemName: "arrow.down")
-                                .imageScale(.small)
-                            Text("\(behind)")
-                                .font(.system(size: 11))
-                        }
+                    .foregroundStyle(.secondary)
+                    .font(.system(size: 11))
+                    .layoutPriority(-1)
+            }
+            Spacer()
+            HStack(spacing: 5) {
+                if let behind = item.branch?.behind, behind > 0 {
+                    HStack(spacing: 0) {
+                        Image(systemName: "arrow.down")
+                            .imageScale(.small)
+                        Text("\(behind)")
+                            .font(.system(size: 11))
                     }
-                    if let ahead = item.branch?.ahead, ahead > 0 {
-                        HStack(spacing: 0) {
-                            Image(systemName: "arrow.up")
-                                .imageScale(.small)
-                            Text("\(ahead)")
-                                .font(.system(size: 11))
-                        }
+                }
+                if let ahead = item.branch?.ahead, ahead > 0 {
+                    HStack(spacing: 0) {
+                        Image(systemName: "arrow.up")
+                            .imageScale(.small)
+                        Text("\(ahead)")
+                            .font(.system(size: 11))
                     }
                 }
-            }, icon: {
-                if item.symbolImage != nil {
-                    Image(symbol: item.symbolImage ?? "")
-                        .opacity(controlActiveState == .inactive ? 0.5 : 1)
-                        .foregroundStyle(fileIconStyle == .color ? item.imageColor ?? .accentColor : Color("CoolGray"))
-                } else {
-                    Image(systemName: item.systemImage ?? "")
-                        .opacity(controlActiveState == .inactive ? 0.5 : 1)
-                        .foregroundStyle(fileIconStyle == .color ? item.imageColor ?? .accentColor : Color("CoolGray"))
+            }
+        }, icon: {
+            Group {
+                switch item.image {
+                case .system(let name):
+                    Image(systemName: name)
+                case .symbol(let name):
+                    Image(symbol: name)
                 }
-            })
-            .padding(.leading, 1)
-            .padding(.vertical, -1)
-        } else {
-            Text(item.label)
-                .padding(.leading, 2)
-        }
+            }
+            .opacity(controlActiveState == .inactive ? 0.5 : 1)
+            .foregroundStyle(fileIconStyle == .color ? item.imageColor : Color.coolGray)
+        })
+        .padding(.leading, 1)
+        .padding(.vertical, -1)
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView+outlineGroupData.swift

@@ -13,14 +13,14 @@ extension SourceControlNavigatorRepositoryView {
             .init(
                 id: "BranchesGroup",
                 label: "Branches",
-                systemImage: "externaldrive.fill",
+                image: .system(name: "externaldrive.fill"),
                 imageColor: Color(nsColor: .secondaryLabelColor),
                 children: sourceControlManager.orderedLocalBranches.map { branch in
                         .init(
                             id: "Branch\(branch.name)",
                             label: branch.name,
                             description: branch == sourceControlManager.currentBranch ? "(current)" : nil,
-                            symbolImage: "branch",
+                            image: .symbol(name: "branch"),
                             imageColor: .blue,
                             branch: branch
                         )
@@ -29,7 +29,7 @@ extension SourceControlNavigatorRepositoryView {
             .init(
                 id: "StashedChangesGroup",
                 label: "Stashed Changes",
-                systemImage: "tray.2.fill",
+                image: .system(name: "tray.2.fill"),
                 imageColor: Color(nsColor: .secondaryLabelColor),
                 children: sourceControlManager.stashEntries.map { stashEntry in
                         .init(
@@ -43,7 +43,7 @@ extension SourceControlNavigatorRepositoryView {
                                     .hour(.defaultDigits(amPM: .abbreviated))
                                     .minute(.twoDigits)
                             ),
-                            systemImage: "tray",
+                            image: .system(name: "tray"),
                             imageColor: .orange,
                             stashEntry: stashEntry
                         )
@@ -52,19 +52,19 @@ extension SourceControlNavigatorRepositoryView {
             .init(
                 id: "RemotesGroup",
                 label: "Remotes",
-                systemImage: "network",
+                image: .system(name: "network"),
                 imageColor: Color(nsColor: .secondaryLabelColor),
                 children: sourceControlManager.remotes.map { remote in
                         .init(
                             id: "Remote\(remote.hashValue)",
                             label: remote.name,
-                            symbolImage: "vault",
+                            image: .symbol(name: "vault"),
                             imageColor: .teal,
                             children: remote.branches.map { branch in
                                 .init(
                                     id: "Remote\(remote.name)-Branch\(branch.name)",
                                     label: branch.name,
-                                    symbolImage: "branch",
+                                    image: .symbol(name: "branch"),
                                     imageColor: .blue,
                                     branch: branch
                                 )

CodeEdit/Features/Settings/Pages/AccountsSettings/AccountSelectionView.swift

@@ -23,7 +23,7 @@ struct AccountSelectionView: View {
                         ForEach(gitProviders, id: \.self) { provider in
                             AccountsSettingsProviderRow(
                                 name: provider.name,
-                                iconName: provider.iconName,
+                                iconResource: provider.iconResource,
                                 action: {
                                     selectedProvider = provider
                                     dismiss()

CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift

@@ -22,7 +22,7 @@ struct AccountsSettingsAccountLink: View {
                     .font(.footnote)
                     .foregroundColor(.secondary)
             } icon: {
-                FeatureIcon(image: Image(account.provider.iconName), size: 26)
+                FeatureIcon(image: Image(account.provider.iconResource), size: 26)
                     .padding(.vertical, 2)
                     .padding(.leading, 2)
             }