From f17fefab20c70ebd2bac54c433b23ac0756215b2 Mon Sep 17 00:00:00 2001 From: tiddlygit-test Date: Thu, 31 Dec 2020 22:28:19 +0800 Subject: [PATCH] refactor: move images to buildResources --- {src/services => build-resources}/icon@2x.png | Bin {src/services => build-resources}/icon@3x.png | Bin {src/services => build-resources}/icon@4x.png | Bin {src/services => build-resources}/icon@5x.png | Bin {src/services => build-resources}/menubar.png | Bin {src/services => build-resources}/menubar@2x.png | Bin .../menubarTemplate.png | Bin .../menubarTemplate@2x.png | Bin .../overlay-icon.png | Bin .../overlay-icon@2x.png | Bin .../overlay-icon@3x.png | Bin .../overlay-icon@4x.png | Bin .../overlay-icon@5x.png | Bin src/services/constants/paths.ts | 3 ++- src/services/icon.png | Bin 2628 -> 0 bytes src/services/libs/views.ts | 3 ++- src/services/windows/main.ts | 6 +++--- 17 files changed, 7 insertions(+), 5 deletions(-) rename {src/services => build-resources}/icon@2x.png (100%) rename {src/services => build-resources}/icon@3x.png (100%) rename {src/services => build-resources}/icon@4x.png (100%) rename {src/services => build-resources}/icon@5x.png (100%) rename {src/services => build-resources}/menubar.png (100%) rename {src/services => build-resources}/menubar@2x.png (100%) rename {src/services => build-resources}/menubarTemplate.png (100%) rename {src/services => build-resources}/menubarTemplate@2x.png (100%) rename {src/services => build-resources}/overlay-icon.png (100%) rename {src/services => build-resources}/overlay-icon@2x.png (100%) rename {src/services => build-resources}/overlay-icon@3x.png (100%) rename {src/services => build-resources}/overlay-icon@4x.png (100%) rename {src/services => build-resources}/overlay-icon@5x.png (100%) delete mode 100644 src/services/icon.png diff --git a/src/services/icon@2x.png b/build-resources/icon@2x.png similarity index 100% rename from src/services/icon@2x.png rename to build-resources/icon@2x.png diff --git a/src/services/icon@3x.png b/build-resources/icon@3x.png similarity index 100% rename from src/services/icon@3x.png rename to build-resources/icon@3x.png diff --git a/src/services/icon@4x.png b/build-resources/icon@4x.png similarity index 100% rename from src/services/icon@4x.png rename to build-resources/icon@4x.png diff --git a/src/services/icon@5x.png b/build-resources/icon@5x.png similarity index 100% rename from src/services/icon@5x.png rename to build-resources/icon@5x.png diff --git a/src/services/menubar.png b/build-resources/menubar.png similarity index 100% rename from src/services/menubar.png rename to build-resources/menubar.png diff --git a/src/services/menubar@2x.png b/build-resources/menubar@2x.png similarity index 100% rename from src/services/menubar@2x.png rename to build-resources/menubar@2x.png diff --git a/src/services/menubarTemplate.png b/build-resources/menubarTemplate.png similarity index 100% rename from src/services/menubarTemplate.png rename to build-resources/menubarTemplate.png diff --git a/src/services/menubarTemplate@2x.png b/build-resources/menubarTemplate@2x.png similarity index 100% rename from src/services/menubarTemplate@2x.png rename to build-resources/menubarTemplate@2x.png diff --git a/src/services/overlay-icon.png b/build-resources/overlay-icon.png similarity index 100% rename from src/services/overlay-icon.png rename to build-resources/overlay-icon.png diff --git a/src/services/overlay-icon@2x.png b/build-resources/overlay-icon@2x.png similarity index 100% rename from src/services/overlay-icon@2x.png rename to build-resources/overlay-icon@2x.png diff --git a/src/services/overlay-icon@3x.png b/build-resources/overlay-icon@3x.png similarity index 100% rename from src/services/overlay-icon@3x.png rename to build-resources/overlay-icon@3x.png diff --git a/src/services/overlay-icon@4x.png b/build-resources/overlay-icon@4x.png similarity index 100% rename from src/services/overlay-icon@4x.png rename to build-resources/overlay-icon@4x.png diff --git a/src/services/overlay-icon@5x.png b/build-resources/overlay-icon@5x.png similarity index 100% rename from src/services/overlay-icon@5x.png rename to build-resources/overlay-icon@5x.png diff --git a/src/services/constants/paths.ts b/src/services/constants/paths.ts index d0ec5d26..c492e3c6 100644 --- a/src/services/constants/paths.ts +++ b/src/services/constants/paths.ts @@ -5,13 +5,14 @@ import os from 'os'; const isMac = process.platform === 'darwin'; const sourcePath = path.resolve(__dirname, '..', '..'); +export const buildResourcePath = path.resolve(sourcePath, '..', 'build-resources'); // FIXME: change to electron forge path const REACT_PATH = isDev ? 'http://localhost:3000' : `file://${path.resolve(__dirname, '..', '..', 'build', 'index.html')}`; // .app/Contents/Resources/wiki/ const TIDDLYWIKI_TEMPLATE_FOLDER_PATH = isDev ? path.resolve(sourcePath, '..', 'template', 'wiki') : path.resolve(process.resourcesPath, '..', 'wiki'); const TIDDLERS_PATH = 'tiddlers'; -const ICON_PATH = isDev ? path.resolve(sourcePath, 'icon.png') : `file://${path.resolve(__dirname, '..', 'icon.png')}`; +const ICON_PATH = isDev ? path.resolve(buildResourcePath, 'icon.png') : `file://${path.resolve(__dirname, '..', 'icon.png')}`; const CHROME_ERROR_PATH = 'chrome-error://chromewebdata/'; const DESKTOP_PATH = path.join(os.homedir(), 'Desktop'); const LOG_FOLDER = isDev diff --git a/src/services/icon.png b/src/services/icon.png deleted file mode 100644 index ac7251cefe98a1cce9a7ee6a95863b4c801f38c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2628 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEvjCx_$agi_TdVRybv7s)Sd=DHEo)ZwCiR9AJWMMO)I zcJ8bo-Q0;QmndFISbrgEmYI<2lC4vU9JRETUJ>%v&3!2*Ao#k2VH`G`?T_PT>{LQeS0*YyWDbcCbk>nlM#9 zP%2=2!FG;0yzZF(TzP33>ki%>qBA&nR&HAD?O^@EYJ(~lbMS0Q zu|Q*1jocy!=>mHL(To+L_YJo&XE&Y=l!#g3+Fl#hQ2W91K(fPy=aN4kntTxX5ECzY zQJqyISM7FZ&-zW>d;ZQ{{playgTNz7pPshFuJB^?nyvQ0{ebNc-+jzCxMdi6{{EMF z^uwX%h`|C@3Dz3E84VFr{QvK6_`S%$;^AKbF;Q)YOk=SdT@{~oBp$dvn3^?rdg-#< z12IQtrfDwb{t+g^wm!tj&6O+Q)*1IX0m)q+ayNP-j?c?FYn1xN@Bs6HnuLO5Km3{c zfAzgx%doVUEo{<0uHOx+ff8@NzTGUPk?VG|^3FWPZJZn1x}W~~9Mo{>8K=W?lX6Dy z#`#x^j@mxE(iV~I-F1R5A$hY&tXaC+eoFH3Y_@Ypj|bmc!?N%Fj;H(w!Y37LTW-+EJ;uy$ zWo5x~=B&Z*(i3vEVVRr7J0>WsNL$}|DUGA(U4X}u8$33AI{lrtY&~pgYI*aybR2Yc zu&atK*itDxW73Wq#ve5zZ0v_mwd5Nor z$JZAuN_5A^~G3z61?mD#Vd8}pa<+)esz5xqm8)p7ZyG{p~Wd*?oSdce8kDg!5X zz^xjGmnYvDJaP!~y{YxCJoByC?TJ^Vo8`kV@V;@}QxPqBGdq^gFLN`a;cpA8M(xE0 zFPdhQO)(2Dkk6i8vFEs5`lp#EPW={A?LAO(%HD=!?XyEhEot40C3md;;D5*FU2(~W zJQ242-)9`q;|FQsV+&ER2K_ie&W*O%I$^!Q{#!oy82$>L6qzmr%E zHZlE-N}720U{K;@Z9VR}6P&j#Q@K@pL*zwbhS<*&*ElT`wr+i*v*+~=Gd=d2V;2in zG;!)E&RzUkzvuX0spEwQ3UyCBTsGz3JL6ThX7zX7x5*cz&ny!+t_|hOC^9Lj;ImSE z`mgbT@3%V>+Kl_M4;Ssw%u7#sdO*T|=f495DzE3X<#o+mA@`)`q$zMVgDNL938&p|V_!o8QC2`0#VFjslJyYrFtwFLGIrhnbDyWjhlFq%g( zEfLq5Y$Nnz<>P&eo2Qs5H`c32eL8S`k-?47ycFr0J?>vam9`!@94PU}!rLM9Gha}$ z!0|OQPAPNzOr8j=o!0u4=h-89o2ydR4W^My+ZG)yeQ|sGX1Sv6iwmc{=UHT6(KSKq z@7fl7rON$9GgrKvlJ{1Pt2vmp{oAa^%PdoqUdMGDS|Gba@Wd(kD?-wZvrm6$WIaIoy(!K>t?*EdC)rJOriF4_pn`@3-9W$|Du>= z!CrIe`)=uqk7E^5)lReBt-VQ#ch8g#UNa@lH%#jsFXb3dxU{wN%iD*J zMgLFU)#TPLwEvU$;OCR0Taw=t-Oy*SGBE za&3q{m*Z9ZTH(&YUrnkvgm3U3D4(eEMDT&eA$6I#)E)NI1#qfjqQc|SNn3@{$#qnkiZTe*3hU zaq0!>B5ZM~wyYt)FJ1{yc@W`}I^~Dd1K$VUBIm{DJI#3%yUl+>(4UJx>P@yXuZ**g zJQ&lkuingD@MiVzAi2rQf9*NM`NU)2&RYkwzdn4D>+$8rt?U163b_LR__KXEe9~f# z(lSNYj>{|0FW>xog6#AE&o4)cPcfUW`1|wP11Wdn=l*!0bcknf*OYtmYtQm@ujpoa zw4udKTj+ee`^Soy6+-McIjtrZALdk%F6FR@;1vzy{Ksx{*!aKmo|sey1_lOCS3j3^ HP6 { app.badgeCount = count; if (process.platform === 'win32') { if (count > 0) { - browserWindow.setOverlayIcon(path.resolve(__dirname, '..', 'overlay-icon.png'), `You have ${count} new messages.`); + browserWindow.setOverlayIcon(path.resolve(buildResourcePath, 'overlay-icon.png'), `You have ${count} new messages.`); } else { browserWindow.setOverlayIcon(null, ''); } diff --git a/src/services/windows/main.ts b/src/services/windows/main.ts index 08ee488b..bc2ea51c 100644 --- a/src/services/windows/main.ts +++ b/src/services/windows/main.ts @@ -3,7 +3,7 @@ import windowStateKeeper from 'electron-window-state'; import { menubar, Menubar } from 'menubar'; import path from 'path'; -import { REACT_PATH, isDev as isDevelopment } from '../constants/paths'; +import { REACT_PATH, isDev as isDevelopment, buildResourcePath } from '@/services/constants/paths'; import { getPreference } from '../libs/preferences'; import formatBytes from '../libs/format-bytes'; @@ -32,7 +32,7 @@ export const createAsync = async (): Promise => // https://github.com/atomery/translatium/issues/164 const tray = new Tray(nativeImage.createEmpty()); // icon template is not supported on Windows & Linux - const iconPath = path.resolve(__dirname, '..', process.platform === 'darwin' ? 'menubarTemplate.png' : 'menubar.png'); + const iconPath = path.resolve(buildResourcePath, process.platform === 'darwin' ? 'menubarTemplate.png' : 'menubar.png'); tray.setImage(iconPath); menuBar = menubar({ @@ -159,7 +159,7 @@ export const createAsync = async (): Promise => show: false, // manually set dock icon for AppImage // Snap icon is set correct already so no need to intervene - icon: process.platform === 'linux' && process.env.SNAP == undefined ? path.resolve(__dirname, '..', 'icon.png') : undefined, + icon: process.platform === 'linux' && process.env.SNAP == undefined ? path.resolve(buildResourcePath, 'icon.png') : undefined, webPreferences: { nodeIntegration: false, enableRemoteModule: true,