From 8221f82d1f1988914c21ca68db83b4c5ef875216 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 19:28:36 +0300
Subject: [PATCH 1/6] refactor: Use same name for action (mode) attribute

---
 src/controllers/itemDetails/index.html | 4 ++--
 src/controllers/itemDetails/index.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index 241c943be..ea750f15d 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -13,13 +13,13 @@
             </div>
 
             <div class="mainDetailButtons focuscontainer-x">
-                <button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume">
+                <button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-action="resume">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${Play}" data-mode="play">
+                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${Play}" data-action="play">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
                     </div>
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 6308ab1d9..1bb3079f9 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1973,7 +1973,7 @@ export default function (view, params) {
     }
 
     function onPlayClick() {
-        playCurrentItem(this, this.getAttribute('data-mode'));
+        playCurrentItem(this, this.getAttribute('data-action'));
     }
 
     function onPosterClick(e) {

From fff64ae5a52745cd797150446997b57d2c5f7b5b Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 20:07:01 +0300
Subject: [PATCH 2/6] refactor: Remove obsolete code

Leftover from reworking of poster generation.
---
 src/controllers/itemDetails/index.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 1bb3079f9..f1b069e0e 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -13,7 +13,6 @@ import listView from '../../components/listview/listview';
 import itemContextMenu from '../../components/itemContextMenu';
 import itemHelper from '../../components/itemHelper';
 import dom from '../../scripts/dom';
-import indicators from '../../components/indicators/indicators';
 import imageLoader from '../../components/images/imageLoader';
 import libraryMenu from '../../scripts/libraryMenu';
 import globalize from '../../scripts/globalize';
@@ -839,18 +838,6 @@ function renderImage(page, item) {
     );
 }
 
-function refreshDetailImageUserData(elem, item) {
-    const container = elem.querySelector('.detailImageProgressContainer');
-
-    if (container) {
-        container.innerHTML = indicators.getProgressBarHtml(item);
-    }
-}
-
-function refreshImage(page, item) {
-    refreshDetailImageUserData(page.querySelector('.detailImageContainer'), item);
-}
-
 function setPeopleHeader(page, item) {
     if (item.MediaType == 'Audio' || item.Type == 'MusicAlbum' || item.MediaType == 'Book' || item.MediaType == 'Photo') {
         page.querySelector('#peopleHeader').innerHTML = globalize.translate('People');
@@ -2056,7 +2043,6 @@ export default function (view, params) {
             if (userData) {
                 currentItem.UserData = userData;
                 reloadPlayButtons(view, currentItem);
-                refreshImage(view, currentItem);
                 autoFocus(view);
             }
         }

From 6ad311baad125918c76169b7acc4bf027c91be6c Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 21:33:14 +0300
Subject: [PATCH 3/6] Disable play button on poster in TV layout

---
 src/controllers/itemDetails/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index f1b069e0e..f88456714 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -818,8 +818,8 @@ function renderDetailImage(elem, item, imageLoader) {
         overlayText: false,
         transition: false,
         disableIndicators: true,
-        overlayPlayButton: layoutManager.mobile ? false : true,
-        action: layoutManager.mobile ? 'none' : 'play',
+        overlayPlayButton: layoutManager.desktop,
+        action: layoutManager.desktop ? 'play' : 'none',
         width: dom.getWindowSize().innerWidth * 0.25
     });
 

From ca8cc653d9a8238b9b6470c8b6646ac47dc7aa26 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 21:34:04 +0300
Subject: [PATCH 4/6] refactor: Set 'resume' action to poster

To match logic. This has no effect, because 'play' still uses
the current position.
---
 src/controllers/itemDetails/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index f88456714..0feed31d1 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -819,7 +819,7 @@ function renderDetailImage(elem, item, imageLoader) {
         transition: false,
         disableIndicators: true,
         overlayPlayButton: layoutManager.desktop,
-        action: layoutManager.desktop ? 'play' : 'none',
+        action: layoutManager.desktop ? 'resume' : 'none',
         width: dom.getWindowSize().innerWidth * 0.25
     });
 

From 6ae03974f9c684be0822ad700cb47ef81067c505 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 22:28:19 +0300
Subject: [PATCH 5/6] fix: Fix focus jump when focusing Resume

Make the Play button the Resume and replace Resume with Replay.
---
 src/components/autoFocuser.js          |  4 ----
 src/controllers/itemDetails/index.html |  6 +++---
 src/controllers/itemDetails/index.js   | 24 +++++++-----------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/components/autoFocuser.js b/src/components/autoFocuser.js
