Improve icon usage

Author: jamezrin

.github/workflows/main.yml

@@ -105,7 +105,7 @@ jobs:
       - name: Run electron-builder
         working-directory: ${{ matrix.edition }}-src
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NOTION_REPACKAGED_EDITION: ${{ matrix.edition }}
         run: npx electron-builder --${{ matrix.target }} -c ../electron-builder.js
 

assets/enhancer-icons/128x128.png

@@ -3,12 +3,25 @@ const editionEnv = process.env.NOTION_REPACKAGED_EDITION || 'vanilla';
 module.exports = {
   asar: editionEnv === 'vanilla',
   productName: editionEnv === 'vanilla' ? 'Notion' : 'Notion Enhanced',
+  extraMetadata: {
+    description:
+      editionEnv === 'vanilla'
+        ? 'The all-in-one workspace for your notes and tasks'
+        : 'The all-in-one workspace for your notes and tasks, but enhanced',
+  },
   appId: 'com.github.notion-repackaged',
   protocols: [{ name: 'Notion', schemes: ['notion'] }],
   win: {
+    icon: 'icon.ico',
     target: ['nsis', 'zip'],
   },
+  nsis: {
+    installerIcon: 'icon.ico',
+    oneClick: false,
+    perMachine: false,
+  },
   mac: {
+    icon: 'icon.icns',
     category: 'public.app-category.productivity',
     target: [
       {
@@ -21,11 +34,8 @@ module.exports = {
       },
     ],
   },
-  nsis: {
-    oneClick: false,
-    perMachine: false,
-  },
   linux: {
+    icon: 'icon.icns',
     category: 'Office;Utility;',
     maintainer: '[email protected]',
     mimeTypes: ['x-scheme-handler/notion'],
@@ -34,11 +44,5 @@ module.exports = {
     },
     target: ['AppImage', 'deb', 'rpm', 'pacman', 'zip'],
   },
-  extraMetadata: {
-    description:
-      editionEnv === 'vanilla'
-        ? 'The all-in-one workspace for your notes and tasks'
-        : 'The all-in-one workspace for your notes and tasks, but enhanced',
-  },
   publish: ['github'],
 };

assets/enhancer-icons/16x16.png

@@ -21,9 +21,11 @@ npm install
 log "Install electron and electron-builder..."
 npm install electron@11 electron-builder --save-dev
 
+export NOTION_REPACKAGED_EDITION=enhanced
+
 log "Running electron-builder..."
 node_modules/.bin/electron-builder \
   --linux pacman \
-  --config $WORKSPACE_DIR/electron-builder.yaml
+  --config $WORKSPACE_DIR/electron-builder.js
 
 popd > /dev/null

assets/enhancer-icons/256x256.png

@@ -7,6 +7,8 @@ workspace-dir-pushd
 
 check-cmd jq
 check-cmd git
+check-cmd convert
+check-cmd png2icns
 
 if [ -d "${NOTION_ENHANCED_SRC_NAME}" ]; then
   log "Removing already enhanced sources..."
@@ -52,12 +54,29 @@ for patchable_file in $(find . -type d \( -path ./${NOTION_EMBEDDED_NAME} -o -pa
   echo "${rel_loader_require}" >> $patchable_file
 done
 
-log "Swapping the original icon with the enhancer's one..."
+log "Swapping out vanilla icons..."
 mkdir -p vanilla
 mv icon.icns vanilla/icon.icns
 mv icon.png vanilla/icon.png
 mv icon.ico vanilla/icon.ico
 
-cp "${WORKSPACE_DIR}/assets/notion-enhancer-512.png" icon.png
+enhancer_icons="${WORKSPACE_DIR}/assets/enhancer-icons"
+
+cp "${enhancer_icons}/512x512.png" icon.png
+
+log "Converting icon to multi-size ico for Windows"
+# http://www.imagemagick.org/Usage/thumbnails/#favicon
+convert "${enhancer_icons}/512x512.png" -resize 256x256 \
+  -define icon:auto-resize="256,128,96,64,48,32,16" \
+  icon.ico
+
+log "Converting icon to multi-size for Mac and Linux"
+# https://askubuntu.com/questions/223215/how-can-i-convert-a-png-file-to-icns
+png2icns icon.icns \
+  "${enhancer_icons}/512x512.png" \
+  "${enhancer_icons}/256x256.png" \
+  "${enhancer_icons}/128x128.png" \
+  "${enhancer_icons}/32x32.png" \
+  "${enhancer_icons}/16x16.png"
 
 popd > /dev/null