testing tray

CHANGELOG.md

@@ -5,30 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.3.1] - 2021-06-17
-
-### Fixed
-
-- Pause on Mic/Camera was not working correctly
-
-## [1.3.0] - 2021-06-10
-
-### Added
-
-- [macOS] Pause on Mic/Camera
-
-## [1.2.0] - 2021-06-01
-
-### Added
-
-- Progress bar
-
-## [1.1.2] - 2021-05-31
-
-### Fixed
-
-- Bug with update window when banner is currently open
-
 ## [1.1.1] - 2021-05-28
 
 ### Added

package.json

@@ -11,7 +11,7 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.3.1",
+  "version": "1.1.1",
   "main": "./dist/back/index.js",
   "scripts": {
     "start": "electron .",
@@ -23,8 +23,7 @@
     "build": "run-s build:*",
     "pack": "electron-builder -mwl",
     "pack:dev": "electron-builder -m dir && open ./out/mac/UnPixel.app",
-    "dist": "run-s clean build pack",
+    "dist": "rm -rf .parcel-cache dist && run-s build pack"
-    "clean": "rm -rf .parcel-cache dist out"
   },
   "browserslist": [
     "last 2 Chrome versions"
@@ -60,10 +59,10 @@
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "@types/semver": "^7.3.4",
-    "electron": "^11",
+    "electron": "^12.0.0",
     "electron-builder": "^22.10.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "^2.0.0-beta.3.1",
+    "parcel": "next",
     "postcss": "^8.2.10",
     "typescript": "^4.2.3"
   }

src/back/banner.ts

@@ -1,11 +1,13 @@
 import { join } from 'path'
 import os from 'os'
 import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron'
+import dayjs from 'dayjs'
+import logger from 'electron-log'
+import ms from 'ms'
 
 import { DEV } from '.'
 import Settings from './settings'
 import TrayUtility from './tray'
-import { InputDevicesStatus } from './utils'
 
 export default class Banner {
   static interval: ReturnType<typeof setInterval>
@@ -20,21 +22,18 @@ export default class Banner {
     })
   }
 
