From 739d2814fbff145436051fcb9f38469dce8e35ab Mon Sep 17 00:00:00 2001
From: Pas <74743263+Pasithea0@users.noreply.github.com>
Date: Thu, 17 Apr 2025 14:34:13 -0600
Subject: [PATCH] update captions selecting view

---
 src/assets/locales/en.json                      |  1 +
 .../player/atoms/settings/CaptionsView.tsx      | 17 +++++++++++++----
 .../settings/OpensubtitlesCaptionsView.tsx      |  1 +
 .../atoms/settings/SourceCaptionsView.tsx       |  1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index 8d342295..88373318 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -467,6 +467,7 @@
                 "customChoice": "Drop or upload file",
                 "customizeLabel": "Customize",
                 "offChoice": "Off",
+                "onChoice": "On",
                 "SourceChoice": "Source Captions",
                 "OpenSubtitlesChoice": "OpenSubtitles",
                 "settings": {
diff --git a/src/components/player/atoms/settings/CaptionsView.tsx b/src/components/player/atoms/settings/CaptionsView.tsx
index 6a776790..ff67f422 100644
--- a/src/components/player/atoms/settings/CaptionsView.tsx
+++ b/src/components/player/atoms/settings/CaptionsView.tsx
@@ -22,6 +22,7 @@ export function CaptionOption(props: {
   loading?: boolean;
   onClick?: () => void;
   error?: React.ReactNode;
+  flag?: boolean;
 }) {
   return (
     <SelectableLink
@@ -34,9 +35,11 @@ export function CaptionOption(props: {
         data-active-link={props.selected ? true : undefined}
         className="flex items-center"
       >
-        <span data-code={props.countryCode} className="mr-3 inline-flex">
-          <FlagIcon langCode={props.countryCode} />
-        </span>
+        {props.flag ? (
+          <span data-code={props.countryCode} className="mr-3 inline-flex">
+            <FlagIcon langCode={props.countryCode} />
+          </span>
+        ) : null}
         <span>{props.children}</span>
       </span>
     </SelectableLink>
@@ -92,7 +95,7 @@ export function CaptionsView({
   const { t } = useTranslation();
   const router = useOverlayRouter(id);
   const selectedCaptionId = usePlayerStore((s) => s.caption.selected?.id);
-  const { disable } = useCaptions();
+  const { disable, toggleLastUsed } = useCaptions();
   const [dragging, setDragging] = useState(false);
   const setCaption = usePlayerStore((s) => s.setCaption);
   const selectedCaptionLanguage = usePlayerStore(
@@ -192,6 +195,12 @@ export function CaptionsView({
           >
             {t("player.menus.subtitles.offChoice")}
           </CaptionOption>
+          <CaptionOption
+            onClick={() => toggleLastUsed().catch(() => {})}
+            selected={!!selectedCaptionId}
+          >
+            {t("player.menus.subtitles.onChoice")}
+          </CaptionOption>
           <CustomCaptionOption />
           <Menu.ChevronLink
             onClick={() =>
diff --git a/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx b/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx
index 8c8010c6..a6850b88 100644
--- a/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx
+++ b/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx
@@ -63,6 +63,7 @@ export function OpenSubtitlesCaptionView({
                 : undefined
             }
             onClick={() => startDownload(v.id)}
+            flag
           >
             {v.languageName}
           </CaptionOption>
diff --git a/src/components/player/atoms/settings/SourceCaptionsView.tsx b/src/components/player/atoms/settings/SourceCaptionsView.tsx
index 164cd98d..99074cb8 100644
--- a/src/components/player/atoms/settings/SourceCaptionsView.tsx
+++ b/src/components/player/atoms/settings/SourceCaptionsView.tsx
@@ -95,6 +95,7 @@ export function SourceCaptionsView({
                 : undefined
             }
             onClick={() => startDownload(v.id)}
+            flag
           >
             {v.languageName}
           </CaptionOption>