From 0ce757f1f43ecf1cda8817e9d3d6d95b2b26217f Mon Sep 17 00:00:00 2001
From: TPN <tpn@ainta.dev>
Date: Fri, 5 Jul 2024 11:19:59 +0000
Subject: [PATCH] Better button for opensubtitles

---
 src/components/player/atoms/Settings.tsx      | 11 +++++++
 .../atoms/settings/CaptionSettingsView.tsx    | 14 +++++++--
 .../player/atoms/settings/CaptionsView.tsx    | 30 +++++++++----------
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/components/player/atoms/Settings.tsx b/src/components/player/atoms/Settings.tsx
index a4059f1e..b7cc8456 100644
--- a/src/components/player/atoms/Settings.tsx
+++ b/src/components/player/atoms/Settings.tsx
@@ -90,6 +90,17 @@ function SettingsOverlay({ id }: { id: string }) {
             <CaptionSettingsView id={id} />
           </Menu.Card>
         </OverlayPage>
+        {/* This is used by the captions shortcut in bottomControls of player */}
+        <OverlayPage
+          id={id}
+          path="/captions/settingsOverlay"
+          width={343}
+          height={450}
+        >
+          <Menu.Card>
+            <CaptionSettingsView id={id} overlayBackLink />
+          </Menu.Card>
+        </OverlayPage>
         <OverlayPage id={id} path="/source" width={343} height={431}>
           <Menu.CardWithScrollable>
             <SourceSelectionView id={id} onChoose={setChosenSourceId} />
diff --git a/src/components/player/atoms/settings/CaptionSettingsView.tsx b/src/components/player/atoms/settings/CaptionSettingsView.tsx
index 2f942a48..884233a9 100644
--- a/src/components/player/atoms/settings/CaptionSettingsView.tsx
+++ b/src/components/player/atoms/settings/CaptionSettingsView.tsx
@@ -216,7 +216,13 @@ export function CaptionSetting(props: {
 
 export const colors = ["#ffffff", "#b0b0b0", "#80b1fa", "#e2e535"];
 
-export function CaptionSettingsView({ id }: { id: string }) {
+export function CaptionSettingsView({
+  id,
+  overlayBackLink,
+}: {
+  id: string;
+  overlayBackLink?: boolean;
+}) {
   const { t } = useTranslation();
   const router = useOverlayRouter(id);
   const styling = useSubtitleStore((s) => s.styling);
@@ -228,7 +234,11 @@ export function CaptionSettingsView({ id }: { id: string }) {
 
   return (
     <>
-      <Menu.BackLink onClick={() => router.navigate("/captions")}>
+      <Menu.BackLink
+        onClick={() =>
+          router.navigate(overlayBackLink ? "/captionsOverlay" : "/captions")
+        }
+      >
         {t("player.menus.subtitles.settings.backlink")}
       </Menu.BackLink>
       <Menu.Section className="space-y-6 pb-5">
diff --git a/src/components/player/atoms/settings/CaptionsView.tsx b/src/components/player/atoms/settings/CaptionsView.tsx
index fd8b3ce8..a72a41df 100644
--- a/src/components/player/atoms/settings/CaptionsView.tsx
+++ b/src/components/player/atoms/settings/CaptionsView.tsx
@@ -239,7 +239,7 @@ export function CaptionsView({
             rightSide={
               <button
                 type="button"
-                onClick={() => router.navigate("/captions/settings")}
+                onClick={() => router.navigate("/captions/settingsOverlay")}
                 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")}
@@ -257,21 +257,8 @@ export function CaptionsView({
         }}
         onDrop={(event) => onDrop(event)}
       >
-        <div className="mt-3 flex flex-row gap-2">
+        <div className="mt-3">
           <Input value={searchQuery} onInput={setSearchQuery} />
-          <button
-            type="button"
-            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} />
-          </button>
         </div>
         <Menu.ScrollToActiveSection className="!pt-1 mt-2 pb-3">
           <CaptionOption
@@ -281,6 +268,19 @@ export function CaptionsView({
             {t("player.menus.subtitles.offChoice")}
           </CaptionOption>
           <CustomCaptionOption />
+          <CaptionOption
+            onClick={() =>
+              router.navigate(
+                backLink
+                  ? "/captions/opensubtitles"
+                  : "/captions/opensubtitlesOverlay",
+              )
+            }
+            selected={useSubtitleStore((s) => s.isOpenSubtitles)}
+            chevron
+          >
+            {t("player.menus.subtitles.OpenSubtitlesChoice")}
+          </CaptionOption>
           {content.length === 0 ? (
             <div className="p-4 rounded-xl bg-video-context-light bg-opacity-10 font-medium text-center">
               <div className="flex flex-col items-center justify-center gap-3">