From b21464de0538dead62c43f2c030c69f7bc84a629 Mon Sep 17 00:00:00 2001
From: Swiftzerr <swiftzermc@gmail.com>
Date: Sun, 30 Jan 2022 01:38:29 -0500
Subject: [PATCH] Unbloat user menu (#264)

---
 src/i18n/en_US.jsonc                          |  5 +-
 src/renderer/assets/discord.svg               | 10 ++++
 src/renderer/index.js                         |  1 +
 .../views/components/audio-settings.ejs       | 47 +++++++++++++++++++
 src/renderer/views/main.ejs                   | 40 ++++------------
 src/renderer/views/pages/about.ejs            |  2 +
 src/renderer/views/pages/settings.ejs         | 18 +++++++
 src/renderer/views/svg/speaker.svg            |  1 +
 8 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 src/renderer/assets/discord.svg
 create mode 100644 src/renderer/views/components/audio-settings.ejs
 create mode 100644 src/renderer/views/svg/speaker.svg

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index 824182c7..104087cf 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -99,7 +99,7 @@
   "term.time.second": "second",
   "term.fullscreenView": "Fullscreen View",
   "term.defaultView": "Default View",
-  "term.spacializedAudioSetting": "Spacialized Audio Setting",
+  "term.audioSettings": "Audio Settings",
   "term.clearAll": "Clear All",
   "term.recentStations": "Recent Stations",
   "term.language": "Language",
@@ -111,6 +111,7 @@
   "term.ciderTeam": "Cider Team",
   "term.developer": "Developer",
   "term.socialTeam": "Social Team",
+  "term.socials": "Socials",
   "term.contributors": "Contributors",
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
@@ -178,7 +179,7 @@
   "action.unlove": "Unlove",
   "action.dislike": "Dislike",
   "action.undoDislike": "Undo dislike",
-  "action.showWebRemoteQR": "Show Web Remote QR",
+  "action.showWebRemoteQR": "Web Remote",
   "action.playTracksNext": "Play ${app.selectedMediaItems.length} tracks next",
   "action.playTracksLater": "Play ${app.selectedMediaItems.length} tracks later",
   "action.removeTracks": "Remove ${self.selectedItems.length} tracks from queue",
diff --git a/src/renderer/assets/discord.svg b/src/renderer/assets/discord.svg
new file mode 100644
index 00000000..f905d235
--- /dev/null
+++ b/src/renderer/assets/discord.svg
@@ -0,0 +1,10 @@
+<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#ffffff"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="71" height="55" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 2979fd4c..9e518400 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -300,6 +300,7 @@ const app = new Vue({
             spatialProperties: false,
             qrcode: false,
             equalizer: false,
+            audioSettings: false,
         },
         socialBadges: {
             badgeMap: {},
diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs
new file mode 100644
index 00000000..d2263ef8
--- /dev/null
+++ b/src/renderer/views/components/audio-settings.ejs
@@ -0,0 +1,47 @@
+<script type="text/x-template" id="audio-settings">
+    <template>
+        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()" @contextmenu.self="app.resetState()">
+            <div class="modal-window">
+                <div class="modal-header">
+                    <div class="modal-title">{{app.getLz('term.audioSettings')}}</div>
+                    <button class="close-btn" @click="app.resetState()"></button>
+                </div>
+                <div class="modal-content">
+                    <button class="playlist-item"
+                            @click="openEqualizer()" style="width:100%;">
+                        <div class="icon"><%- include("../svg/speaker.svg") %></div>
+                        <div class="name">{{app.getLz('term.equalizer')}}</div>
+                    </button>
+                    <button class="playlist-item"
+                            @click="openSpacialAudio()" style="width:100%;">
+                        <div class="icon"><%- include("../svg/speaker.svg") %></div>
+                        <div class="name">{{app.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}</div>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </template>
+</script>
+
+<script>
+    Vue.component('audio-settings', {
+        template: '#audio-settings',
+        data: function () {
+            return {
+                app: this.$root,
+            }
+        },
+        props: {},
+        mounted() {},
+        methods: {
+            openEqualizer() {
+                app.modals.equalizer = true
+                app.modals.audioSettings = false
+            },
+            openSpacialAudio() {
+                app.modals.spatialProperties = true
+                app.modals.audioSettings = false
+            },
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index b153e0d5..a37d520e 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -246,43 +246,13 @@
                                         </div>
                                     </div>
                                 </button>
-                                <button class="usermenu-item" @click="toggleHideUserInfo()">
-                                    <div class="row nopadding">
-                                        <div class="col nopadding">
-                                            {{$root.getLz('settings.option.visual.showPersonalInfo')}}
-                                        </div>
-                                        <div class="col-auto nopadding" v-if="!chrome.hideUserInfo">
-                                            ✔️
-                                        </div>
-                                    </div>
-                                </button>
-                                <button class="usermenu-item" @click="mk.privateEnabled = !mk.privateEnabled">
-                                    <div class="row nopadding">
-                                        <div class="col nopadding">
-                                            {{$root.getLz('term.privateSession')}}
-                                        </div>
-                                        <div class="col-auto nopadding" v-if="mk.privateEnabled">
-                                            ✔️
-                                        </div>
-                                    </div>
-                                </button>
                                 <button class="usermenu-item" v-if="cfg.advanced.AudioContext"
-                                @click="modals.equalizer = true">
-                                    {{$root.getLz('term.equalizer')}}
-                                </button>
-                                <button class="usermenu-item" v-if="cfg.advanced.AudioContext && cfg.audio.spatial"
-                                        @click="modals.spatialProperties = true">
-                                    {{$root.getLz('term.spacializedAudioSetting')}}
-                                </button>
-                                <button class="usermenu-item" @click="appRoute('apple-account-settings')">
-                                    {{$root.getLz('term.accountSettings')}}
+                                        @click="modals.audioSettings = true">
+                                    {{$root.getLz('term.audioSettings')}}
                                 </button>
                                 <button class="usermenu-item" @click="appRoute('about')">
                                     {{$root.getLz('term.about')}}
                                 </button>
-                                <button class="usermenu-item" @click="window.open('https://discord.gg/applemusic')">
-                                    {{$root.getLz('term.discord')}}
-                                </button>
                                 <button class="usermenu-item" @click="appRoute('settings')">
                                     {{$root.getLz('term.settings')}}
                                 </button>
@@ -631,6 +601,9 @@
     <transition name="modal">
         <spatial-properties v-if="modals.spatialProperties"></spatial-properties>
     </transition>
+    <transition name="modal">
+        <audio-settings v-if="modals.audioSettings"></audio-settings>
+    </transition>
     <transition name="modal">
         <eq-view v-if="modals.equalizer"></eq-view>
     </transition>
@@ -745,6 +718,9 @@
 <!-- Spatial Properties -->
 <%- include('components/spatial-properties') 
 %>
+<!-- Audio Settings -->
+<%- include('components/audio-settings')
+%>
 <!-- QRCode Modal -->
 <%- include('components/qrcode-modal') 
 %>
diff --git a/src/renderer/views/pages/about.ejs b/src/renderer/views/pages/about.ejs
index a8bc29bb..c6ec7cdf 100644
--- a/src/renderer/views/pages/about.ejs
+++ b/src/renderer/views/pages/about.ejs
@@ -13,6 +13,8 @@
                 <h3>{{$root.getLz('term.sponsor')}}</h3>
                 <button onclick="window.open('https://ko-fi.com/cryptofyre')" class="md-btn sponsorBtn"><img src="./assets/ko_fi.svg"/>Ko-fi</button>
                 <button onclick="window.open('https://opencollective.com/ciderapp')" class="md-btn sponsorBtn"><img src="./assets/open_collective.svg"/>Open Collective</button>
+                <h3>{{$root.getLz('term.socials')}}</h3>
+                <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn"><img src="./assets/discord.svg"/>{{$root.getLz('term.discord')}}</button>
 
             </div>
             <div class="col">
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 757bfbe6..e5dc90a8 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1,6 +1,24 @@
 <script type="text/x-template" id="cider-settings">
     <div class="content-inner settings-page">
         <div class="md-option-container">
+            <div class="md-option-header">
+                <span>{{$root.getLz('settings.header.general')}}</span>
+            </div>
+            <div class="md-option-line">
+                <div class="md-option-segment md-option-segment_auto">
+                    <button class="md-btn" onclick="app.appRoute('apple-account-settings')">
+                        {{$root.getLz('term.accountSettings')}}
+                    </button>
+                </div>
+            </div>
+            <div class="md-option-line">
+                <div class="md-option-segment">
+                    {{$root.getLz('term.privateSession')}}
+                </div>
+                <div class="md-option-segment md-option-segment_auto">
+                    <input type="checkbox" v-model="app.mk.privateEnabled" switch/>
+                </div>
+            </div>
             <div class="md-option-header">
                 <span>{{$root.getLz('settings.header.audio')}}</span>
             </div>
diff --git a/src/renderer/views/svg/speaker.svg b/src/renderer/views/svg/speaker.svg
new file mode 100644
index 00000000..2d485acb
--- /dev/null
+++ b/src/renderer/views/svg/speaker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-speaker"><rect x="4" y="2" width="16" height="20" rx="2" ry="2"></rect><circle cx="12" cy="14" r="4"></circle><line x1="12" y1="6" x2="12.01" y2="6"></line></svg>
\ No newline at end of file