Merge 3e944ae4f5 into 7d84185d0e

src/controllers/lyrics.html

@@ -1,6 +1,15 @@
 <div id="lyricPage" data-role="page" class="page lyricPage" data-backbutton="true">
-    <div>
-        <div class="dynamicLyricsContainer padded-bottom-page">
+    <div class="lyricWrapper">
+        <div class="songDetails">
+            <img id="albumArt" alt="Album Art">
+            <div class="songInfo">
+                <h2 id="songTitle"></h2>
+                <h3 id="artistName"></h3>
+                <p id="albumName"></p>
+            </div>
+        </div>
+        <div class="dynamicLyricsContainer">
+
         </div>
     </div>
-</div>
+</div>

src/controllers/lyrics.js

@@ -236,6 +236,18 @@ export default function (view) {
             const state = playbackManager.getPlayerState(player);
             currentItem = state.NowPlayingItem;
 
+            // set the song title, artist name, album name, and album primary image
+            document.getElementById('songTitle').textContent = currentItem.Name || 'Unknown Title';
+            document.getElementById('artistName').textContent = currentItem.Artists?.join(', ') || 'Unknown Artist';
+            document.getElementById('albumName').textContent = currentItem.Album || 'Unknown Album';
+            const albumArtUrl = currentItem.ImageTags?.Primary ? ServerConnections.getApiClient(currentItem.ServerId).getImageUrl(currentItem.Id, {
+                type: 'Primary',
+                maxWidth: 300,
+                maxHeight: 300
+            }) : 'assets/img/avatar.png';
+
+            document.getElementById('albumArt').src = albumArtUrl;
+
             const serverId = state.NowPlayingItem.ServerId;
             const itemId = state.NowPlayingItem.Id;
 

src/styles/lyrics.scss

@@ -2,17 +2,28 @@
     padding-top: 4.2em !important;
     display: flex;
     justify-content: center;
+    margin: 2%;
+}
+
+.lyricWrapper {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    margin-right: 5em;
 }
 
 .dynamicLyricsContainer {
+    flex: 2;
     display: flex;
     flex-direction: column;
+    align-items: center;
+    text-align: center;
 }
 
 .lyricsLine {
     display: inline-block;
     width: fit-content;
-    margin: 0.1em;
+    margin: 0.3em;
     font-size: 30px;
     color: inherit;
     min-height: 2em;
@@ -29,3 +40,80 @@
 .dynamicLyric {
     cursor: pointer;
 }
+
+.songDetails {
+    position: fixed;
+    right: 1%;
+    top: 40%;
+    transform: translateY(-50%);
+    max-width: 20%;
+    text-align: center;
+}
+
+#albumArt {
+    width: 100%;
+    border-radius: 10px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+}
+
+.songInfo {
+    margin-top: 10px;
+    color: #fff;
+}
+
+.songInfo h2 {
+    font-size: 22px;
+    font-weight: bold;
+}
+
+.songInfo h3 {
+    font-size: 18px;
+}
+
+.songInfo p {
+    font-size: 16px;
+    color: #bbb;
+    margin-top: -5px;
+}
+
+/* move info to the top and allow lyrics to overlap */
+@media screen and (max-width: 1380px) {
+    .lyricWrapper {
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        margin-right: 0;
+        width: 100%;
+    }
+
+    .songDetails {
+        right: auto;
+        max-width: 80%;
+        opacity: 20%;
+        margin-top: -20px;
+    }
+
+    #albumArt {
+        width: 70%;
+    }
+
+    .songInfo h2 {
+        font-size: 25px;
+    }
+
+    .songInfo h3 {
+        font-size: 16px;
+    }
+
+    .songInfo p {
+        font-size: 14px;
+        color: #bbb;
+        margin-top: -5px;
+    }
+
+    .dynamicLyricsContainer {
+        position: absolute;
+        top: 40px;
+        width: 100%;
+    }
+}