From 86ff7f58bab9e093c1411bb2d4021cb8bad00fa2 Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Sat, 25 May 2024 20:10:24 -0400
Subject: [PATCH 1/2] Keyboard shortcut and button (Cmd/Ctrl + M) for mini mode
 #39

---
 package-lock.json             | 18 ++++++++++++++----
 package.json                  |  1 +
 src/app/components/navbar.tsx | 11 +++++++++++
 src/index.html                |  2 ++
 src/index.ts                  | 29 +++++++++++++++++++++++++++++
 src/preload.ts                |  2 ++
 6 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0118023..6bc2255 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "i": "^0.3.7",
         "npm": "^10.5.1",
         "react": "^18.2.0",
+        "react-bootstrap-icons": "^1.11.4",
         "react-dom": "^18.2.0",
         "sass": "^1.74.1",
         "styled-components": "^5.3.11",
@@ -13339,7 +13340,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14458,7 +14458,6 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -14468,8 +14467,7 @@
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
@@ -14643,6 +14641,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-bootstrap-icons": {
+      "version": "1.11.4",
+      "resolved": "https://registry.npmjs.org/react-bootstrap-icons/-/react-bootstrap-icons-1.11.4.tgz",
+      "integrity": "sha512-lnkOpNEZ/Zr7mNxvjA9efuarCPSgtOuGA55XiRj7ASJnBjb1wEAdtJOd2Aiv9t07r7FLI1IgyZPg9P6jqWD/IA==",
+      "license": "MIT",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.6"
+      }
+    },
     "node_modules/react-dom": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
diff --git a/package.json b/package.json
index b962a50..3a18ecb 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "i": "^0.3.7",
     "npm": "^10.5.1",
     "react": "^18.2.0",
+    "react-bootstrap-icons": "^1.11.4",
     "react-dom": "^18.2.0",
     "sass": "^1.74.1",
     "styled-components": "^5.3.11",
diff --git a/src/app/components/navbar.tsx b/src/app/components/navbar.tsx
index e8b583f..9ecb866 100644
--- a/src/app/components/navbar.tsx
+++ b/src/app/components/navbar.tsx
@@ -11,6 +11,7 @@ import {
 } from "../helpers/CallsignHelper";
 import useUtilStore from "../store/utilStore";
 import { Configuration } from "../../config";
