From 139d9b178376542c72a8ddf69e4d5e343daeaca5 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Mon, 10 Jan 2022 10:35:08 +0700
Subject: [PATCH] some visual adj

---
 src/renderer/style.less                       |  2 +-
 .../views/components/mediaitem-mvview-sp.ejs  | 20 ++++---
 src/renderer/views/main.ejs                   |  4 +-
 src/renderer/views/pages/home.ejs             |  5 +-
 src/renderer/views/svg/fullscreen.svg         | 57 +------------------
 src/renderer/views/svg/pip.svg                | 13 +++++
 6 files changed, 33 insertions(+), 68 deletions(-)
 create mode 100644 src/renderer/views/svg/pip.svg

diff --git a/src/renderer/style.less b/src/renderer/style.less
index bebf8bad..1a278f0c 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -4139,7 +4139,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 }
 
 #apple-music-video-player-controls #player-fullscreen > svg {
-  width: 50%;
+  width: 70%;
 }
 
 #apple-music-video-player-controls:hover {
diff --git a/src/renderer/views/components/mediaitem-mvview-sp.ejs b/src/renderer/views/components/mediaitem-mvview-sp.ejs
index 102163ba..bc4e3efa 100644
--- a/src/renderer/views/components/mediaitem-mvview-sp.ejs
+++ b/src/renderer/views/components/mediaitem-mvview-sp.ejs
@@ -24,13 +24,15 @@
                 <div class="button" style="
                     border-radius: 50%;
                     background: rgba(50,50,50,0.7);"
-                     :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? {'margin': '205px',
+                     :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? 
+                     {'margin': '205px',
                         'margin-left': '260px', 'margin-bottom': '140px',
                         width: '30px',
                         height: '30px',} :
-                        {margin: '35px', 'margin-left': '95px',
-                        width: '120px',
-                        height: '120px',}]" @click="app.playMediaItem(item)">
+                        {'margin': '205px',
+                        'margin-left': '260px', 'margin-bottom': '140px',
+                        width: '30px',
+                        height: '30px',}]" @click="app.playMediaItem(item)">
                     <%- include("../svg/play.svg") %>
                 </div>
             </div>
@@ -39,13 +41,15 @@
             <div class="button" style="
                 border-radius: 50%;
                 background: rgba(50,50,50,0.7);"
-                 :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? {'margin': '205px',
+                 :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ?
+                  {'margin': '205px',
                     'margin-left': '260px', 'margin-bottom': '140px',
                     width: '30px',
                     height: '30px',} :
-                    {margin: '35px', 'margin-left': '95px',
-                    width: '120px',
-                    height: '120px',}]" @click="app.playMediaItem(item)">
+                    {'margin': '205px',
+                    'margin-left': '260px', 'margin-bottom': '140px',
+                    width: '30px',
+                    height: '30px',}]" @click="app.playMediaItem(item)">
                 <%- include("../svg/play.svg") %>
             </div>
         </div>
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 21271c19..8dc07f00 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -498,7 +498,7 @@
     </transition>
     <div id="apple-music-video-container">
         <div id="apple-music-video-player-controls">
-            <div id="player-exit" title="Close" @click="app.exitMV()">
+            <div id="player-exit" title="Close" @click="exitMV()">
                 <svg fill="white" xmlns="http://www.w3.org/2000/svg" width="21" height="21" viewBox="0 0 21 21"
                      aria-role="presentation" focusable="false">
                     <path
@@ -516,7 +516,7 @@
             <div id="player-pip"
                  @click="document.querySelector('video#apple-music-video-player').requestPictureInPicture()"
                  title="Picture-in-Picture">
-                <%- include("svg/fullscreen.svg") %>
+                <%- include("svg/pip.svg") %>
             </div>
             <div id="player-fullscreen"
                  @click="document.querySelector('video#apple-music-video-player').requestFullscreen()"
diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs
index 7a1e2353..6b54cd54 100644
--- a/src/renderer/views/pages/home.ejs
+++ b/src/renderer/views/pages/home.ejs
@@ -25,9 +25,8 @@
                         <template v-if="artistFeed.length > 0">
                             <mediaitem-list-item v-for="item in artistFeed.limit(6)" :item="item"></mediaitem-list-item>
                         </template>
-                        <template v-else>
-                            <div class="spinner"></div>
-                        </template>
+                        <div class="spinner" v-else-if="followedArtists.length > 0"></div>
+                        <div class="no-artist" v-else> Follow some artists first and their latest releases will be here</div>
                     </div>
                 </div>
             </div>
diff --git a/src/renderer/views/svg/fullscreen.svg b/src/renderer/views/svg/fullscreen.svg
index c2e3eb1a..602a8572 100644
--- a/src/renderer/views/svg/fullscreen.svg
+++ b/src/renderer/views/svg/fullscreen.svg
@@ -1,55 +1,4 @@
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	fill="#eee" viewBox="0 0 384.97 384.97" style="enable-background:new 0 0 384.97 384.97;" xml:space="preserve">
-<g>
-	<g id="Fullscreen_1_">
-		<path d="M372.939,216.545c-6.123,0-12.03,5.269-12.03,12.03v132.333H24.061V24.061h132.333c6.388,0,12.03-5.642,12.03-12.03
-			S162.409,0,156.394,0H24.061C10.767,0,0,10.767,0,24.061v336.848c0,13.293,10.767,24.061,24.061,24.061h336.848
-			c13.293,0,24.061-10.767,24.061-24.061V228.395C384.97,221.731,380.085,216.545,372.939,216.545z"/>
-		<path d="M372.939,0H252.636c-6.641,0-12.03,5.39-12.03,12.03s5.39,12.03,12.03,12.03h91.382L99.635,268.432
-			c-4.668,4.668-4.668,12.235,0,16.903c4.668,4.668,12.235,4.668,16.891,0L360.909,40.951v91.382c0,6.641,5.39,12.03,12.03,12.03
-			s12.03-5.39,12.03-12.03V12.03l0,0C384.97,5.558,379.412,0,372.939,0z"/>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36" fill="white">
+    <path d="M0 0h36v36h-36z" fill="none"/>
+    <path d="M10 21h-3v8h8v-3h-5v-5zm-3-6h3v-5h5v-3h-8v8zm19 11h-5v3h8v-8h-3v5zm-5-19v3h5v5h3v-8h-8z"/>
 </svg>
diff --git a/src/renderer/views/svg/pip.svg b/src/renderer/views/svg/pip.svg
new file mode 100644
index 00000000..40f5b738
--- /dev/null
+++ b/src/renderer/views/svg/pip.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 fill="white" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#333333;}
+</style>
+<g id="XMLID_6_">
+	<path id="XMLID_11_" class="st0" d="M418.5,139.4H232.4v139.8h186.1V139.4z M464.8,46.7H46.3C20.5,46.7,0,68.1,0,93.1v325.9
+		c0,25.8,21.4,46.3,46.3,46.3h419.4c25.8,0,46.3-20.5,46.3-46.3V93.1C512,67.2,490.6,46.7,464.8,46.7z M464.8,418.9H46.3V92.2h419.4
+		v326.8H464.8z"/>
+</g>
+</svg>