Fix icons in MacOS

1nikolas · Sep 16, 2020 · 0b3a3a4 · 0b3a3a4
1 parent e0aa50c
commit 0b3a3a4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,10 @@
   "description": " Get the lyrics of what you're listening on Tidal",
   "main": "src/index.js",
   "win": {
-    "icon": "./icon.ico"
+    "icon": "./src/images/icon.ico"
+  },
+  "mac": {
+    "icon": "./src/images/icon.icns"
   },
   "scripts": {
     "start": "electron-forge start",
@@ -24,14 +27,14 @@
   "config": {
     "forge": {
       "packagerConfig": {
-        "icon": "icon.ico"
+        "icon": "./src/images/icon.icns"
       },
       "makers": [
         {
           "name": "@electron-forge/maker-squirrel",
           "config": {
             "name": "tidal_lyrics",
-            "iconUrl": "https://raw.githubusercontent.com/1nikolas/tidal-lyrics/master/icon.ico"
+            "iconUrl": "https://raw.githubusercontent.com/1nikolas/tidal-lyrics/master/src/images/icon.ico"
           }
         },
         {

diff --git a/src/images/icon.icns b/src/images/icon.icns
diff --git a/icon.ico → src/images/icon.ico b/icon.ico → src/images/icon.ico
diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Menu, ipcMain, dialog } = require('electron');
+const { app, BrowserWindow, Menu, ipcMain, dialog, nativeImage } = require('electron');
 const remote = require("electron").remote;
 const path = require('path');
 const { exec } = require("child_process");
@@ -44,15 +44,24 @@ const createWindow = () => {
                 if (body.replace(/(\r\n|\n|\r)/gm, "") != app.getVersion()) {
 
                     //update available
+                    var dialogIcon = null
+                    if (process.platform == "darwin"){
+                        dialogIcon = __dirname + "/images/icon.png"
+                    }
                     dialog.showMessageBox(mainWindow, {
                         type: "info",
-                        buttons: ["Update"],
+                        buttons: ["Update", "Dismiss"],
                         message: "An update is available!",
+                        icon: dialogIcon,
                         cancelId: 1
                     }).then(result => {
                         if (result.response === 0) {
                             require('electron').shell.openExternal("https://github.com/1nikolas/tidal-lyrics/releases");
-                            app.quit();
+                            if (process.platform == "win32"){
+                                app.quit()
+                            } else if (process.platform == "darwin"){
+                                setTimeout(app.quit(), 1000);
+                            }
                         }
                     })
 
@@ -93,7 +102,7 @@ const createWindow = () => {
         dialog.showMessageBox(mainWindow, {
             buttons: ["OK", "Visit tidal-lyrics on Github"],
             message: "tidal-lyrics " + app.getVersion() + "\nMade by Nikolas Spiridakis",
-            icon: path.join(__dirname + "./images/icon.png")
+            icon: __dirname + "/images/icon.png"
         }).then(result => {
             if (result.response === 1) {
                 require('electron').shell.openExternal("https://github.com/1nikolas/tidal-lyrics/");
@@ -106,6 +115,10 @@ const createWindow = () => {
 
 };
 
+if (process.platform == "darwin"){
+    app.dock.setIcon(nativeImage.createFromPath(__dirname + "/images/icon.png"));
+}
+
 app.on('ready', createWindow);
 
 // For MacOS