fix(Main): menu item image support dark mode

Ji4n1ng · Aug 3, 2019 · d68fc81 · d68fc81
1 parent 6c2606a
commit d68fc81
Show file tree

Hide file tree

Showing 27 changed files with 145 additions and 4 deletions.
diff --git a/OpenInTerminal/Info.plist b/OpenInTerminal/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>

diff --git a/...inalFinderExtension/FinderAssets.xcassets/context_menu_icon_editor.imageset/Contents.json b/...inalFinderExtension/FinderAssets.xcassets/context_menu_icon_editor.imageset/Contents.json
@@ -1,16 +1,62 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_editor-1.png",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "context_menu_icon_editor.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_editor_light.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/...ssets.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor-1.png b/...ssets.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor-1.png
diff --git a/...rAssets.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor.png b/...rAssets.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor.png
diff --git a/...ts.xcassets/context_menu_icon_editor.imageset/[email protected] b/...ts.xcassets/context_menu_icon_editor.imageset/[email protected]
diff --git a/...sets.xcassets/context_menu_icon_editor.imageset/[email protected] b/...sets.xcassets/context_menu_icon_editor.imageset/[email protected]
diff --git a/...sets.xcassets/context_menu_icon_editor.imageset/[email protected] b/...sets.xcassets/context_menu_icon_editor.imageset/[email protected]
diff --git a/...s.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor_light.png b/...s.xcassets/context_menu_icon_editor.imageset/context_menu_icon_editor_light.png
diff --git a/...cassets/context_menu_icon_editor.imageset/[email protected] b/...cassets/context_menu_icon_editor.imageset/[email protected]
diff --git a/...rminalFinderExtension/FinderAssets.xcassets/context_menu_icon_path.imageset/Contents.json b/...rminalFinderExtension/FinderAssets.xcassets/context_menu_icon_path.imageset/Contents.json
@@ -1,16 +1,62 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_path-1.png",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "context_menu_icon_path.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_path_light.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/...derAssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path-1.png b/...derAssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path-1.png
diff --git a/...inderAssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path.png b/...inderAssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path.png
diff --git a/...Assets.xcassets/context_menu_icon_path.imageset/[email protected] b/...Assets.xcassets/context_menu_icon_path.imageset/[email protected]
diff --git a/...erAssets.xcassets/context_menu_icon_path.imageset/[email protected] b/...erAssets.xcassets/context_menu_icon_path.imageset/[email protected]
diff --git a/...erAssets.xcassets/context_menu_icon_path.imageset/[email protected] b/...erAssets.xcassets/context_menu_icon_path.imageset/[email protected]
diff --git a/...ssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path_light.png b/...ssets.xcassets/context_menu_icon_path.imageset/context_menu_icon_path_light.png
diff --git a/...ts.xcassets/context_menu_icon_path.imageset/[email protected] b/...ts.xcassets/context_menu_icon_path.imageset/[email protected]
diff --git a/...alFinderExtension/FinderAssets.xcassets/context_menu_icon_terminal.imageset/Contents.json b/...alFinderExtension/FinderAssets.xcassets/context_menu_icon_terminal.imageset/Contents.json
@@ -1,16 +1,62 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_terminal-1.png",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "context_menu_icon_terminal.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "context_menu_icon_terminal_light.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "[email protected]",
       "scale" : "3x"
     }
   ],

diff --git a/...s.xcassets/context_menu_icon_terminal.imageset/context_menu_icon_terminal-1.png b/...s.xcassets/context_menu_icon_terminal.imageset/context_menu_icon_terminal-1.png
diff --git a/...ets.xcassets/context_menu_icon_terminal.imageset/context_menu_icon_terminal.png b/...ets.xcassets/context_menu_icon_terminal.imageset/context_menu_icon_terminal.png
diff --git a/...cassets/context_menu_icon_terminal.imageset/[email protected] b/...cassets/context_menu_icon_terminal.imageset/[email protected]
diff --git a/....xcassets/context_menu_icon_terminal.imageset/[email protected] b/....xcassets/context_menu_icon_terminal.imageset/[email protected]
diff --git a/....xcassets/context_menu_icon_terminal.imageset/[email protected] b/....xcassets/context_menu_icon_terminal.imageset/[email protected]
diff --git a/...assets/context_menu_icon_terminal.imageset/context_menu_icon_terminal_light.png b/...assets/context_menu_icon_terminal.imageset/context_menu_icon_terminal_light.png
diff --git a/...ets/context_menu_icon_terminal.imageset/[email protected] b/...ets/context_menu_icon_terminal.imageset/[email protected]
diff --git a/OpenInTerminalFinderExtension/FinderSync.swift b/OpenInTerminalFinderExtension/FinderSync.swift
@@ -52,21 +52,24 @@ class FinderSync: FIFinderSync {
                                                                          comment: "Open with default Terminal"),
                                                 action: #selector(openDefaultTerminal),
                                                 keyEquivalent: "")
-            openInTerminalItem.image = NSImage(named: "context_menu_icon_terminal")
+            let terminalIcon = NSImage(named: "context_menu_icon_terminal")!
+            openInTerminalItem.image = terminalIcon
             menu.addItem(openInTerminalItem)
 
             let openInEditorItem = NSMenuItem(title: NSLocalizedString("menu.open_with_default_editor",
                                                                          comment: "Open with default Editor"),
                                                 action: #selector(openDefaultEditor),
                                                 keyEquivalent: "")
-            openInEditorItem.image = NSImage(named: "context_menu_icon_editor")
+            let editorIcon = NSImage(named: "context_menu_icon_editor")!
+            openInEditorItem.image = editorIcon
             menu.addItem(openInEditorItem)
 
             let copyPathItem = NSMenuItem(title: NSLocalizedString("menu.copy_path_to_clipboard",
                                                                    comment: "Copy path to Clipboard"),
                                                 action: #selector(copyPathToClipboard),
                                                 keyEquivalent: "")
-            copyPathItem.image = NSImage(named: "context_menu_icon_path")
+            let copyPathIcon = NSImage(named: "context_menu_icon_path")
+            copyPathItem.image = copyPathIcon
             menu.addItem(copyPathItem)
 
         default:

diff --git a/Resources/sketch/icons.sketch b/Resources/sketch/icons.sketch