Reworking menu bar icons for macOS 11+ (#182)

* Adding template tray icons for macOS 11+
* Separate asset directory for darwin 20+

9 files changed, 7 insertions, 3 deletions

diff --git a/branding/darwin-20-icons-lo-res.xcf b/branding/darwin-20-icons-lo-res.xcf
new file mode 100644
index 000000000..1b40a6e01
--- /dev/null
+++ b/branding/darwin-20-icons-lo-res.xcf
diff --git a/branding/darwin-20-icons.xcf b/branding/darwin-20-icons.xcf
new file mode 100644
index 000000000..2e11bb0cd
--- /dev/null
+++ b/branding/darwin-20-icons.xcf
diff --git a/src/assets/images/tray/darwin-20/tray-indirect.png b/src/assets/images/tray/darwin-20/tray-indirect.png
new file mode 100644
index 000000000..6ee9f320a
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray-indirect.png
diff --git a/src/assets/images/tray/darwin-20/tray-indirect@2x.png b/src/assets/images/tray/darwin-20/tray-indirect@2x.png
new file mode 100644
index 000000000..59edb1dbc
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray-indirect@2x.png
diff --git a/src/assets/images/tray/darwin-20/tray-unread.png b/src/assets/images/tray/darwin-20/tray-unread.png
new file mode 100644
index 000000000..af536a949
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray-unread.png
diff --git a/src/assets/images/tray/darwin-20/tray-unread@2x.png b/src/assets/images/tray/darwin-20/tray-unread@2x.png
new file mode 100644
index 000000000..046d7295d
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray-unread@2x.png
diff --git a/src/assets/images/tray/darwin-20/tray.png b/src/assets/images/tray/darwin-20/tray.png
new file mode 100644
index 000000000..6e05d2a56
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray.png
diff --git a/src/assets/images/tray/darwin-20/tray@2x.png b/src/assets/images/tray/darwin-20/tray@2x.png
new file mode 100644
index 000000000..a308fa35b
--- /dev/null
+++ b/src/assets/images/tray/darwin-20/tray@2x.png
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 878841213..0e935d891 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -211,7 +211,7 @@ export default class TrayIcon {
       this._getAsset('tray', this._getAssetFromIndicator(this.indicator)),
     );
 
-    if (isMac) {
+    if (isMac && !macosVersion.isGreaterThanOrEqualTo('11')) {
       this.trayIcon.setPressedImage(
         this._getAsset(
           'tray',
@@ -226,8 +226,12 @@ export default class TrayIcon {
 
     if (
       isMac &&
-      (nativeTheme.shouldUseDarkColors ||
-        macosVersion.isGreaterThanOrEqualTo('11'))
+      macosVersion.isGreaterThanOrEqualTo('11')
+    ) {
+      platform = `${platform}-20`;
+    } else if (
+      isMac &&
+      nativeTheme.shouldUseDarkColors
     ) {
       platform = `${platform}-dark`;
     }