index 6afb38d40..59b6bca80 100644
--- a/src/components/autoFocuser.js
+++ b/src/components/autoFocuser.js
@@ -59,15 +59,11 @@ import layoutManager from './layoutManager';
                 candidates.push(container.querySelector('.btnPreviousPage'));
             } else if (activeElement.classList.contains('btnSelectView')) {
                 candidates.push(container.querySelector('.btnSelectView'));
-            } else if (activeElement.classList.contains('btnPlay')) {
-                // Resume has priority over Play
-                candidates = candidates.concat(Array.from(container.querySelectorAll('.btnResume')));
             }
 
             candidates.push(activeElement);
         }
 
-        candidates = candidates.concat(Array.from(container.querySelectorAll('.btnResume')));
         candidates = candidates.concat(Array.from(container.querySelectorAll('.btnPlay')));
 
         let focusedElement;
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index ea750f15d..180f65cb8 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -13,15 +13,15 @@
             </div>
 
             <div class="mainDetailButtons focuscontainer-x">
-                <button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-action="resume">
+                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton raised" title="${ButtonResume}" data-action="resume">
                     <div class="detailButton-content">
                         <span class="material-icons detailButton-icon play_arrow"></span>
                     </div>
                 </button>
 
-                <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton" title="${Play}" data-action="play">
+                <button is="emby-button" type="button" class="button-flat btnReplay hide detailButton" title="${Play}" data-action="play">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon play_arrow"></span>
+                        <span class="material-icons detailButton-icon replay"></span>
                     </div>
                 </button>
 
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 0feed31d1..33a3af79e 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -343,7 +343,7 @@ function reloadPlayButtons(page, item) {
             hideAll(page, 'btnPlay');
         }
 
-        hideAll(page, 'btnResume');
+        hideAll(page, 'btnReplay');
         hideAll(page, 'btnInstantMix');
         hideAll(page, 'btnShuffle');
     } else if (playbackManager.canPlay(item)) {
@@ -355,32 +355,22 @@ function reloadPlayButtons(page, item) {
         canPlay = true;
 
         const isResumable = item.UserData && item.UserData.PlaybackPositionTicks > 0;
-        hideAll(page, 'btnResume', isResumable);
-
-        for (const elem of page.querySelectorAll('.btnPlay')) {
-            const btnPlay = elem.querySelector('.detailButton-icon');
+        hideAll(page, 'btnReplay', isResumable);
 
+        for (const btnPlay of page.querySelectorAll('.btnPlay')) {
             if (isResumable) {
-                btnPlay.classList.replace('play_arrow', 'replay');
+                btnPlay.title = globalize.translate('ButtonResume');
             } else {
-                btnPlay.classList.replace('replay', 'play_arrow');
+                btnPlay.title = globalize.translate('Play');
             }
         }
     } else {
         hideAll(page, 'btnPlay');
-        hideAll(page, 'btnResume');
+        hideAll(page, 'btnReplay');
         hideAll(page, 'btnInstantMix');
         hideAll(page, 'btnShuffle');
     }
 
-    if (layoutManager.tv) {
-        const btnResume = page.querySelector('.mainDetailButtons .btnResume');
-        const btnPlay = page.querySelector('.mainDetailButtons .btnPlay');
-        const resumeHidden = btnResume.classList.contains('hide');
-        btnResume.classList.toggle('raised', !resumeHidden);
-        btnPlay.classList.toggle('raised', resumeHidden);
-    }
-
     return canPlay;
 }
 
@@ -2056,7 +2046,7 @@ export default function (view, params) {
 
         view.querySelectorAll('.btnPlay');
         bindAll(view, '.btnPlay', 'click', onPlayClick);
-        bindAll(view, '.btnResume', 'click', onPlayClick);
+        bindAll(view, '.btnReplay', 'click', onPlayClick);
         bindAll(view, '.btnInstantMix', 'click', onInstantMixClick);
         bindAll(view, '.btnShuffle', 'click', onShuffleClick);
         bindAll(view, '.btnPlayTrailer', 'click', onPlayTrailerClick);

From 04c82ab7c4787080c052be09200e8d9314823c8e Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 20 Feb 2022 22:42:00 +0300
Subject: [PATCH 6/6] Cleanup

---
 src/controllers/itemDetails/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 33a3af79e..df576f87f 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -2044,7 +2044,6 @@ export default function (view, params) {
     function init() {
         const apiClient = getApiClient();
 
-        view.querySelectorAll('.btnPlay');
         bindAll(view, '.btnPlay', 'click', onPlayClick);
         bindAll(view, '.btnReplay', 'click', onPlayClick);
         bindAll(view, '.btnInstantMix', 'click', onInstantMixClick);