Restructuring, switching to Electron's nativeImage, removed broken DM…

…G background image

.gitignore

@@ -98,4 +98,7 @@ dist/
 
 mas/
 
-build/
+build/
+
+entitlements.mas.inherit.plist
+entitlements.mas.plist

electron-builder.yml

@@ -17,7 +17,7 @@ mac:
       role: Editor
       isPackage: false
       rank: Owner
-  icon: ./assets/icons/icon.icns
+  icon: ./resources/icon.icns
   type: distribution
   hardenedRuntime: true
   entitlements: assets/entitlements.mac.plist
@@ -27,7 +27,6 @@ mac:
   artifactName: ${productName}-${version}-mac-${arch}.${ext}
   darkModeSupport: true
 dmg:
-  background: assets/dmg/background.tiff
   contents:
     - x: 130
       'y': 220
@@ -49,7 +48,7 @@ win:
     - portable
     - nsis
     - appx
-  icon: assets/icons/sleek.ico
+  icon: resources/icon.ico
   artifactName: ${productName}-${version}-win-${arch}.${ext}
 nsis:
   artifactName: ${productName}-${version}-win-${arch}-Setup.${ext}
@@ -60,7 +59,7 @@ appx:
   publisherDisplayName: ransome1
   applicationId: RobinAhle.sleektodomanager
 linux:
-  icon: assets/icons
+  icon: resources/icon
   category: ProjectManagement
   target:
     - deb

src/main/index.ts

@@ -1,13 +1,15 @@
-import { app, BrowserWindow, nativeTheme } from 'electron';
+import { app, BrowserWindow, nativeTheme, nativeImage } from 'electron';
 import { fileURLToPath } from 'url';
 import path from 'path';
 import fs from 'fs';
 import { config } from './config.js';
 import { createMenu } from './modules/Menu.js';
 import { createFileWatcher, watcher } from './modules/File/Watcher.js';
 import { createTray } from './modules/Tray.js';
+import macIcon from '../../resources/icon.icns?asset'
+import windowsIcon from '../../resources/icon.ico?asset'
+import linuxIcon from '../../resources/icon.png?asset'
 import './modules/IpcMain.js';
-import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 const environment: string | undefined = process.env.NODE_ENV;
 let mainWindow: BrowserWindow | null = null;
 let eventListeners: Record<string, any | undefined> = {};
@@ -105,10 +107,10 @@ const createMainWindow = () => {
     height: 1000,
     backgroundColor: (shouldUseDarkColors) ? '#212224' : '#fff',
     icon: process.platform === 'win32'
-    ? './assets/icons/sleek.ico'
+    ? nativeImage.createFromPath(windowsIcon)
     : process.platform === 'darwin'
-    ? './assets/icons/sleek.icns'
-    : './assets/icons/512x512.png',
+    ? nativeImage.createFromPath(macIcon)
+    : nativeImage.createFromPath(linuxIcon),
     webPreferences: {
       spellcheck: false,
       contextIsolation: true,
@@ -118,7 +120,7 @@ const createMainWindow = () => {
     },
   });
 
-  if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+  if (!app.isPackaged && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
   } else {
     mainWindow.loadFile(fileURLToPath(new URL('../renderer/index.html', import.meta.url)));

src/main/modules/Tray.tsx

@@ -1,7 +1,9 @@
-import { app, Menu, Tray } from 'electron';
+import { app, Menu, Tray, nativeImage } from 'electron';
+import { fileURLToPath } from 'url';
 import { handleCreateWindow } from '../index';
 import { config } from '../config';
 import { setFile } from './File/File';
+import trayIcon from '../../../resources/tray/tray.png?asset'
 
 let tray: Tray;
 
@@ -43,10 +45,8 @@ function createTray() {
   }
 
   const files: FileObject[] = config.get('files');
-  const iconName: string = process.platform === 'win32' ? 'tray.ico' : 'tray.png';
   const menu: Electron.Menu = Menu.buildFromTemplate(createMenuTemplate(files));
-
-  tray = new Tray(`./assets/icons/tray/${iconName}`);
+  tray = new Tray(nativeImage.createFromPath(trayIcon))
   tray.setToolTip('sleek');
   tray.setContextMenu(menu);
   tray.on('click', () => {

src/renderer/Dialog/PomodoroPicker.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import FormControl from '@mui/material/FormControl';
 import TextField from '@mui/material/TextField';
-import TomatoIconDuo from '../../../assets/icons/tomato-duo.svg';
+//import TomatoIconDuo from '../../../assets/icons/tomato-duo.svg';
+import TomatoIconDuo from '../public/tomato-duo.svg?asset'
 import './PomodoroPicker.scss';
 
 interface PomodoroPickerProps {

src/renderer/Grid/Renderer.tsx

@@ -5,7 +5,7 @@ import remarkGfm from 'remark-gfm'
 import Button from '@mui/material/Button';
 import Chip from '@mui/material/Chip';
 import Tooltip from '@mui/material/Tooltip';
-import TomatoIconDuo from '../../../assets/icons/tomato-duo.svg';
+import TomatoIconDuo from '../public/tomato-duo.svg?asset'
 import DatePickerInline from './DatePickerInline';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import { handleLinkClick } from '../Shared';