diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index d4025f1c..d6a0d1c0 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -4,14 +4,44 @@ - - - - - ${title}${artist}${release} - 00:00 - 00:00 - +
+
+
+ 20% Complete +
+
+ +
+
+
+ + + + +
+
+
+
+
+ ${title} +
+
+
+
+ + + ${artist} + +
+
+
+
+
+
+
+
diff --git a/approot/templates.xml b/approot/templates.xml index a81573a0..eb2e2762 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -6,7 +6,7 @@
${contents class="Lms-contents"}
- ${player class="Lms-player Lms-vertical-align"} + ${player class="Lms-player"} diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 6e53eb8c..5a186a35 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -1,7 +1,3 @@ -body { - margin-bottom: 16px; -} - a, a:link, a:active, a:visited { color: black; text-decoration: none; @@ -79,7 +75,7 @@ a:hover { } .Lms-contents { - margin-bottom: 50px; + margin-bottom: 78px; } .Lms-explore-filters { @@ -227,13 +223,13 @@ a:hover { position: fixed; bottom: 0; width: 100%; - height: 50px; + height: 70px; background-color: #f5f5f5; + box-shadow: 0px -2px 8px #f5f5f5; } .Lms-player-btn { font-size: 34px !important; - margin: 8px; cursor: pointer; } @@ -241,4 +237,23 @@ a:hover { color: #337ab7; } +.Lms-player-btn-playpause { + width: 32px; + margin-left: 8px; + margin-right: 8px; +} + +.Lms-player-seek { + cursor: pointer; + z-index: 1; +# touch-action: manipulation; +} + +.Lms-player-progress { + width: 100%; + background-color: darkgrey; + height: 12px; + margin-top: 8px; + margin-bottom: 8px; +} diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js index fb0b9e00..e7fe314c 100644 --- a/docroot/js/mediaplayer.js +++ b/docroot/js/mediaplayer.js @@ -10,6 +10,7 @@ LMS.mediaplayer = function () { var _duration = 0; var _updateControls = function() { + _elems.progress.classList.toggle("active"); if (_elems.audio.paused) { _elems.play.style.display = "inline"; _elems.pause.style.display = "none"; @@ -17,6 +18,7 @@ LMS.mediaplayer = function () { else { _elems.pause.style.display = "inline"; _elems.play.style.display = "none"; + _elems.progress.classList.add("active"); } } @@ -44,9 +46,7 @@ LMS.mediaplayer = function () { _elems.pause = document.getElementById("lms-mp-pause"); _elems.previous = document.getElementById("lms-mp-previous"); _elems.next = document.getElementById("lms-mp-next"); - _elems.duration = document.getElementById("lms-mp-duration"); - _elems.time = document.getElementById("lms-mp-time"); - _elems.cover = document.getElementById("lms-mp-cover"); + _elems.progress = document.getElementById("lms-mp-progress"); _elems.play.addEventListener("click", function() { _elems.audio.play(); @@ -67,7 +67,7 @@ LMS.mediaplayer = function () { _elems.audio.addEventListener("pause", _updateControls); _elems.audio.addEventListener("timeupdate", function() { - _elems.time.innerHTML = _durationToString(_offset + _elems.audio.currentTime, _duration > 3600) + _elems.progress.style.width = "" + ((_offset + _elems.audio.currentTime) / _duration) * 100 + "%"; }); _elems.audio.addEventListener("ended", function() { @@ -82,9 +82,6 @@ LMS.mediaplayer = function () { _duration = params.duration; _elems.audio.src = params.resource; - _elems.duration.innerHTML = _durationToString(_duration, _duration > 3600); - _elems.time.innerHTML = _durationToString(0, _duration > 3600) - _elems.cover.src = params.imgResource; if (autoplay) _elems.audio.play();