Merge pull request #7 from PascalLuginbuehl/features

Load accent color, dev tab, better search in autocomplete, quality of life improvements

Author: PascalLuginbuehl

README.md

@@ -13,7 +13,9 @@ For easy configuration, entities can be added, sorted, and edited using a GUI.
 
 # Installation
 - Download from the [Releases page](https://github.com/PascalLuginbuehl/home-assistant-tray-menu/releases) and run the installer EXE.
-- Once installation has finished, you should see the Home Assistant icon in your system tray.
+- A "Windows protected your PC" message will pop up, click "More info" and then "Run anyway" This is a precaution from Windows because this application is not signed.
+- Once the installation is complete, you should see the Home Assistant icon in your system tray.
+- Right-click on the tray icon to open settings
 
 # Stack
 - Built using electron-forge and react

assets/home-assistant-icon-pretty.icns

@@ -4,14 +4,24 @@ import { MakerZIP } from '@electron-forge/maker-zip';
 import { MakerDeb } from '@electron-forge/maker-deb';
 import { MakerRpm } from '@electron-forge/maker-rpm';
 import { WebpackPlugin } from '@electron-forge/plugin-webpack';
-
+import path from "path"
 import { mainConfig } from './webpack.main.config';
 import { rendererConfig } from './webpack.renderer.config';
 
 const config: ForgeConfig = {
-  packagerConfig: {},
+  packagerConfig: {
+    icon: path.resolve(__dirname, "./assets/home-assistant-icon-pretty"),
+  },
   rebuildConfig: {},
-  makers: [new MakerSquirrel({}), new MakerZIP({}, ['darwin']), new MakerRpm({}), new MakerDeb({})],
+  makers: [
+    new MakerSquirrel({
+      iconUrl: "https://raw.githubusercontent.com/pascalluginbuehl/home-assistant-tray-menu/main/assets/home-assistant-icon-pretty.ico",
+      setupIcon: path.resolve(__dirname, "./assets/home-assistant-icon-pretty.ico"),
+    }),
+    new MakerZIP({}, ['darwin']),
+    new MakerRpm({}),
+    new MakerDeb({})
+  ],
   plugins: [
     new WebpackPlugin({
       mainConfig,

assets/home-assistant-icon-pretty.ico

@@ -6,13 +6,17 @@
   },
   "CONNECTION": {
     "TITLE": "API Connection",
-    "LONG_LIVED_ACCESS_TOKEN": "Long Lived Access Token",
+    "LONG_LIVED_ACCESS_TOKEN": "Long-Lived Access Token",
     "LAUNCH_AT_STARTUP": "Launch at startup",
     "LLAT_UNAUTHORIZED": "long lived access token was not authorized on the server",
     "NETWORK_ERROR": "Could not reach server"
   },
   "ENTITIES": {
     "TITLE": "Entities",
     "ADD_ENTITY": "Add entity"
+  },
+  "DEVELOPMENT": {
+    "TITLE": "Development",
+    "KEEP_TRAY_OPEN": "Keep tray open"
   }
 }

assets/home-assistant-icon-pretty.png

@@ -4,6 +4,7 @@ import {
 import createTray from './windows/tray';
 import './ipc-main-handlers';
 import { checkAPIStatusPeriodically } from './hass-api';
+import { showPanel } from './windows/panel-controller';
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 // eslint-disable-next-line global-require
@@ -13,7 +14,24 @@ if (require('electron-squirrel-startup')) {
 
 checkAPIStatusPeriodically();
 
-app.on('ready', () => createTray());
+let panelWindow: BrowserWindow | null = null;
+
+const gotTheLock = app.requestSingleInstanceLock();
+
+if (!gotTheLock) {
+  app.quit();
+} else {
+  app.on('second-instance', () => {
+    if (panelWindow) {
+      showPanel();
+      panelWindow.focus();
+    }
+  });
+
+  app.on('ready', () => {
+    panelWindow = createTray();
+  });
+}
 
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits

assets/home-assistant-icon-pretty@2x.icns

@@ -1,4 +1,4 @@
-import { ipcMain } from 'electron';
+import { ipcMain, systemPreferences } from 'electron';
 import APIUrlStateEnum from './types/api-state-enum';
 import { setIconStatus } from './windows/tray';
 import { baseApiClient, checkAPIUrl, setAxiosParameters } from './hass-api';
@@ -52,3 +52,5 @@ ipcMain.handle('electron-store:set', async (event, key, val) => {
     setAutoLaunch(val.isAutoLaunchEnabled);
   }
 });
+
+ipcMain.handle('system:accent', async () => systemPreferences.getAccentColor());

forge.config.ts

@@ -28,6 +28,7 @@ const contextBridgeApi = {
       serviceData: { entity_id: string } & Record<string, unknown>,
     ): Promise<void> => ipcRenderer.invoke('service:call-action', domain, service, serviceData),
   },
+  getAccentColor: async (): Promise<string> => ipcRenderer.invoke('system:accent'),
 };
 
 export type ContextBridgeApi = typeof contextBridgeApi;