Merge pull request #919 from Lurkars/audioPlayerImprovements

audio player volume improvements

front/src/Components/AudioManager/AudioManager.svelte

@@ -1,6 +1,4 @@
 <script lang="ts">
-    import audioImg from "../images/audio.svg";
-    import audioMuteImg from  "../images/audio-mute.svg";
     import { localUserStore } from "../../Connexion/LocalUserStore";
     import type { audioManagerVolume } from "../../Stores/AudioManagerStore";
     import {
@@ -12,6 +10,8 @@
     import {onDestroy, onMount} from "svelte";
 
     let HTMLAudioPlayer: HTMLAudioElement;
+    let audioPlayerVolumeIcon: HTMLElement;
+    let audioPlayerVol: HTMLInputElement;
     let unsubscriberFileStore: Unsubscriber | null = null;
     let unsubscriberVolumeStore: Unsubscriber | null = null;
 
@@ -19,6 +19,10 @@
     let decreaseWhileTalking: boolean = true;
 
     onMount(() => {
+        volume = localUserStore.getAudioPlayerVolume();
+        audioManagerVolumeStore.setMuted(localUserStore.getAudioPlayerMuted());
+        setVolume();
+
         unsubscriberFileStore = audioManagerFileStore.subscribe(() =>{
             HTMLAudioPlayer.pause();
             HTMLAudioPlayer.loop = get(audioManagerVolumeStore).loop;
@@ -52,9 +56,26 @@
     function onMute() {
         audioManagerVolumeStore.setMuted(!get(audioManagerVolumeStore).muted);
         localUserStore.setAudioPlayerMuted(get(audioManagerVolumeStore).muted);
+        setVolume();
     }
 
     function setVolume() {
+        if (get(audioManagerVolumeStore).muted) {
+            audioPlayerVolumeIcon.classList.add('muted');
+            audioPlayerVol.value = "0";
+        } else {
+            audioPlayerVol.value = "" + volume;
+            audioPlayerVolumeIcon.classList.remove('muted');
+            if (volume < 0.3) {
+                audioPlayerVolumeIcon.classList.add('low');
+            } else if (volume < 0.7) {
+                audioPlayerVolumeIcon.classList.remove('low');
+                audioPlayerVolumeIcon.classList.add('mid');
+            } else {
+                audioPlayerVolumeIcon.classList.remove('low');
+                audioPlayerVolumeIcon.classList.remove('mid');
+            }
+        }
         audioManagerVolumeStore.setVolume(volume)
         localUserStore.setAudioPlayerVolume(get(audioManagerVolumeStore).volume);
     }
@@ -67,8 +88,28 @@
 
 <div class="main-audio-manager nes-container is-rounded">
     <div class="audio-manager-player-volume">
-        <img src={$audioManagerVolumeStore.muted ? audioMuteImg : audioImg} alt="player volume" on:click={onMute}>
+        <span id="audioplayer_volume_icon_playing" alt="player volume" bind:this={audioPlayerVolumeIcon}
-        <input type="range" min="0" max="1" step="0.025" bind:value={volume} on:change={setVolume}>
+            on:click={onMute}>
+            <svg width="2em" height="2em" viewBox="0 0 16 16" class="bi bi-volume-up" fill="white"
+                xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                    d="M6.717 3.55A.5.5 0 0 1 7 4v8a.5.5 0 0 1-.812.39L3.825 10.5H1.5A.5.5 0 0 1 1 10V6a.5.5 0 0 1 .5-.5h2.325l2.363-1.89a.5.5 0 0 1 .529-.06zM6 5.04L4.312 6.39A.5.5 0 0 1 4 6.5H2v3h2a.5.5 0 0 1 .312.11L6 10.96V5.04z" />
+                <g id="audioplayer_volume_icon_playing_high">
+                    <path
+                        d="M11.536 14.01A8.473 8.473 0 0 0 14.026 8a8.473 8.473 0 0 0-2.49-6.01l-.708.707A7.476 7.476 0 0 1 13.025 8c0 2.071-.84 3.946-2.197 5.303l.708.707z" />
+                </g>
+                <g id="audioplayer_volume_icon_playing_mid">
+                    <path
+                        d="M10.121 12.596A6.48 6.48 0 0 0 12.025 8a6.48 6.48 0 0 0-1.904-4.596l-.707.707A5.483 5.483 0 0 1 11.025 8a5.483 5.483 0 0 1-1.61 3.89l.706.706z" />
+                </g>
+                <g id="audioplayer_volume_icon_playing_low">
+                    <path
+                        d="M8.707 11.182A4.486 4.486 0 0 0 10.025 8a4.486 4.486 0 0 0-1.318-3.182L8 5.525A3.489 3.489 0 0 1 9.025 8 3.49 3.49 0 0 1 8 10.475l.707.707z" />
+                </g>
+            </svg>
+        </span>
+        <input type="range" min="0" max="1" step="0.025" bind:value={volume} bind:this={audioPlayerVol}
+            on:change={setVolume}>
     </div>
     <div class="audio-manager-reduce-conversation">
         <label>
@@ -105,7 +146,7 @@
             display: grid;
             grid-template-columns: 50px 1fr;
 
-        img {
+            span svg {
                 height: 100%;
                 width: calc(100% - 10px);
                 margin-right: 10px;
@@ -115,5 +156,37 @@
         section.audio-manager-file {
             display: none;
         }
+
+        #audioplayer_volume_icon_playing.muted {
+            #audioplayer_volume_icon_playing_low {
+                visibility: hidden;
+                display: none;
+            }
+
+            #audioplayer_volume_icon_playing_mid {
+                visibility: hidden;
+                display: none;
+            }
+
+            #audioplayer_volume_icon_playing_high {
+                visibility: hidden;
+                display: none;
+            }
+        }
+
+        #audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_high {
+            visibility: hidden;
+            display: none;
+        }
+
+        #audioplayer_volume_icon_playing.low #audioplayer_volume_icon_playing_mid {
+            visibility: hidden;
+            display: none;
+        }
+
+        #audioplayer_volume_icon_playing.mid #audioplayer_volume_icon_playing_high {
+            visibility: hidden;
+            display: none;
+        }
     }
 </style>

