From a0de1f0c5a9ee85c95f45db2ef4afcf78f755a1a Mon Sep 17 00:00:00 2001
From: Ammon Sarver <3289501+a0js@users.noreply.github.com>
Date: Fri, 29 Jan 2021 17:21:24 -0700
Subject: [PATCH] Adds volume control

---
 src/player/Player.vue          | 26 ++++++++++++++++++++++++++
 src/player/store.ts            | 12 ++++++++++++
 src/shared/components/Icon.vue |  2 ++
 src/style/main.scss            |  8 ++++++++
 4 files changed, 48 insertions(+)

diff --git a/src/player/Player.vue b/src/player/Player.vue
index 04d1634..dcb8b31 100644
--- a/src/player/Player.vue
+++ b/src/player/Player.vue
@@ -47,6 +47,16 @@
         <!-- Controls right --->
         <div class="col-auto col-sm p-0">
           <div class="d-flex flex-nowrap justify-content-end pr-3">
+            <div class="m-0 d-none d-sm-inline-flex align-items-center pr-3">
+              <Icon class="volume-icon" icon="volume-up-fill" />
+              <b-form-input
+                :value="volume"
+                type="range"
+                min="0"
+                max="1"
+                step="0.05"
+                @input="setVolume" />
+            </div>
             <b-button variant="link"
                       class="m-0 d-none d-sm-inline-block"
                       :class="{ 'text-primary': shuffleActive }"
@@ -60,6 +70,18 @@
               <Icon icon="arrow-repeat" />
             </b-button>
             <OverflowMenu class="d-sm-none">
+              <b-dropdown-text>
+                <div class="d-flex justify-content-between">
+                  <strong class="pr-1">Volume</strong>
+                  <b-form-input
+                    :value="volume"
+                    type="range"
+                    min="0"
+                    max="1"
+                    step="0.05"
+                    @input="setVolume" />
+                </div>
+              </b-dropdown-text>
               <b-dropdown-text>
                 <div class="d-flex justify-content-between">
                   <strong>Repeat</strong>
@@ -109,6 +131,7 @@
         repeatActive: (state: any) => state.repeat,
         shuffleActive: (state: any) => state.shuffle,
         visible: (state: any) => state.queue.length > 0,
+        volume: (state: any) => state.volume,
       }),
       ...mapGetters('player', [
         'track',
@@ -130,6 +153,9 @@
           return this.$store.dispatch('player/seek', value)
         }
       },
+      setVolume(volume: any) {
+        return this.$store.dispatch('player/setVolume', parseFloat(volume))
+      },
     }
   })
 </script>
diff --git a/src/player/store.ts b/src/player/store.ts
index f862310..ed2a86c 100644
--- a/src/player/store.ts
+++ b/src/player/store.ts
@@ -5,6 +5,7 @@ import { API } from '@/shared/api'
 const audio = new Audio()
 const storedQueue = JSON.parse(localStorage.getItem('queue') || '[]')
 const storedQueueIndex = parseInt(localStorage.getItem('queueIndex') || '-1')
+const storedVolume = parseFloat(localStorage.getItem('player.volume') || '0.8')
 if (storedQueueIndex > -1 && storedQueueIndex < storedQueue.length) {
   audio.src = storedQueue[storedQueueIndex].url
 }
@@ -19,6 +20,7 @@ interface State {
   currentTime: number; // position of current track in seconds
   repeat: boolean;
   shuffle: boolean;
+  volume: number; // integer between 0 and 1 representing the volume of the player
 }
 
 export const playerModule: Module<State, any> = {
@@ -32,6 +34,7 @@ export const playerModule: Module<State, any> = {
     currentTime: 0,
     repeat: localStorage.getItem('player.repeat') !== 'false',
     shuffle: localStorage.getItem('player.shuffle') === 'true',
+    volume: storedVolume,
   },
 
   mutations: {
@@ -102,6 +105,10 @@ export const playerModule: Module<State, any> = {
     setScrobbled(state) {
       state.scrobbled = true
     },
+    setVolume(state, value: any) {
+      state.volume = value
+      localStorage.setItem('player.volume', String(value))
+    }
   },
 
   actions: {
@@ -176,6 +183,10 @@ export const playerModule: Module<State, any> = {
     setNextInQueue({ commit }, track) {
       commit('setNextInQueue', track)
     },
+    setVolume({ commit }, value) {
+      audio.volume = value
+      commit('setVolume', value)
+    },
   },
 
   getters: {
@@ -207,6 +218,7 @@ export const playerModule: Module<State, any> = {
 }
 
 export function setupAudio(store: Store<any>, api: API) {
+  audio.volume = store.state.player.volume
   audio.ontimeupdate = () => {
     store.commit('player/setCurrentTime', audio.currentTime)
 
diff --git a/src/shared/components/Icon.vue b/src/shared/components/Icon.vue
index cd0277b..69d3f6f 100644
--- a/src/shared/components/Icon.vue
+++ b/src/shared/components/Icon.vue
@@ -28,6 +28,7 @@
     BIconPersonCircle,
     BIconRss,
     BIconX,
+    BIconVolumeUpFill,
   } from 'bootstrap-vue'
 
   export default Vue.extend({
@@ -56,6 +57,7 @@
       BIconPersonCircle,
       BIconRss,
       BIconX,
+      BIconVolumeUpFill,
     },
     props: {
       icon: { type: String, required: true }
diff --git a/src/style/main.scss b/src/style/main.scss
index 9cec8f1..6711506 100644
--- a/src/style/main.scss
+++ b/src/style/main.scss
@@ -34,6 +34,9 @@ $dropdown-divider-bg: $theme-elevation-2;
 $input-bg: $theme-elevation-2;
 $input-border-color: $theme-elevation-2;
 $input-color: $theme-text;
+$custom-range-track-height: 0.1rem;
+$custom-range-thumb-bg: $theme-text;
+$custom-range-track-bg: $theme-text-muted;
 
 // Other
 $progress-bg: rgb(35, 35, 35);
@@ -63,6 +66,11 @@ h1, h2, h3, h4, h5 {
   box-shadow: none !important;
 }
 
+.volume-icon {
+  font-size: 2.25rem;
+  padding: 0.375rem;
+}
+
 @import './nav';
 @import './table';