-  static shouldShow(): boolean {
-    const [paused, interval] = Settings.getStatus()
-    if (paused || interval > 1000) return false
-    if (InputDevicesStatus.areCameraOrMicrophoneActive()) return false
-    return true
-  }
-
   static check() {
     TrayUtility.build()
-    if (Banner.shouldShow()) Banner.open()
+    const [paused, interval] = Settings.getStatus()
+    if (!paused && interval < 1000) {
+      Banner.open()
+    }
   }
 
   static open() {
     if (this.window) return
 
+    logger.debug('Showing banner')
     const options: BrowserWindowConstructorOptions = {
       frame: false,
       webPreferences: {

src/back/index.ts

@@ -5,7 +5,6 @@ import TrayUtility from './tray'
 import Settings from './settings'
 import Banner from './banner'
 import Updater from './updater'
-import { InputDevicesStatus } from './utils'
 
 export const DEV = !app.isPackaged
 
@@ -28,7 +27,6 @@ app
     Settings.init()
     Banner.init()
     Updater.init()
-    InputDevicesStatus.init()
     logger.log('Done')
   })
   .catch((e) => {

src/back/settings.ts

@@ -19,7 +19,6 @@ const defaults = {
   lastRun: 0,
   autoClose: false,
   volume: 100,
-  skipOnCameraOrMic: true,
 }
 export type SettingKeys = keyof typeof defaults
 const IntNormalizer = (x: any) => parseInt(x)
@@ -32,7 +31,6 @@ const normalizers: Record<SettingKeys, (x: any) => any> = {
   paused: IntNormalizer,
   lastRun: IntNormalizer,
   volume: IntNormalizer,
-  skipOnCameraOrMic: BoolNormalizer,
 }
 
 export default class Settings {
@@ -68,7 +66,7 @@ export default class Settings {
     if (this.win) return
     this.win = new BrowserWindow({
       width: 400,
-      height: 690,
+      height: 630,
       center: true,
       resizable: false,
       webPreferences: {

src/back/tray.ts

@@ -4,15 +4,13 @@ import ms from 'ms'
 
 import Banner from './banner'
 import Settings from './settings'
-import { InputDevicesStatus } from './utils'
 
 export default class TrayUtility {
   static tray: Tray | null = null
 
   static build() {
     const [paused, interval] = Settings.getStatus()
-    let status = paused ? `Paused for: ${ms(interval)}` : `Next break: ${ms(interval)}`
+    const status = paused ? `Paused for: ${ms(interval)}` : `Next break: ${ms(interval)}`
-    if (InputDevicesStatus.areCameraOrMicrophoneActive()) status = `Paused: Mic/Camera Active`
 
     const template: Parameters<typeof Menu['buildFromTemplate']>[0] = [
       { label: status, type: 'normal', enabled: false },
@@ -62,11 +60,11 @@ export default class TrayUtility {
 
   static init() {
     if (!this.tray) {
-      const file = path.join(__dirname, '../../assets/tray.png')
+      const file = path.join(__dirname, '../../assets/trayTemplate.png')
-      const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
+      // const resized = nativeImage.createFromPath(file).resize({ width: 24, height: 24 })
-      resized.setTemplateImage(true)
+      // resized.setTemplateImage(true)
-      resized.isMacTemplateImage = true
+      // resized.isMacTemplateImage = true
-      this.tray = new Tray(resized)
+      this.tray = new Tray(file)
       this.build()
     }
   }

src/back/updater.ts

@@ -4,7 +4,6 @@ import logger from 'electron-log'
 import { dialog, shell } from 'electron'
 
 import pkg from '../../package.json'
-import Banner from './banner'
 
 const current = semver.coerce(pkg.version)
 const url = 'https://api.github.com/repos/cupcakearmy/unpixel/tags'
@@ -26,9 +25,7 @@ export default class Updater {
     if (!current) throw new Error('Could not determine current version')
     if (semver.lt(current, latest)) {
       logger.info('New version available')
-      Banner.close()
       dialog
-        // @ts-ignore
         .showMessageBox(null, {
           title: 'Update available',
           message: 'A newer version is available, please download.',
@@ -38,6 +35,7 @@ export default class Updater {
         .then(({ response }) => {
           if (response === 0) {
             shell.openExternal('https://github.com/cupcakearmy/unpixel/releases')
+            process.exit(0)
           }
         })
     } else {

src/back/utils.ts

@@ -1,50 +0,0 @@
-import cp from 'child_process'
-import { promisify } from 'util'
-
-import Settings from './settings'
-
-const exec = promisify(cp.exec)
-
-export async function isCameraActive(): Promise<boolean> {
-  // Not reliable
-  if (process.platform === 'darwin') {
-    // Check number of processes using the camera
-    const out = await exec(`lsof -n | grep "AppleCamera"`)
-    const processesUsingCamera = out.stdout.trim().split('\n').length
-    return processesUsingCamera > 1 // One is the apple daemon that is always active
-  }
-  return false
-}
-
-export async function isMicrophoneActive(): Promise<boolean> {
-  if (process.platform === 'darwin') {
-    const out = await exec(`ioreg -c AppleHDAEngineInput | grep "IOAudioEngineState"`)
-    const parsed = parseInt(out.stdout.trim().replace(/[^\d]/gim, ''))
-    return parsed > 0
-  }
-  return false
-}
-
-export class InputDevicesStatus {
-  static status = {
-    mic: false,
-    camera: false,
-  }
-
-  static update() {
-    // TODO: Update electron version as soon as issue is resolved https://github.com/electron/electron/issues/26143
-    isMicrophoneActive().then((result) => (InputDevicesStatus.status.mic = result))
-    isCameraActive().then((result) => (InputDevicesStatus.status.camera = result))
-  }
-
-  static init() {
-    setInterval(InputDevicesStatus.update, 2000)
-  }
-
-  static areCameraOrMicrophoneActive(): boolean {
-    if (Settings.load('skipOnCameraOrMic')) {
-      return InputDevicesStatus.status.mic
-    }
-    return false
-  }
-}

src/front/banner/index.css

@@ -19,6 +19,11 @@ main {
   align-items: center;
 }
 
+h1 {
+  border-bottom: 0.5em solid currentColor;
+  padding-bottom: 0.15em;
+}
+
 .countdown {
   font-size: min(8rem, 25vh);
 }
@@ -53,16 +58,3 @@ button {
 button:hover {
   background-color: #2c2cce;
 }
-
-.progress {
-  width: 100%;
-  height: 3rem;
-  border: 0.125rem solid currentColor;
-}
-
-.progress > div {
-  background-color: currentColor;
-  height: 100%;
-  width: 100%;
-  transition: width ease-out 250ms;
-}

src/front/banner/index.tsx

@@ -30,8 +30,6 @@ const Banner: React.FC = () => {
 
   const [done, setDone] = useState(false)
   const [auto, setAuto] = useState(false)
-  const [progress, setProgress] = useState(100)
-  const [max, setMax] = useState(0)
   const [countdown, setCountdown] = useState<null | number>(null)
 
   const handler = useCallback(
@@ -59,26 +57,16 @@ const Banner: React.FC = () => {
     }
   }, [countdown])
 
-  useEffect(() => {
-    if (countdown !== null) {
-      setProgress((countdown / max) * 100)
-    }
-  }, [countdown, max])
-
   useEffect(() => {
     const autoClose = ipcRenderer.sendSync('load', { key: 'autoClose' })
     setAuto(autoClose)
     const time = ipcRenderer.sendSync('load', { key: 'duration' })
     setCountdown(time)
-    setMax(time)
   }, [])
 
   return (
     <div>
-      <h1 className="ma0 mb3">Look Away</h1>
+      <h1 className="ma0 mb4">Look Away</h1>
-      <div className="progress mb4">
-        <div style={{ width: progress.toFixed(2) + '%' }} />
-      </div>
       <div className="code countdown">{countdown}</div>
       <div className="tile message">
         Look at least <b>6 meters</b> away. <br />

src/front/settings/Field.tsx

@@ -7,7 +7,6 @@ const labels = {
   boot: ['Start on boot'],
   autoClose: ['Close window after countdown'],
   volume: ['Chime Volume'],
-  skipOnCameraOrMic: ['Pause when Mic is active'],
 }
 
 const ranges: Partial<Record<keyof typeof labels, [number, number]>> = {

src/front/settings/Settings.tsx

@@ -1,5 +1,7 @@
 import React from 'react'
 
+import '../base.css'
+
 import Field from './Field'
 
 const Settings = () => {
@@ -13,10 +15,6 @@ const Settings = () => {
           <Field setting="volume" />
           <Field setting="autoClose" />
           <Field setting="boot" />
-          <Field setting="skipOnCameraOrMic" />
-          <small className="ml4" style={{ position: 'relative', top: '-0.5em' }}>
-            experimental & only on <i>macOS</i>
-          </small>
         </fieldset>
       </form>
     </div>

src/front/settings/index.html

@@ -4,7 +4,6 @@
     <meta charset="UTF-8" />
     <title>Settings</title>
     <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-    <link href="../base.css" rel="stylesheet" charset="utf-8" />
   </head>
   <body>
     <main></main>

src/front/settings/index.tsx

@@ -1,6 +1,8 @@
 import React from 'react'
 import { render } from 'react-dom'
 
+import '../base.css'
+
 import About from './About'
 import Settings from './Settings'
 import Footer from './Footer'