switches dropdown for checkboxes and adjusts wording

front/src/Components/Menu/SettingsSubMenu.svelte

@@ -15,12 +15,14 @@
     let valueGame: number = localUserStore.getGameQualityValue();
     let valueVideo: number = localUserStore.getVideoQualityValue();
     let valueLocale: string = $locale;
-  let valuePrivacySettings = localUserStore.getPrivacySettings();
+    let valueCameraPrivacySettings = localUserStore.getCameraPrivacySettings();
+    let valueMicrophonePrivacySettings = localUserStore.getMicrophonePrivacySettings();
 
     let previewValueGame = valueGame;
     let previewValueVideo = valueVideo;
     let previewValueLocale = valueLocale;
-  let previewPrivacySettings = valuePrivacySettings;
+    let previewCameraPrivacySettings = valueCameraPrivacySettings;
+    let previewMicrophonePrivacySettings = valueMicrophonePrivacySettings;
 
     function saveSetting() {
         let change = false;
@@ -41,8 +43,14 @@
             change = true;
         }
 
-    if (valuePrivacySettings !== previewPrivacySettings) {
+        if (valueCameraPrivacySettings !== previewCameraPrivacySettings) {
-      localUserStore.setPrivacySettings(valuePrivacySettings);
+            previewCameraPrivacySettings = valueCameraPrivacySettings;
+            localUserStore.setCameraPrivacySettings(valueCameraPrivacySettings);
+        }
+
+        if (valueMicrophonePrivacySettings !== previewMicrophonePrivacySettings) {
+            previewMicrophonePrivacySettings = valueMicrophonePrivacySettings;
+            localUserStore.setMicrophonePrivacySettings(valueMicrophonePrivacySettings);
         }
 
         if (change) {
@@ -164,23 +172,15 @@
 
     <section>
         <h3>{$LL.menu.settings.privacySettings.title()}</h3>
-    <p>{$LL.menu.settings.privacySettings.explaination()}</p>
+        <p>{$LL.menu.settings.privacySettings.explanation()}</p>
-    <div class="nes-select is-dark">
+        <label>
-      <select class="privacy-settings-switcher" bind:value={valuePrivacySettings}>
+            <input type="checkbox" class="nes-checkbox is-dark" bind:checked={valueCameraPrivacySettings} />
-        <option value={"allEnabled"}
+            <span>{$LL.menu.settings.privacySettings.cameraToggle()}</span>
-        >{ $LL.menu.settings.privacySettings.allEnabled() }
+        </label>
-        </option>
+        <label>
-        <option value={"microphoneEnabled"}
+            <input type="checkbox" class="nes-checkbox is-dark" bind:checked={valueMicrophonePrivacySettings} />
-        >{ $LL.menu.settings.privacySettings.onlyMicrophoneEnabled() }
+            <span>{$LL.menu.settings.privacySettings.microphoneToggle()}</span>
-        </option>
+        </label>
-        <option value={"cameraEnabled"}
-        >{ $LL.menu.settings.privacySettings.onlyCameraEnabled() }
-        </option>
-        <option value={"noneEnabled"}
-        >{ $LL.menu.settings.privacySettings.allDisabled() }
-        </option>
-      </select>
-    </div>
     </section>
     <section class="settings-section-save">
         <p>{$LL.menu.settings.save.warning()}</p>

front/src/Connexion/LocalUserStore.ts

@@ -24,12 +24,14 @@ const code = "code";
 const cameraSetup = "cameraSetup";
 const cacheAPIIndex = "workavdenture-cache";
 const userProperties = "user-properties";
-const privacySettings = "privacySettings";
+const cameraPrivacySettings = "cameraPrivacySettings";
+const microphonePrivacySettings = "microphonePrivacySettings";
 
 class LocalUserStore {
     saveUser(localUser: LocalUser) {
         localStorage.setItem("localUser", JSON.stringify(localUser));
     }
+
     getLocalUser(): LocalUser | null {
         const data = localStorage.getItem("localUser");
         return data ? JSON.parse(data) : null;
@@ -38,6 +40,7 @@ class LocalUserStore {
     setName(name: string): void {
         localStorage.setItem(playerNameKey, name);
     }
+
     getName(): string | null {
         const value = localStorage.getItem(playerNameKey) || "";
         return isUserNameValid(value) ? value : null;
@@ -46,6 +49,7 @@ class LocalUserStore {
     setPlayerCharacterIndex(playerCharacterIndex: number): void {
         localStorage.setItem(selectedPlayerKey, "" + playerCharacterIndex);
     }
+
     getPlayerCharacterIndex(): number {
         return parseInt(localStorage.getItem(selectedPlayerKey) || "");
     }
@@ -53,6 +57,7 @@ class LocalUserStore {
     setCustomCursorPosition(activeRow: number, selectedLayers: number[]): void {
         localStorage.setItem(customCursorPositionKey, JSON.stringify({ activeRow, selectedLayers }));
     }
+
     getCustomCursorPosition(): { activeRow: number; selectedLayers: number[] } | null {
         return JSON.parse(localStorage.getItem(customCursorPositionKey) || "null");
     }
@@ -60,6 +65,7 @@ class LocalUserStore {
     setCharacterLayers(layers: string[]): void {
         localStorage.setItem(characterLayersKey, JSON.stringify(layers));
     }
+
     getCharacterLayers(): string[] | null {
         const value = JSON.parse(localStorage.getItem(characterLayersKey) || "null");
         return areCharacterLayersValid(value) ? value : null;
@@ -68,6 +74,7 @@ class LocalUserStore {
     setCompanion(companion: string | null): void {
         return localStorage.setItem(companionKey, JSON.stringify(companion));
     }
+
     getCompanion(): string | null {
         const companion = JSON.parse(localStorage.getItem(companionKey) || "null");
 
@@ -77,6 +84,7 @@ class LocalUserStore {
 
         return companion;
     }
+
     wasCompanionSet(): boolean {
         return localStorage.getItem(companionKey) ? true : false;
     }
@@ -84,6 +92,7 @@ class LocalUserStore {
     setGameQualityValue(value: number): void {
         localStorage.setItem(gameQualityKey, "" + value);
     }
+
     getGameQualityValue(): number {
         return parseInt(localStorage.getItem(gameQualityKey) || "60");
     }
@@ -91,6 +100,7 @@ class LocalUserStore {
     setVideoQualityValue(value: number): void {
         localStorage.setItem(videoQualityKey, "" + value);
     }
+
     getVideoQualityValue(): number {
         return parseInt(localStorage.getItem(videoQualityKey) || "20");
     }
@@ -98,6 +108,7 @@ class LocalUserStore {
     setAudioPlayerVolume(value: number): void {
         localStorage.setItem(audioPlayerVolumeKey, "" + value);
     }
+
     getAudioPlayerVolume(): number {
         return parseFloat(localStorage.getItem(audioPlayerVolumeKey) || "1");
     }
@@ -105,6 +116,7 @@ class LocalUserStore {
     setAudioPlayerMuted(value: boolean): void {
         localStorage.setItem(audioPlayerMuteKey, value.toString());
     }
+
     getAudioPlayerMuted(): boolean {
         return localStorage.getItem(audioPlayerMuteKey) === "true";
     }
@@ -112,6 +124,7 @@ class LocalUserStore {
     setHelpCameraSettingsShown(): void {
         localStorage.setItem(helpCameraSettingsShown, "1");
     }
+
     getHelpCameraSettingsShown(): boolean {
         return localStorage.getItem(helpCameraSettingsShown) === "1";
     }
@@ -119,6 +132,7 @@ class LocalUserStore {
     setFullscreen(value: boolean): void {
         localStorage.setItem(fullscreenKey, value.toString());
     }
+
     getFullscreen(): boolean {
         return localStorage.getItem(fullscreenKey) === "true";
     }
@@ -126,6 +140,7 @@ class LocalUserStore {
     setForceCowebsiteTrigger(value: boolean): void {
         localStorage.setItem(forceCowebsiteTriggerKey, value.toString());
     }
+
     getForceCowebsiteTrigger(): boolean {
         return localStorage.getItem(forceCowebsiteTriggerKey) === "true";
     }
@@ -133,6 +148,7 @@ class LocalUserStore {
     setIgnoreFollowRequests(value: boolean): void {
         localStorage.setItem(ignoreFollowRequests, value.toString());
     }
+
     getIgnoreFollowRequests(): boolean {
         return localStorage.getItem(ignoreFollowRequests) === "true";
     }
@@ -149,11 +165,13 @@ class LocalUserStore {
             }
         }
     }
+
     getLastRoomUrl(): string {
         return (
             localStorage.getItem(lastRoomUrl) ?? window.location.protocol + "//" + window.location.host + START_ROOM_URL
         );
     }
+
     getLastRoomUrlCacheApi(): Promise<string | undefined> {
         if (!("caches" in window)) {
             return Promise.resolve(undefined);
@@ -170,6 +188,7 @@ class LocalUserStore {
     setAuthToken(value: string | null) {
         value ? localStorage.setItem(authToken, value) : localStorage.removeItem(authToken);
     }
+
     getAuthToken(): string | null {
         return localStorage.getItem(authToken);
     }
@@ -196,23 +215,29 @@ class LocalUserStore {
         }
         return oldValue === value;
     }
+
     setState(value: string) {
         localStorage.setItem(state, value);
     }
+
     getState(): string | null {
         return localStorage.getItem(state);
     }
+
     generateNonce(): string {
         const newNonce = uuidv4();
         localStorage.setItem(nonce, newNonce);
         return newNonce;
     }
+
     getNonce(): string | null {
         return localStorage.getItem(nonce);
     }
+
     setCode(value: string): void {
         localStorage.setItem(code, value);
     }
+
     getCode(): string | null {
         return localStorage.getItem(code);
     }
@@ -220,17 +245,26 @@ class LocalUserStore {
     setCameraSetup(cameraId: string) {
         localStorage.setItem(cameraSetup, cameraId);
     }
+
     getCameraSetup(): { video: unknown; audio: unknown } | undefined {
         const cameraSetupValues = localStorage.getItem(cameraSetup);
         return cameraSetupValues != undefined ? JSON.parse(cameraSetupValues) : undefined;
     }
 
-    setPrivacySettings(option: string) {
+    setCameraPrivacySettings(option: boolean) {
-        localStorage.setItem(privacySettings, option)
+        localStorage.setItem(cameraPrivacySettings, option.toString());
     }
 
-    getPrivacySettings() {
+    getCameraPrivacySettings() {
-        return localStorage.getItem(privacySettings);
+        return localStorage.getItem(cameraPrivacySettings) === "true";
+    }
+
+    setMicrophonePrivacySettings(option: boolean) {
+        localStorage.setItem(microphonePrivacySettings, option.toString());
+    }
+
+    getMicrophonePrivacySettings() {
+        return localStorage.getItem(microphonePrivacySettings) === "true";
     }
 
     getAllUserProperties(): Map<string, unknown> {

front/src/Stores/MediaStore.ts

@@ -294,18 +294,13 @@ export const mediaStreamConstraintsStore = derived(
 
         // Disable webcam for privacy reasons (the game is not visible and we were talking to no one)
         if ($privacyShutdownStore === true) {
-            const userSetting = localUserStore.getPrivacySettings();
+            const userMicrophonePrivacySetting = localUserStore.getMicrophonePrivacySettings();
-            switch (userSetting) {
+            const userCameraPrivacySetting = localUserStore.getCameraPrivacySettings();
-                case "cameraEnabled":
+            if (!userMicrophonePrivacySetting) {
                 currentAudioConstraint = false;
-                    break;
+            }
-                case "microphoneEnabled":
+            if (!userCameraPrivacySetting) {
                 currentVideoConstraint = false;
-                    break;
-                case "noneEnabled":
-                    currentVideoConstraint = false;
-                    currentAudioConstraint = false;
-                    break;
             }
         }
 
@@ -322,7 +317,6 @@ export const mediaStreamConstraintsStore = derived(
             currentAudioConstraint = false;
         }
 
-
         // Let's make the changes only if the new value is different from the old one.
         if (
             previousComputedVideoConstraint != currentVideoConstraint ||

front/src/i18n/de-DE/menu.ts

@@ -57,13 +57,12 @@ const menu: NonNullable<Translation["menu"]> = {
         language: {
             title: "Sprache",
         },
+        //TODO: complete translation
         privacySettings: {
-            title: "Datenschutzeinstellungen", //TODO: confirm & complete translation
+            title: "",
-            explaination: "",
+            explanation: "",
-            allEnabled: "",
+            cameraToggle: "",
-            onlyCameraEnabled: "",
+            microphoneToggle: "",
-            onlyMicrophoneEnabled: "",
-            allDisabled: ""
         },
         save: {
             warning: "(Das Spiel wird nach dem Speichern neugestartet)",

front/src/i18n/en-US/menu.ts

@@ -58,12 +58,11 @@ const menu: BaseTranslation = {
             title: "Language",
         },
         privacySettings: {
-            title: "Privacy settings",
+            title: "Away mode settings",
-            explaination: "Here you can set an option to keep your microphone/camera enabled when switching active tabs.",
+            explanation:
-            allEnabled: "Camera and microphone always enabled",
+                'When the WorkAdventure tab is not visible, it switches to "away mode". In this mode, you can decide to automatically disable your webcam and/or microphone for as long as the tab stays hidden.',
-            onlyCameraEnabled: "Microphone disabled when the WA tab is not focused",
+            cameraToggle: "Camera",
-            onlyMicrophoneEnabled: "Camera disabled when the WA tab is not focused",
+            microphoneToggle: "Microphone",
-            allDisabled: "Both disabled when the WA tab is not focused"
         },
         save: {
             warning: "(Saving these settings will restart the game)",

front/src/i18n/fr-FR/menu.ts

@@ -58,12 +58,11 @@ const menu: NonNullable<Translation["menu"]> = {
             title: "Langage",
         },
         privacySettings: {
-            title: "Paramètres de confidentialité",
+            title: "Paramètres du mode absent",
-            explaination: "Vous pouvez définir ici si vous souhaitez conserver ou non l'activation du microphone/de la caméra au passage sur un autre onglet.",
+            explanation:
-            allEnabled: "Camera et microphone toujours actifs",
+                "Quand l'onglet WorkAdventure n'est pas visible, vous passez en \"mode absent\". Lorsque ce mode est actif, vous pouvez décider de garder vos webcam et/ou micro désactivés tant que vous ne revenez pas sur l'onglet",
-            onlyCameraEnabled: "Seul le microphone est activé quand l'onglet WA n'est pas sélectionné",
+            cameraToggle: "Camera",
-            onlyMicrophoneEnabled: "Seule la caméra est activé quand l'onglet WA n'est pas sélectionné",
+            microphoneToggle: "Microphone",
-            allDisabled: "Tout désactiver quand l'onglet WA n'est pas sélectionné"
         },
         save: {
             warning: "(La sauvegarde de ces paramètres redémarre le jeu)",