From ac5c57455283824674cbf8e7afb4d220f91d130e Mon Sep 17 00:00:00 2001 From: Dawid Janiga Date: Thu, 22 Apr 2021 00:20:09 +0200 Subject: [PATCH] feat(icon): add green icon on break --- packages/app/package.json | 18 ++++---------- packages/app/public/electron.js | 22 ++++++++++++++---- packages/app/public/icon-green-small.png | Bin 0 -> 1429 bytes packages/app/public/icon-red-small.png | Bin 0 -> 1528 bytes packages/app/public/icon-small.png | Bin 636 -> 0 bytes packages/app/public/icon.png | Bin 15633 -> 5200 bytes packages/app/src/core/mediator.ts | 16 +++++++++---- packages/app/src/features/Home.tsx | 2 +- .../__snapshots__/Home.test.tsx.snap | 2 +- 9 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 packages/app/public/icon-green-small.png create mode 100644 packages/app/public/icon-red-small.png delete mode 100644 packages/app/public/icon-small.png diff --git a/packages/app/package.json b/packages/app/package.json index cb163a7..28c1596 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -46,7 +46,7 @@ "test": "jest --watch", "test:ci": "jest", "release": "dotenv release-it -VV", - "dev": "concurrently \"BROWSER=none PORT=3007 yarn start\" \"wait-on http://localhost:3007 && electron . --inspect-brk\"" + "dev": "concurrently \"BROWSER=none PORT=3007 yarn start\" \"wait-on http://localhost:3007 && electron . \"" }, "build": { "appId": "com.dawidjaniga.pomoguru", @@ -57,10 +57,7 @@ "mac": { "category": "public.app-category.productivity" }, - "files": [ - "build/**/*", - "node_modules/**/*" - ], + "files": ["build/**/*", "node_modules/**/*"], "directories": { "buildResources": "build" }, @@ -71,17 +68,10 @@ "url": "git+https://github.com/dawidjaniga/pomoguru.git" }, "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] + "extends": ["react-app", "react-app/jest"] }, "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], + "production": [">0.2%", "not dead", "not op_mini all"], "development": [ "last 1 chrome version", "last 1 firefox version", diff --git a/packages/app/public/electron.js b/packages/app/public/electron.js index c7e1df8..09e12af 100644 --- a/packages/app/public/electron.js +++ b/packages/app/public/electron.js @@ -26,6 +26,14 @@ ipcMain.on('set-timer', (event, timeLeft) => { } }) +ipcMain.on('set-icon', (event, icon) => { + if (tray) { + const iconPath = getIconPath(icon) + console.log('Setting icon: ', iconPath) + tray.setImage(iconPath) + } +}) + ipcMain.on('checkUpdateClicked', () => { if (isDev) { autoUpdater.checkForUpdates() @@ -64,7 +72,7 @@ function createWindow () { : `file://${path.join(__dirname, '../build/index.html')}` ) - tray = new Tray(path.join(__dirname, getAppIconPath())) + tray = new Tray(getIconPath('icon-red-small.png')) tray.on('right-click', toggleWindow) tray.on('double-click', toggleWindow) @@ -121,17 +129,21 @@ app.on('window-all-closed', () => { }) app.on('active', () => { - if (BrowserWin.getAllWindows().length === 0) { + if (BrowserWindow.getAllWindows().length === 0) { createWindow() } }) app.whenReady().then(createWindow) -function getAppIconPath () { +function getIconPath (icon) { + let iconPath + if (isDev) { - return '../public/icon-small.png' + iconPath = '../public/' + icon } else { - return '../build/icon-small.png' + iconPath = '../build/' + icon } + + return path.join(__dirname, iconPath) } diff --git a/packages/app/public/icon-green-small.png b/packages/app/public/icon-green-small.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd0cd1f4814108a7748161d14d2c40bd3b62e02 GIT binary patch literal 1429 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 sj0{e8;ofzz(C49!vFvP literal 0 HcmV?d00001 diff --git a/packages/app/public/icon-small.png b/packages/app/public/icon-small.png deleted file mode 100644 index bf675d3ee43e2072fe7491f850a1943a13f411da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 636 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 Hu0mjf-?auq literal 15633 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 diff --git a/packages/app/src/core/mediator.ts b/packages/app/src/core/mediator.ts index b2693e1..15d91e1 100644 --- a/packages/app/src/core/mediator.ts +++ b/packages/app/src/core/mediator.ts @@ -33,17 +33,20 @@ export function useMediator () { }, onStartClick () { phase = Phase.focus + slack.goIntoFocus(focusTimeLeftMinutes) + ipcRenderer.send('set-icon', 'icon-red-small.png') start() setPhase(Phase.focus) - slack.goIntoFocus(focusTimeLeftMinutes) notifications.notify({ body: 'All set! Focus time is on' }) }, onPauseClick () { phase = Phase.break + ipcRenderer.send('set-icon', 'icon-green-small.png') + pause() setPhase(Phase.idle) @@ -55,6 +58,8 @@ export function useMediator () { }, onStopClick () { phase = Phase.break + ipcRenderer.send('set-icon', 'icon-green-small.png') + stop() setPhase(Phase.idle) @@ -66,9 +71,11 @@ export function useMediator () { }, onBreakPhaseEnd () { phase = Phase.focus - setTimeLeft(focusPhaseDurationSeconds) - slack.goIntoFocus(focusTimeLeftMinutes) setPhase(Phase.focus) + slack.goIntoFocus(focusTimeLeftMinutes) + + setTimeLeft(focusPhaseDurationSeconds) + ipcRenderer.send('set-icon', 'icon-red-small.png') notifications.notify({ body: 'All set! Focus time is on' @@ -76,9 +83,10 @@ export function useMediator () { }, onFocusPhaseEnd () { phase = Phase.break - slack.endFocus() setPhase(Phase.break) + slack.endFocus() setTimeLeft(breakPhaseDurationSeconds) + ipcRenderer.send('set-icon', 'icon-green-small.png') notifications.notify({ body: 'Great job! Break time' diff --git a/packages/app/src/features/Home.tsx b/packages/app/src/features/Home.tsx index df48668..e1be63d 100644 --- a/packages/app/src/features/Home.tsx +++ b/packages/app/src/features/Home.tsx @@ -43,7 +43,7 @@ export default function Home () { return ( <> - Pomoguru Pomoguru icon + Pomoguru Pomoguru icon {version} diff --git a/packages/app/src/features/__tests__/__snapshots__/Home.test.tsx.snap b/packages/app/src/features/__tests__/__snapshots__/Home.test.tsx.snap index 7a2fcac..0f29406 100644 --- a/packages/app/src/features/__tests__/__snapshots__/Home.test.tsx.snap +++ b/packages/app/src/features/__tests__/__snapshots__/Home.test.tsx.snap @@ -9,7 +9,7 @@ exports[`Home View when Slack is not initialized should show "Connect to Slack" Pomoguru Pomoguru icon