diff --git a/build/generate-tray-icons.ts b/build/generate-tray-icons.ts index 40d70f72e3..4a1952b63d 100644 --- a/build/generate-tray-icons.ts +++ b/build/generate-tray-icons.ts @@ -33,21 +33,12 @@ function getSvgStyling(colouring: "dark" | "light"): string { async function getBaseIconTemplates() { const svgData = await readFile(inputFile, { encoding: "utf-8" }); + const dom = new JSDOM(`${svgData}`); + const root = dom.window.document.body.getElementsByTagName("svg")[0]; - const darkDom = new JSDOM(`${svgData}`); - const darkRoot = darkDom.window.document.body.getElementsByTagName("svg")[0]; + root.innerHTML += getSvgStyling("light"); - darkRoot.innerHTML += getSvgStyling("dark"); - - const lightDom = new JSDOM(`${svgData}`); - const lightRoot = lightDom.window.document.body.getElementsByTagName("svg")[0]; - - lightRoot.innerHTML += getSvgStyling("light"); - - return { - light: lightRoot.outerHTML, - dark: darkRoot.outerHTML, - }; + return root.outerHTML; } async function generateNormalImages(template: string, size: number, name: string) { @@ -154,21 +145,20 @@ async function generateTrayIcons() { console.log("Generating tray icon pngs"); await ensureOutputFoler(); - const baseTemplates = await getBaseIconTemplates(); + const baseTemplate = await getBaseIconTemplates(); const noticeTemplate = await getNoticeSvg(); void noticeTemplate; void generateUpdateAvailableImages; await Promise.all([ - generateNormalImages(baseTemplates.light, size, "trayIconDarkTemplate"), - // generateUpdateAvailableImages(baseTemplates.light, size, "trayIconDarkUpdateAvailableTemplate", noticeTemplate), - generateNormalImages(baseTemplates.dark, size, "trayIconTemplate"), + generateNormalImages(baseTemplate, size, "trayIconTemplate"), + // generateUpdateAvailableImages(baseTemplate, size, "trayIconDarkUpdateAvailableTemplate", noticeTemplate), ]); console.warn("Did not update:", [ - "trayIconDarkUpdateAvailableTemplate.png", - "trayIconDarkUpdateAvailableTemplate@2x.png", + "trayIconUpdateAvailableTemplate.png", + "trayIconUpdateAvailableTemplate@2x.png", ]); console.log("Generated all images"); } catch (error) { diff --git a/build/tray/trayIconDarkTemplate.png b/build/tray/trayIconDarkTemplate.png deleted file mode 100644 index 0e1c5d6e8e..0000000000 Binary files a/build/tray/trayIconDarkTemplate.png and /dev/null differ diff --git a/build/tray/trayIconDarkTemplate@2x.png b/build/tray/trayIconDarkTemplate@2x.png deleted file mode 100644 index 553a8ec373..0000000000 Binary files a/build/tray/trayIconDarkTemplate@2x.png and /dev/null differ diff --git a/build/tray/trayIconTemplate.png b/build/tray/trayIconTemplate.png index 63f2eb1895..0e1c5d6e8e 100644 Binary files a/build/tray/trayIconTemplate.png and b/build/tray/trayIconTemplate.png differ diff --git a/build/tray/trayIconTemplate@2x.png b/build/tray/trayIconTemplate@2x.png index c5dcfa9e15..553a8ec373 100644 Binary files a/build/tray/trayIconTemplate@2x.png and b/build/tray/trayIconTemplate@2x.png differ diff --git a/build/tray/trayIconDarkUpdateAvailableTemplate.png b/build/tray/trayIconUpdateAvailableTemplate.png similarity index 100% rename from build/tray/trayIconDarkUpdateAvailableTemplate.png rename to build/tray/trayIconUpdateAvailableTemplate.png diff --git a/build/tray/trayIconDarkUpdateAvailableTemplate@2x.png b/build/tray/trayIconUpdateAvailableTemplate@2x.png similarity index 100% rename from build/tray/trayIconDarkUpdateAvailableTemplate@2x.png rename to build/tray/trayIconUpdateAvailableTemplate@2x.png