Using the correct color when File Icon Type is set to Monochrome (#1766)

Added CoolGray color and applied to icons when file icon type setting is set to monochrome.

Author: austincondiff

CodeEdit/Assets.xcassets/Custom Colors/Amber.colorset/Contents.json

@@ -2,12 +2,12 @@
   "colors" : [
     {
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.000",
-          "green" : "0.689",
-          "red" : "0.931"
+          "blue" : "0.133",
+          "green" : "0.635",
+          "red" : "0.784"
         }
       },
       "idiom" : "universal"
@@ -20,8 +20,13 @@
         }
       ],
       "color" : {
-        "platform" : "universal",
-        "reference" : "systemYellowColor"
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.302",
+          "green" : "0.812",
+          "red" : "0.961"
+        }
       },
       "idiom" : "universal"
     }

CodeEdit/Assets.xcassets/Custom Colors/CoolGray.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.553",
+          "green" : "0.541",
+          "red" : "0.518"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.549",
+          "green" : "0.537",
+          "red" : "0.525"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CodeEdit/Assets.xcassets/Custom Colors/FolderBlue.colorset/Contents.json

@@ -2,12 +2,12 @@
   "colors" : [
     {
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.945",
-          "green" : "0.671",
-          "red" : "0.075"
+          "blue" : "0.973",
+          "green" : "0.698",
+          "red" : "0.125"
         }
       },
       "idiom" : "universal"
@@ -20,12 +20,12 @@
         }
       ],
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.871",
-          "green" : "0.702",
-          "red" : "0.322"
+          "blue" : "0.859",
+          "green" : "0.698",
+          "red" : "0.365"
         }
       },
       "idiom" : "universal"

CodeEdit/Features/Editor/PathBar/Views/EditorPathBarMenu.swift

@@ -61,6 +61,7 @@ final class EditorPathBarMenu: NSMenu, NSMenuDelegate {
 final class PathBarMenuItem: NSMenuItem {
     private let fileItem: CEWorkspaceFile
     private let tappedOpenFile: (CEWorkspaceFile) -> Void
+    private let generalSettings = Settings.shared.preferences.general
 
     init(
         fileItem: CEWorkspaceFile,
@@ -77,6 +78,9 @@ final class PathBarMenuItem: NSMenuItem {
             submenu = subMenu
             color = NSColor(named: "FolderBlue") ?? NSColor(.secondary)
         }
+        if generalSettings.fileIconStyle == .monochrome {
+            color = NSColor(named: "CoolGray") ?? NSColor(.gray)
+        }
         let image = fileItem.nsIcon.withSymbolConfiguration(.init(paletteColors: [color]))
         self.image = image
         representedObject = fileItem

CodeEdit/Features/NavigatorArea/OutlineView/FileSystemTableViewCell.swift

@@ -80,10 +80,14 @@ class FileSystemTableViewCell: StandardTableViewCell {
     /// - Parameter item: The `FileItem` to get the color for
     /// - Returns: A `NSColor` for the given `FileItem`.
     func color(for item: CEWorkspaceFile) -> NSColor {
-        if !item.isFolder && prefs.fileIconStyle == .color {
-            return NSColor(item.iconColor)
+        if prefs.fileIconStyle == .color {
+            if !item.isFolder {
+                return NSColor(item.iconColor)
+            } else {
+                return NSColor(named: "FolderBlue") ?? NSColor(.cyan)
+            }
         } else {
-            return NSColor(named: "FolderBlue")!
+            return NSColor(named: "CoolGray") ?? NSColor(.gray)
         }
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Changes/Views/SourceControlNavigatorChangedFileView.swift

@@ -8,6 +8,9 @@
 import SwiftUI
 
 struct SourceControlNavigatorChangedFileView: View {
+    @AppSettings(\.general.fileIconStyle)
+    var fileIconStyle
+
     @EnvironmentObject var sourceControlManager: SourceControlManager
     @Binding var changedFile: CEWorkspaceFile
     @State var staged: Bool
@@ -53,7 +56,7 @@ struct SourceControlNavigatorChangedFileView: View {
                     .truncationMode(.middle)
             }, icon: {
                 Image(nsImage: changedFile.nsIcon)
-                    .foregroundStyle(changedFile.iconColor)
+                    .foregroundStyle(fileIconStyle == .color ? changedFile.iconColor : Color("CoolGray"))
             })
 
             Spacer()

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitChangedFileListItemView.swift

@@ -8,7 +8,11 @@
 import SwiftUI
 
 struct CommitChangedFileListItemView: View {
+    @AppSettings(\.general.fileIconStyle)
+    var fileIconStyle
+
     @EnvironmentObject var sourceControlManager: SourceControlManager
+
     @Binding var changedFile: CEWorkspaceFile
 
     var folder: String? {
@@ -34,7 +38,7 @@ struct CommitChangedFileListItemView: View {
                     .truncationMode(.middle)
             }, icon: {
                 Image(nsImage: changedFile.nsIcon)
-                    .foregroundStyle(changedFile.iconColor)
+                    .foregroundStyle(fileIconStyle == .color ? changedFile.iconColor : Color("CoolGray"))
             })
 
             Spacer()

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

@@ -8,6 +8,9 @@
 import SwiftUI
 
 struct SourceControlNavigatorRepositoryItem: View {
+    @AppSettings(\.general.fileIconStyle)
+    var fileIconStyle
+
     let item: RepoOutlineGroupItem
 
     @Environment(\.controlActiveState)
@@ -49,11 +52,11 @@ struct SourceControlNavigatorRepositoryItem: View {
                 if item.symbolImage != nil {
                     Image(symbol: item.symbolImage ?? "")
                         .opacity(controlActiveState == .inactive ? 0.5 : 1)
-                        .foregroundStyle(item.imageColor ?? .accentColor)
+                        .foregroundStyle(fileIconStyle == .color ? item.imageColor ?? .accentColor : Color("CoolGray"))
                 } else {
                     Image(systemName: item.systemImage ?? "")
                         .opacity(controlActiveState == .inactive ? 0.5 : 1)
-                        .foregroundStyle(item.imageColor ?? .accentColor)
+                        .foregroundStyle(fileIconStyle == .color ? item.imageColor ?? .accentColor : Color("CoolGray"))
                 }
             })
             .padding(.leading, 1)