Merge pull request #255 from pierr3/hf-alias

Show paired frequencies (HF/VHF)

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
           git submodule update --init --remote backend/extern/afv-native
           git submodule update --init --remote backend/extern/libuiohook
           cd backend/extern/afv-native
-          git checkout modern-event-bus
+          git checkout develop-trackaudio
           cd ../libuiohook
           git checkout unregister-hook-when-debugging
 

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
           git submodule update --init --remote backend/extern/afv-native
           git submodule update --init --remote backend/extern/libuiohook
           cd backend/extern/afv-native
-          git checkout modern-event-bus
+          git checkout develop-trackaudio
           cd ../libuiohook
           git checkout unregister-hook-when-debugging
 

.gitignore

@@ -9,6 +9,8 @@ lerna-debug.log*
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
+build
+
 # Runtime data
 pids
 *.pid

.vscode/launch.json

@@ -29,7 +29,7 @@
     {
       "type": "lldb",
       "request": "attach",
-      "name": "Debug Electron Renderer",
+      "name": "Debug NAPI Backend",
       "pid": "${command:pickProcess}"
     }
   ],

backend/include/Helpers.hpp

@@ -2,6 +2,7 @@
 #include "RadioSimulation.h"
 #include "Shared.hpp"
 
+#include "afv-native/types.h"
 #include <cmath>
 #include <mutex>
 #include <nlohmann/json.hpp>

backend/src/main.cpp

@@ -1,4 +1,5 @@
 #include "LogFactory.h"
+#include "afv-native/afv/dto/Station.h"
 #include "afv-native/afv/dto/StationTransceiver.h"
 #include "afv-native/atcClientWrapper.h"
 #include "afv-native/event.h"
@@ -248,7 +249,7 @@ Napi::Boolean SetFrequencyState(const Napi::CallbackInfo& info)
 
     // SetGuardAndUnicomTransceivers();
 
-    auto result = RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState);
+    auto result = RadioHelper::SetRadioState(MainThreadShared::mApiServer, newState, "");
     return Napi::Boolean::New(info.Env(), result);
 }
 
@@ -518,6 +519,7 @@ void RequestPttKeyName(const Napi::CallbackInfo& info)
 
 void HandleAfvEvents()
 {
+
     afv_native::event::EventBus& event = afv_native::api::getEventBus();
     event.AddHandler<afv_native::VoiceServerConnectedEvent>(
         [&](const afv_native::VoiceServerConnectedEvent& event) {
@@ -554,15 +556,22 @@ void HandleAfvEvents()
                 return;
             }
 
-            const auto& [callsign, frequency] = event.stationData.value();
+            const auto& [callsign, station] = event.stationData.value();
+            const auto frequency = station.frequency;
 
             if (mClient->IsFrequencyActive(frequency)) {
                 PLOGW << "StationDataReceived: Frequency " << frequency
                       << " already active, skipping";
                 return;
             }
 
-            NapiHelpers::callElectron("StationDataReceived", callsign, std::to_string(frequency));
+            // Create a JSON object with the station data
+            nlohmann::json stationJson;
+            stationJson["name"] = station.name;
+            stationJson["frequency"] = station.frequency;
+            stationJson["frequencyAlias"] = station.frequencyAlias;
+
+            NapiHelpers::callElectron("StationDataReceived", callsign, stationJson.dump());
             MainThreadShared::mApiServer->publishStationAdded(
                 callsign, static_cast<int>(frequency));
         });
