From b378f0533a4944ee693ce0d581c7b508157db5d1 Mon Sep 17 00:00:00 2001
From: TPN <tpn@ainta.dev>
Date: Fri, 5 Jul 2024 11:04:20 +0000
Subject: [PATCH] Add a shortcut to subtitle settings in the bottomControls of
 player

---
 src/components/player/atoms/Captions.tsx      | 28 ++++++++
 src/components/player/atoms/Settings.tsx      | 17 +++++
 src/components/player/atoms/index.ts          |  1 +
 .../player/atoms/settings/CaptionsView.tsx    | 68 ++++++++++++++-----
 .../player/atoms/settings/Opensubtitles.tsx   | 14 +++-
 src/pages/parts/player/PlayerPart.tsx         | 12 +++-
 6 files changed, 119 insertions(+), 21 deletions(-)
 create mode 100644 src/components/player/atoms/Captions.tsx

diff --git a/src/components/player/atoms/Captions.tsx b/src/components/player/atoms/Captions.tsx
new file mode 100644
index 00000000..89e419e0
--- /dev/null
+++ b/src/components/player/atoms/Captions.tsx
@@ -0,0 +1,28 @@
+import { useEffect } from "react";
+
+import { Icons } from "@/components/Icon";
+import { OverlayAnchor } from "@/components/overlays/OverlayAnchor";
+import { VideoPlayerButton } from "@/components/player/internals/Button";
+import { useOverlayRouter } from "@/hooks/useOverlayRouter";
+import { usePlayerStore } from "@/stores/player/store";
+
+export function Captions() {
+  const router = useOverlayRouter("settings");
+  const setHasOpenOverlay = usePlayerStore((s) => s.setHasOpenOverlay);
+
+  useEffect(() => {
+    setHasOpenOverlay(router.isRouterActive);
+  }, [setHasOpenOverlay, router.isRouterActive]);
+
+  return (
+    <OverlayAnchor id={router.id}>
+      <VideoPlayerButton
+        onClick={() => {
+          router.open();
+          router.navigate("/captionsOverlay");
+        }}
+        icon={Icons.CAPTIONS}
+      />
+    </OverlayAnchor>
+  );
+}
diff --git a/src/components/player/atoms/Settings.tsx b/src/components/player/atoms/Settings.tsx
index b3eb2a59..a4059f1e 100644
--- a/src/components/player/atoms/Settings.tsx
+++ b/src/components/player/atoms/Settings.tsx
@@ -54,6 +54,12 @@ function SettingsOverlay({ id }: { id: string }) {
           </Menu.Card>
         </OverlayPage>
         <OverlayPage id={id} path="/captions" width={343} height={431}>
+          <Menu.CardWithScrollable>
+            <CaptionsView id={id} backLink />
+          </Menu.CardWithScrollable>
+        </OverlayPage>
+        {/* This is used by the captions shortcut in bottomControls of player */}
+        <OverlayPage id={id} path="/captionsOverlay" width={343} height={431}>
           <Menu.CardWithScrollable>
             <CaptionsView id={id} />
           </Menu.CardWithScrollable>
@@ -68,6 +74,17 @@ function SettingsOverlay({ id }: { id: string }) {
             <OpenSubtitlesCaptionView id={id} />
           </Menu.Card>
         </OverlayPage>
+        {/* This is used by the captions shortcut in bottomControls of player */}
+        <OverlayPage
+          id={id}
+          path="/captions/opensubtitlesOverlay"
+          width={343}
+          height={431}
+        >
+          <Menu.Card>
+            <OpenSubtitlesCaptionView id={id} overlayBackLink />
+          </Menu.Card>
+        </OverlayPage>
         <OverlayPage id={id} path="/captions/settings" width={343} height={450}>
           <Menu.Card>
             <CaptionSettingsView id={id} />
diff --git a/src/components/player/atoms/index.ts b/src/components/player/atoms/index.ts
index 3caf8154..6be88fd6 100644
--- a/src/components/player/atoms/index.ts
+++ b/src/components/player/atoms/index.ts
@@ -16,3 +16,4 @@ export * from "./VolumeChangedPopout";
 export * from "./NextEpisodeButton";
 export * from "./Chromecast";
 export * from "./CastingNotification";
+export * from "./Captions";
diff --git a/src/components/player/atoms/settings/CaptionsView.tsx b/src/components/player/atoms/settings/CaptionsView.tsx
index 709ad067..fd8b3ce8 100644
--- a/src/components/player/atoms/settings/CaptionsView.tsx
+++ b/src/components/player/atoms/settings/CaptionsView.tsx
@@ -120,7 +120,13 @@ function useSubtitleList(subs: CaptionListItem[], searchQuery: string) {
   }, [subs, searchQuery, unknownChoice]);
 }
 
