Merge pull request #54 from 1nexis/main

add Toggle for Mic Clicks

Author: SOH69

client/function.lua

@@ -91,6 +91,11 @@ function Radio:Init(data)
             self.favourite[#self.favourite+1] = val
         end
     end
+    
+    if not self.userData[self.identifier].enableClicks then
+        exports['pma-voice']:setVoiceProperty('micClicks', false)
+    end
+
     self:doRadioCheck()
 end
 

client/nui.lua

@@ -101,6 +101,13 @@ RegisterNUICallback('allowMovement', function(data, cb)
     cb("ok")
 end)
 
+RegisterNUICallback('enableClicks', function(data, cb)
+    Radio.userData[Radio.identifier].enableClicks = data
+    SetResourceKvp('radioSettings2', json.encode(Radio.userData))
+    exports['pma-voice']:setVoiceProperty('micClicks', data)
+    cb("ok")
+end)
+
 RegisterNUICallback('updateRadioSize', function(data, cb)
     Radio.userData[Radio.identifier].radioSizeMultiplier = data.radio
     Radio.userData[Radio.identifier].overlaySizeMultiplier = data.overlay

locales/de.json

@@ -26,6 +26,7 @@
         "radio_settings": "RADIOEINSTELLUNGEN",
         "move_radio": "RADIO BEWEGEN",
         "allow_move": "BEWEGEN ERLAUBEN",
-        "overlay_settings": "OVERLAYEINSTELLUNGEN"
+        "overlay_settings": "OVERLAYEINSTELLUNGEN",
+		"enableClicks": "Funkgeräusch"
     }
 }

locales/en.json

@@ -26,6 +26,7 @@
         "radio_settings": "Radio Settings",
         "move_radio": "Move Radio",
         "allow_move": "Allow Move",
-        "overlay_settings": "Overlay Settings"
+        "overlay_settings": "Overlay Settings",
+		"enableClicks": "Radio Sounds"
     }
 }

web/src/components/setting.svelte

@@ -44,6 +44,14 @@
         })
         SendEvent(Send.allowMovement, event.target.checked);
     }
+
+    function toggleClicks(event: any) {
+        RADIODATA.update((data: any) => {
+            data.userData.enableClicks = event.target.checked;
+            return data;
+        })
+        SendEvent(Send.enableClicks, event.target.checked);
+    }
     
 </script>
 
@@ -83,6 +91,18 @@
                     </label>
                 </div>
             </div>
+            <div class="flex gap-2">
+                <div class="h-[20px] w-[18px] rounded-md flex justify-center items-center bg-[#0e0d1a] gap-2">
+                    <i class="fa-solid fa-volume-high text-[8px]"></i>
+                </div>
+                <span class="text-[10px] flex justify-center items-center">{$RADIODATA.locale['ui.enableClicks']}</span>
+                <div class="h-[20px] flex items-center pl-6">
+                    <label class="inline-flex items-center cursor-pointer">
+                        <input type="checkbox" value="" class="sr-only peer" checked={$RADIODATA.userData.enableClicks} on:input={toggleClicks}>
+                        <div class="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
+                    </label>
+                </div>
+            </div>
         </div>
 
         <div class="flex flex-col w-full gap-4 pb-4 pt-4">

web/src/stores/stores.ts

@@ -24,6 +24,7 @@ interface IRADIODATA {
         radioSizeMultiplier: number,
         favourite: Number[],
         allowMovement: boolean,
+        enableClicks: boolean,
         playerlist: {
 			show: boolean,
 			coords: {

web/src/utils/debug/receivers.ts

@@ -54,7 +54,8 @@ const ReceiveDebuggers: DebugEventCallback[] = [
                     "ui.radio_settings": "Radio Settings",
                     "ui.move_radio": "Move Radio",
                     "ui.allow_move": "Allow Move",
-                    "ui.overlay_settings": "Overlay Settings"
+                    "ui.overlay_settings": "Overlay Settings",
+                    "ui.enableClicks": "Radio Clicks"
                 },
                 channelName: 'MRPD CHANNEL #1',
                 insideJammerZone: false,
@@ -108,7 +109,8 @@ const ReceiveDebuggers: DebugEventCallback[] = [
                     "ui.radio_settings": "Radio Settings",
                     "ui.move_radio": "Move Radio",
                     "ui.allow_move": "Allow Move",
-                    "ui.overlay_settings": "Overlay Settings"
+                    "ui.overlay_settings": "Overlay Settings",
+                    "ui.enableClicks": "Radio Clicks"
                 },
                 channelName: 'MRPD CHANNEL #1',
                 insideJammerZone: false,

web/src/utils/debug/senders.ts

@@ -57,7 +57,8 @@ let radioData = {
         "ui.radio_settings": "Radio Settings",
         "ui.move_radio": "Move Radio",
         "ui.allow_move": "Allow Move",
-        "ui.overlay_settings": "Overlay Settings"
+        "ui.overlay_settings": "Overlay Settings",
+        "ui.enableClicks": "Radio Clicks"
     }
 }