front/style/style.scss

@@ -399,62 +399,6 @@ body {
     }
 }
 
-.audioplayer:first-child  {
-    display: grid;
-    grid: 2rem / 4rem 10rem;
-}
-
-.audioplayer > button, .audioplayer > div, .audioplayer > label {
-    background-color: rgba(0,0,0,0.5);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.audioplayer > div {
-    padding-right: 1.2rem;
-}
-
-#audioplayerctrl {
-    position: fixed;
-    top: 0;
-    right: calc(50% - 120px);
-    padding: 0.3rem 0.5rem;
-    color: white;
-    transition: transform 0.5s;
-}
-
-#audioplayer_mute {
-    max-width: 5rem;
-    border: none;
-}
-#audioplayer_mute:focus, #audioplayer_mute:active {
-    outline: none;
-}
-#audioplayer_mute > svg {
-    width: 100%;
-    height: 100%;
-    pointer-events: none;
-}
-#audioplayer_volume_icon_playing.muted {
-    visibility: hidden;
-    display: none;
-}
-#audioplayerctrl > #audioplayer_volume {
-    width: 100%;
-    background-color: rgba(0,0,0,0.5);
-}
-
-/*
- * sollte eigentlich in den aspect-ratio teil ..
- */
-#audioplayerctrl.loading {
-    transform: translateY(-90%);
-}
-#audioplayerctrl.hidden {
-    transform: translateY(-100%);
-}
-
 /*
  * Style Input Range
  * https://www.cssportal.com/style-input-range/