+import { FullscreenExit } from "react-bootstrap-icons";
 
 const Navbar: React.FC = () => {
   const [showModal, setShowModal] = useState(false);
@@ -204,6 +205,16 @@ const Navbar: React.FC = () => {
           onWheel={handleRadioGainMouseWheel}
           value={radioGain}
         ></input>
+        <button
+          className="btn btn-primary m-2 hide-gain-value"
+          style={{ lineHeight: 0, fontSize: "14px" }}
+          onClick={() => void window.api.toggleMiniMode()}
+        >
+          <FullscreenExit
+            title={"Mini mode"}
+            style={{ strokeWidth: "0.5px", stroke: "white" }}
+          />
+        </button>
         {platform === "linux" && (
           <button
             className="btn btn-danger m-2 hide-gain-value"
diff --git a/src/index.html b/src/index.html
index 474f62f..ed09806 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,6 +7,8 @@
       http-equiv="Content-Security-Policy"
       content="script-src 'self' 'unsafe-inline'"
     />
+    <link rel="preload" href="<%=require('./app/assets/fonts/UbuntuMono-R.ttf')%>" as="font" crossorigin="anonymous">
+    <link rel="preload" href="<%=require('./app/assets/fonts/UbuntuMono-B.ttf')%>" as="font" crossorigin="anonymous">
   </head>
 
   <body>
diff --git a/src/index.ts b/src/index.ts
index 7460ea4..aff509f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -28,6 +28,7 @@ let version: string;
 let mainWindow: BrowserWindow;
 
 const defaultWindowSize = { width: 800, height: 660 };
+const savedLastWindowSize = { width: 800, height: 660 };
 
 let currentConfiguration: Configuration = {
   audioApi: -1,
@@ -58,6 +59,19 @@ const setAudioSettings = () => {
   TrackAudioAfv.SetHardwareType(currentConfiguration.hardwareType || 0);
 };
 
+const toggleMiniMode = () => {
+  if (
+    mainWindow.getSize()[0] == mainWindow.getMinimumSize()[0] &&
+    mainWindow.getSize()[1] == mainWindow.getMinimumSize()[1]
+  ) {
+    mainWindow.setSize(savedLastWindowSize.width, savedLastWindowSize.height);
+    return;
+  }
+  savedLastWindowSize.width = mainWindow.getSize()[0];
+  savedLastWindowSize.height = mainWindow.getSize()[1];
+  mainWindow.setSize(1, 1);
+};
+
 const restoreWindowBounds = (win: BrowserWindow) => {
   const savedBounds = store.get("bounds");
   const boundsRectangle = savedBounds as Rectangle;
@@ -130,6 +144,17 @@ const createWindow = (): void => {
 
     store.set("bounds", mainWindow.getBounds());
   });
+
+  mainWindow.webContents.on("before-input-event", (e, input) => {
+    if (
+      input.key.toLowerCase() === "m" &&
+      input.type === "keyDown" &&
+      (input.control || input.meta)
+    ) {
+      toggleMiniMode();
+      e.preventDefault();
+    }
+  });
 };
 
 // This method will be called when Electron has finished
@@ -261,6 +286,10 @@ ipcMain.handle("set-audio-api", (_, apiId: number) => {
   saveConfig();
 });
 
+ipcMain.handle("toggle-mini-mode", () => {
+  toggleMiniMode();
+});
+
 //
 // AFV login settings
 //
diff --git a/src/preload.ts b/src/preload.ts
index 56c34b6..428f581 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -89,6 +89,8 @@ const IElectronAPI = {
 
   RequestPttKeyName: () => ipcRenderer.invoke("request-ptt-key-name"),
 
+  toggleMiniMode: () => ipcRenderer.invoke("toggle-mini-mode"),
+
   dialog: (
     type: "none" | "info" | "error" | "question" | "warning",
     title: string,

From 2c0c17a94df52116b954fd8e44a56245817595d0 Mon Sep 17 00:00:00 2001
From: Pierre Ferran <pierr3@users.noreply.github.com>
Date: Sat, 25 May 2024 20:29:19 -0400
Subject: [PATCH 2/2] Delete shortcut for radio #40

---
 src/app/components/radio/radio.tsx | 57 ++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/app/components/radio/radio.tsx b/src/app/components/radio/radio.tsx
index 9058ac6..344d143 100644
--- a/src/app/components/radio/radio.tsx
+++ b/src/app/components/radio/radio.tsx
@@ -18,6 +18,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     setOnSpeaker,
     selectRadio,
     removeRadio,
+    setPendingDeletion,
   ] = useRadioState((state) => [
     state.setRx,
     state.setTx,
@@ -26,6 +27,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
     state.setOnSpeaker,
     state.selectRadio,
     state.removeRadio,
+    state.setPendingDeletion,
   ]);
 
   const isATC = useSessionStore((state) => state.isAtc);
@@ -48,7 +50,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         newState ? radio.tx : false,
         newState ? radio.xc : false,
         radio.onSpeaker,
-        newState ? radio.crossCoupleAcross : false,
+        newState ? radio.crossCoupleAcross : false
       )
       .then((ret) => {
         if (!ret) {
@@ -61,7 +63,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         setXc(radio.frequency, newState ? radio.xc : false);
         setCrossCoupleAcross(
           radio.frequency,
-          newState ? radio.crossCoupleAcross : false,
+          newState ? radio.crossCoupleAcross : false
         );
       })
       .catch((err: unknown) => {
@@ -79,7 +81,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         newState,
         !newState ? false : radio.xc, // If tx is false, xc must be false
         radio.onSpeaker,
-        !newState ? false : radio.crossCoupleAcross, // If tx is false, crossCoupleAcross must be false
+        !newState ? false : radio.crossCoupleAcross // If tx is false, crossCoupleAcross must be false
       )
       .then((ret) => {
         if (!ret) {
@@ -91,7 +93,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         setXc(radio.frequency, !newState ? false : radio.xc);
         setCrossCoupleAcross(
           radio.frequency,
-          !newState ? false : radio.crossCoupleAcross,
+          !newState ? false : radio.crossCoupleAcross
         );
       })
       .catch((err: unknown) => {
@@ -108,7 +110,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         newState ? true : radio.tx, // If xc is true, tx must be true
         newState,
         radio.onSpeaker,
-        false, // If xc is true, crossCoupleAcross must be false
+        false // If xc is true, crossCoupleAcross must be false
       )
       .then((ret) => {
         if (!ret) {
@@ -134,7 +136,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         newState ? true : radio.tx, // If crossCoupleAcross is true, tx must be true
         false, // If crossCoupleAcross is true, xc must be false
         radio.onSpeaker,
-        newState,
+        newState
       )
       .then((ret) => {
         if (!ret) {
@@ -160,7 +162,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
         radio.tx,
         radio.xc,
         newState,
-        radio.crossCoupleAcross,
+        radio.crossCoupleAcross
       )
       .then((ret) => {
         if (!ret) {
@@ -175,6 +177,33 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
       });
   };
 
+  const awaitEndOfRxForDeletion = (frequency: number): void => {
+    const interval = setInterval(
+      (frequency: number) => {
+        const radio = useRadioState
+          .getState()
+          .radios.find((r) => r.frequency === frequency);
+        if (!radio) {
+          clearInterval(interval);
+          return;
+        }
+
+        if (!radio.currentlyRx && !radio.currentlyTx) {
+          void window.api.removeFrequency(radio.frequency);
+          removeRadio(radio.frequency);
+          clearInterval(interval);
+        }
+      },
+      60,
+      frequency
+    );
+
+    // Clear the interval after 5 seconds
+    setTimeout(() => {
+      clearInterval(interval);
+    }, 10000);
+  };
+
   return (
     <>
       <div className="col-4 radio">
@@ -183,6 +212,12 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
             className="btn btn-no-interact"
             style={{ height: "100%", marginBottom: "4%" }}
             onClick={clickRadioHeader}
+            onKeyDown={(e) => {
+              if (e.key === "Delete" || e.key === "Backspace") {
+                awaitEndOfRxForDeletion(radio.frequency);
+                setPendingDeletion(radio.frequency, true);
+              }
+            }}
           >
             {radio.humanFrequency}
             <br />
@@ -193,7 +228,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
               "btn",
               !radio.xc && !radio.crossCoupleAcross && "btn-primary",
               radio.xc && "btn-success",
-              radio.crossCoupleAcross && "btn-warning",
+              radio.crossCoupleAcross && "btn-warning"
             )}
             style={{ width: "45%", height: "100%", marginTop: "4%" }}
             onClick={clickXc}
@@ -206,7 +241,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
             className={clsx(
               "btn",
               !radio.onSpeaker && "btn-primary",
-              radio.onSpeaker && "btn-success",
+              radio.onSpeaker && "btn-success"
             )}
             style={{
               width: "45%",
@@ -232,7 +267,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
               "btn",
               !radio.rx && "btn-primary",
               radio.rx && radio.currentlyRx && "btn-warning",
-              radio.rx && !radio.currentlyRx && "btn-success",
+              radio.rx && !radio.currentlyRx && "btn-success"
             )}
             style={{ width: "100%", height: "100%" }}
             onClick={clickRx}
@@ -244,7 +279,7 @@ const Radio: React.FC<RadioProps> = ({ radio }) => {
               "btn",
               !radio.tx && "btn-primary",
               radio.tx && radio.currentlyTx && "btn-warning",
-              radio.tx && !radio.currentlyTx && "btn-success",
+              radio.tx && !radio.currentlyTx && "btn-success"
             )}
             style={{ width: "100%", height: "100%", marginTop: "8%" }}
             onClick={clickTx}