@@ -571,15 +580,22 @@ void HandleAfvEvents()
         [&](const afv_native::VccsReceivedEvent& event) {
             const auto& stations = event.vccsData;
 
-            for (const auto& [callsign, frequency] : stations) {
+            for (const auto& [callsign, station] : stations) {
+
+                const auto frequency = station.frequency;
 
                 if (mClient->IsFrequencyActive(frequency)) {
                     PLOGW << "VccsReceived: Frequency " << frequency << " already active, skipping";
                     continue;
                 }
 
-                NapiHelpers::callElectron(
-                    "StationDataReceived", callsign, std::to_string(frequency));
+                // Create a JSON object with the station data
+                nlohmann::json stationJson;
+                stationJson["name"] = station.name;
+                stationJson["frequency"] = station.frequency;
+                stationJson["frequencyAlias"] = station.frequencyAlias;
+
+                NapiHelpers::callElectron("StationDataReceived", callsign, stationJson.dump());
                 MainThreadShared::mApiServer->publishStationAdded(
                     callsign, static_cast<int>(frequency));
             }

package.json

@@ -35,8 +35,8 @@
     "electron-log": "^5.2.4",
     "electron-store": "^8.2.0",
     "electron-updater": "^6.3.9",
+    "lucide-react": "^0.469.0",
     "react": "^18.3.1",
-    "react-bootstrap-icons": "^1.11.4",
     "react-dom": "^18.3.1",
     "react-responsive": "^10.0.0",
     "scss": "^0.2.4",

src/renderer/src/components/MiniModeToggleButton.tsx

@@ -1,7 +1,7 @@
 import useRadioState from '@renderer/store/radioStore';
 import useSessionStore from '@renderer/store/sessionStore';
+import { Maximize, Minimize } from 'lucide-react';
 import React, { useCallback } from 'react';
-import { Fullscreen, FullscreenExit } from 'react-bootstrap-icons';
 
 interface MiniModeToggleButtonProps {
   showRestoreButton: boolean;
@@ -29,15 +29,9 @@ const MiniModeToggleButton: React.FC<MiniModeToggleButtonProps> = ({
       disabled={!isConnected && !alwaysEnabled}
     >
       {showRestoreButton ? (
-        <Fullscreen
-          title={'Switch to large mode'}
-          style={{ strokeWidth: '0.5px', stroke: 'white' }}
-        />
+        <Maximize size={15} xlinkTitle="Switch to mini mode" />
       ) : (
-        <FullscreenExit
-          title={'Switch to mini mode'}
-          style={{ strokeWidth: '0.5px', stroke: 'white' }}
-        />
+        <Minimize size={15} xlinkTitle="Switch to mini mode" />
       )}
     </button>
   );

src/renderer/src/components/delete-multiple-radios.tsx

@@ -1,8 +1,8 @@
 import useRadioState from '@renderer/store/radioStore';
 import useSessionStore from '@renderer/store/sessionStore';
 import useUtilStore from '@renderer/store/utilStore';
+import { Trash2 } from 'lucide-react';
 import React from 'react';
-import { TrashFill } from 'react-bootstrap-icons';
 
 const DeleteMultipleRadios: React.FC = () => {
   const [isConnected] = useSessionStore((state) => [state.isConnected]);
@@ -67,7 +67,7 @@ const DeleteMultipleRadios: React.FC = () => {
           handleDeleteRadios();
         }}
       >
-        <TrashFill />
+        <Trash2 size={15} />
       </button>
     </div>
   );

src/renderer/src/components/focusBar.tsx

@@ -12,8 +12,10 @@ const FocusBar = () => {
     state.connectTimestamp
   ]);
   const [pendingRestart] = useUtilStore((state) => [state.pendingRestart]);
-  const isWideScreen = useMediaQuery({ minWidth: '800px' });
-  const isSmallScreen = useMediaQuery({ maxWidth: '490px' });
+  // const isWideScreen = useMediaQuery({ minWidth: '800px' });
+  // const isSmallScreen = useMediaQuery({ maxWidth: '490px' });
+  const isWideScreen = useMediaQuery({ minWidth: '755px' });
+  const isSmallScreen = useMediaQuery({ maxWidth: '615px' });
 
   const restartApp = () => {
     if (isConnected) {

src/renderer/src/components/navbar.tsx

@@ -6,13 +6,13 @@ import Clock from './clock';
 import MiniModeToggleButton from './MiniModeToggleButton';
 import SettingsModal from './settings-modal/settings-modal';
 import TitleBar from './titlebar/TitleBar';
-import { GearFill, PencilSquare, PlusCircleFill } from 'react-bootstrap-icons';
 import SessionStatus from './titlebar/session-status/SessionStatus';
 import useUtilStore from '@renderer/store/utilStore';
 import AddStationModal from './add-station-model/station-modal';
 import DeleteMultipleRadios from './delete-multiple-radios';
 import useRadioState from '@renderer/store/radioStore';
 import RefreshMultipleRadios from './refresh-multiple-radios';
+import { CirclePlus, Settings, SquarePen } from 'lucide-react';
 
 const Navbar: React.FC = () => {
   const [showSettingsModal, setShowSettingsModal] = useState(false);
@@ -63,7 +63,7 @@ const Navbar: React.FC = () => {
                   clearRadiosToBeDeleted();
                 }}
               >
-                <PencilSquare />
+                <SquarePen size={15} />
               </button>
             </div>
           </TitleBar.Element>
@@ -81,14 +81,14 @@ const Navbar: React.FC = () => {
             <TitleBar.Element priority={2}>
               <div className="d-flex h-100 align-items-center">
                 <button
-                  className="btn btn-primary hide-settings-flex"
+                  className="btn btn-primary hide-settings-flex "
                   disabled={!isConnected}
                   onClick={() => {
                     if (showSettingsModal || !isConnected) return;
                     setShowAddStationModal(true);
                   }}
                 >
-                  <PlusCircleFill />
+                  <CirclePlus size={15} />
                 </button>
               </div>
             </TitleBar.Element>
@@ -97,14 +97,14 @@ const Navbar: React.FC = () => {
             <TitleBar.Element priority={3}>
               <div className="d-flex h-100 align-items-center">
                 <button
-                  className="btn btn-primary hide-settings-flex"
+                  className="btn btn-primary hide-settings-flex "
                   disabled={isConnected || isConnecting}
                   onClick={() => {
                     if (showAddStationModal) return;
                     setShowSettingsModal(true);
                   }}
                 >
-                  <GearFill />
+                  <Settings size={15} />
                 </button>
               </div>
             </TitleBar.Element>