Skip to content

refactor: icon path fn #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
Merged

refactor: icon path fn #1559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions src/electron/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,14 @@ const { autoUpdater } = require('electron-updater');
const { updateElectronApp } = require('update-electron-app');

log.initialize();

// Tray Icons
const idleIcon = path.resolve(
`${__dirname}/../../assets/images/tray-idleTemplate.png`,
);
const idleUpdateAvailableIcon = path.resolve(
`${__dirname}/../../assets/images/tray-idle-update.png`,
);
const idleAlternateIcon = path.resolve(
`${__dirname}/../../assets/images/tray-idle-white.png`,
);
const idleAlternateUpdateAvailableIcon = path.resolve(
`${__dirname}/../../assets/images/tray-idle-white-update.png`,
);
const activeIcon = path.resolve(
`${__dirname}/../../assets/images/tray-active.png`,
);
const activeUpdateAvailableIcon = path.resolve(
`${__dirname}/../../assets/images/tray-active-update.png`,
);
const idleIcon = getIconPath('tray-idleTemplate.png');
const idleUpdateIcon = getIconPath('tray-idle-update.png');
const idleAlternateIcon = getIconPath('tray-idle-white.png');
const idleAlternateUpdateIcon = getIconPath('tray-idle-white-update.png');
const activeIcon = getIconPath('tray-active.png');
const activeUpdateIcon = getIconPath('tray-active-update.png');

const browserWindowOpts = {
width: 500,
Expand Down Expand Up @@ -192,9 +181,7 @@ app.whenReady().then(async () => {
ipc.on('gitify:icon-active', () => {
if (!mb.tray.isDestroyed()) {
mb.tray.setImage(
updateAvailableMenuItem.visible
? activeUpdateAvailableIcon
: activeIcon,
updateAvailableMenuItem.visible ? activeUpdateIcon : activeIcon,
);
}
});
Expand All @@ -204,12 +191,12 @@ app.whenReady().then(async () => {
if (shouldUseAlternateIdleIcon) {
mb.tray.setImage(
updateAvailableMenuItem.visible
? idleAlternateUpdateAvailableIcon
? idleAlternateUpdateIcon
: idleAlternateIcon,
);
} else {
mb.tray.setImage(
updateAvailableMenuItem.visible ? idleUpdateAvailableIcon : idleIcon,
updateAvailableMenuItem.visible ? idleUpdateIcon : idleIcon,
);
}
}
Expand Down Expand Up @@ -308,3 +295,7 @@ function resetApp() {
mb.app.quit();
}
}

function getIconPath(iconName) {
return path.resolve(__dirname, '../../assets/images', iconName);
}