-export function CaptionsView({ id }: { id: string }) {
+export function CaptionsView({
+  id,
+  backLink,
+}: {
+  id: string;
+  backLink?: true;
+}) {
   const { t } = useTranslation();
   const router = useOverlayRouter(id);
   const selectedCaptionId = usePlayerStore((s) => s.caption.selected?.id);
@@ -213,20 +219,36 @@ export function CaptionsView({ id }: { id: string }) {
           </div>
         </div>
 
-        <Menu.BackLink
-          onClick={() => router.navigate("/")}
-          rightSide={
-            <button
-              type="button"
-              onClick={() => router.navigate("/captions/settings")}
-              className="-mr-2 -my-1 px-2 p-[0.4em] rounded tabbable hover:bg-video-context-light hover:bg-opacity-10"
-            >
-              {t("player.menus.subtitles.customizeLabel")}
-            </button>
-          }
-        >
-          {t("player.menus.subtitles.title")}
-        </Menu.BackLink>
+        {backLink ? (
+          <Menu.BackLink
+            onClick={() => router.navigate("/")}
+            rightSide={
+              <button
+                type="button"
+                onClick={() => router.navigate("/captions/settings")}
+                className="-mr-2 -my-1 px-2 p-[0.4em] rounded tabbable hover:bg-video-context-light hover:bg-opacity-10"
+              >
+                {t("player.menus.subtitles.customizeLabel")}
+              </button>
+            }
+          >
+            {t("player.menus.subtitles.title")}
+          </Menu.BackLink>
+        ) : (
+          <Menu.Title
+            rightSide={
+              <button
+                type="button"
+                onClick={() => router.navigate("/captions/settings")}
+                className="-mr-2 -my-1 px-2 p-[0.4em] rounded tabbable hover:bg-video-context-light hover:bg-opacity-10"
+              >
+                {t("player.menus.subtitles.customizeLabel")}
+              </button>
+            }
+          >
+            {t("player.menus.subtitles.title")}
+          </Menu.Title>
+        )}
       </div>
       <FileDropHandler
         className={`transition duration-300 ${dragging ? "opacity-20" : ""}`}
@@ -239,7 +261,13 @@ export function CaptionsView({ id }: { id: string }) {
           <Input value={searchQuery} onInput={setSearchQuery} />
           <button
             type="button"
-            onClick={() => router.navigate("/captions/opensubtitles")}
+            onClick={() =>
+              router.navigate(
+                backLink
+                  ? "/captions/opensubtitles"
+                  : "/captions/opensubtitlesOverlay",
+              )
+            }
             className="p-[0.5em] rounded tabbable hover:bg-video-context-hoverColor hover:bg-opacity-50"
           >
             <Icon icon={Icons.WEB} />
@@ -259,7 +287,13 @@ export function CaptionsView({ id }: { id: string }) {
                 {t("player.menus.subtitles.empty")}
                 <button
                   type="button"
-                  onClick={() => router.navigate("/captions/opensubtitles")}
+                  onClick={() =>
+                    router.navigate(
+                      backLink
+                        ? "/captions/opensubtitles"
+                        : "/captions/opensubtitlesOverlay",
+                    )
+                  }
                   className="p-1 w-3/4 rounded tabbable duration-200 bg-opacity-10 bg-video-context-light hover:bg-opacity-20"
                 >
                   {t("player.menus.subtitles.scrapeButton")}
diff --git a/src/components/player/atoms/settings/Opensubtitles.tsx b/src/components/player/atoms/settings/Opensubtitles.tsx
index b4dd2b1b..3ead05cd 100644
--- a/src/components/player/atoms/settings/Opensubtitles.tsx
+++ b/src/components/player/atoms/settings/Opensubtitles.tsx
@@ -73,7 +73,13 @@ function useSubtitleList(subs: CaptionListItem[], searchQuery: string) {
   }, [subs, searchQuery, unknownChoice]);
 }
 
-export function OpenSubtitlesCaptionView({ id }: { id: string }) {
+export function OpenSubtitlesCaptionView({
+  id,
+  overlayBackLink,
+}: {
+  id: string;
+  overlayBackLink?: boolean;
+}) {
   const { t } = useTranslation();
   const router = useOverlayRouter(id);
   const selectedCaptionId = usePlayerStore((s) => s.caption.selected?.id);
@@ -124,7 +130,11 @@ export function OpenSubtitlesCaptionView({ id }: { id: string }) {
   return (
     <>
       <div>
-        <Menu.BackLink onClick={() => router.navigate("/captions")}>
+        <Menu.BackLink
+          onClick={() =>
+            router.navigate(overlayBackLink ? "/captionsOverlay" : "/captions")
+          }
+        >
           {t("player.menus.subtitles.OpenSubtitlesChoice")}
         </Menu.BackLink>
       </div>
diff --git a/src/pages/parts/player/PlayerPart.tsx b/src/pages/parts/player/PlayerPart.tsx
index 1f55013b..f012f8ea 100644
--- a/src/pages/parts/player/PlayerPart.tsx
+++ b/src/pages/parts/player/PlayerPart.tsx
@@ -111,7 +111,10 @@ export function PlayerPart(props: PlayerPartProps) {
             ) : null}
             {status === playerStatus.PLAYBACK_ERROR ||
             status === playerStatus.PLAYING ? (
-              <Player.Settings />
+              <>
+                <Player.Captions />
+                <Player.Settings />
+              </>
             ) : null}
             <Player.Fullscreen />
           </div>
@@ -121,7 +124,12 @@ export function PlayerPart(props: PlayerPartProps) {
           <div className="flex justify-center space-x-3">
             {status === playerStatus.PLAYING ? <Player.Pip /> : null}
             <Player.Episodes />
-            {status === playerStatus.PLAYING ? <Player.Settings /> : null}
+            {status === playerStatus.PLAYING ? (
+              <>
+                <Player.Captions />
+                <Player.Settings />
+              </>
+            ) : null}
           </div>
           <div>
             <Player.Fullscreen />