Add settings popout, add swipe stuff

Co-authored-by: mrjvs <mistrjvs@gmail.com>

package.json

@@ -6,7 +6,9 @@
   "dependencies": {
     "@formkit/auto-animate": "^1.0.0-beta.5",
     "@headlessui/react": "^1.5.0",
+    "@react-spring/web": "^9.7.1",
     "@types/react-helmet": "^6.1.6",
+    "@use-gesture/react": "^10.2.24",
     "crypto-js": "^4.1.1",
     "fscreen": "^1.2.0",
     "fuse.js": "^6.4.6",

src/components/Icon.tsx

@@ -36,6 +36,8 @@ export enum Icons {
   CASTING = "casting",
   CIRCLE_EXCLAMATION = "circle_exclamation",
   DOWNLOAD = "download",
+  GEAR = "gear",
+  WATCH_PARTY = "watch_party",
 }
 
 export interface IconProps {
@@ -74,11 +76,13 @@ const iconList: Record<Icons, string> = {
   skip_forward: `<svg width="1em" height="1em" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M11.3333 12.3333L16 7.66667M16 7.66667L11.3333 3M16 7.66667H6.66667C5.42899 7.66667 4.242 8.15833 3.36684 9.0335C2.49167 9.90867 2 11.0957 2 12.3333C2 13.571 2.49167 14.758 3.36684 15.6332C4.242 16.5083 5.42899 17 6.66667 17H9" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /><path d="M16.5043 14.2727V23H14.6591V16.0241H14.608L12.6094 17.277V15.6406L14.7699 14.2727H16.5043ZM22.0004 23.1918C21.2674 23.1889 20.6367 23.0085 20.1083 22.6506C19.5827 22.2926 19.1779 21.7741 18.8938 21.0952C18.6126 20.4162 18.4734 19.5994 18.4762 18.6449C18.4762 17.6932 18.6168 16.8821 18.8981 16.2116C19.1822 15.5412 19.587 15.0312 20.1126 14.6818C20.641 14.3295 21.2702 14.1534 22.0004 14.1534C22.7305 14.1534 23.3583 14.3295 23.8839 14.6818C24.4123 15.0341 24.8185 15.5455 25.1026 16.2159C25.3867 16.8835 25.5273 17.6932 25.5245 18.6449C25.5245 19.6023 25.3825 20.4205 25.0984 21.0994C24.8171 21.7784 24.4137 22.2969 23.8881 22.6548C23.3626 23.0128 22.7333 23.1918 22.0004 23.1918ZM22.0004 21.6619C22.5004 21.6619 22.8995 21.4105 23.1978 20.9077C23.4961 20.4048 23.6438 19.6506 23.641 18.6449C23.641 17.983 23.5728 17.4318 23.4364 16.9915C23.3029 16.5511 23.1126 16.2202 22.8654 15.9986C22.6211 15.777 22.3327 15.6662 22.0004 15.6662C21.5032 15.6662 21.1055 15.9148 20.8072 16.4119C20.5089 16.9091 20.3583 17.6534 20.3555 18.6449C20.3555 19.3153 20.4222 19.875 20.5558 20.3239C20.6921 20.7699 20.8839 21.1051 21.131 21.3295C21.3782 21.5511 21.668 21.6619 22.0004 21.6619Z" fill="currentColor" /></svg>`,
   skip_backward: `<svg width="1em" height="1em" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M13.6667 12.3333L9 7.66667M9 7.66667L13.6667 3M9 7.66667H18.3333C19.571 7.66667 20.758 8.15833 21.6332 9.0335C22.5083 9.90867 23 11.0957 23 12.3333C23 13.571 22.5083 14.758 21.6332 15.6332C20.758 16.5083 19.571 17 18.3333 17H16" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.50426 14.2727V23H2.65909V16.0241H2.60795L0.609375 17.277V15.6406L2.76989 14.2727H4.50426ZM10.0004 23.1918C9.2674 23.1889 8.63672 23.0085 8.10831 22.6506C7.58274 22.2926 7.17791 21.7741 6.89382 21.0952C6.61257 20.4162 6.47337 19.5994 6.47621 18.6449C6.47621 17.6932 6.61683 16.8821 6.89808 16.2116C7.18217 15.5412 7.587 15.0312 8.11257 14.6818C8.64098 14.3295 9.27024 14.1534 10.0004 14.1534C10.7305 14.1534 11.3583 14.3295 11.8839 14.6818C12.4123 15.0341 12.8185 15.5455 13.1026 16.2159C13.3867 16.8835 13.5273 17.6932 13.5245 18.6449C13.5245 19.6023 13.3825 20.4205 13.0984 21.0994C12.8171 21.7784 12.4137 22.2969 11.8881 22.6548C11.3626 23.0128 10.7333 23.1918 10.0004 23.1918ZM10.0004 21.6619C10.5004 21.6619 10.8995 21.4105 11.1978 20.9077C11.4961 20.4048 11.6438 19.6506 11.641 18.6449C11.641 17.983 11.5728 17.4318 11.4364 16.9915C11.3029 16.5511 11.1126 16.2202 10.8654 15.9986C10.6211 15.777 10.3327 15.6662 10.0004 15.6662C9.5032 15.6662 9.10547 15.9148 8.80717 16.4119C8.50888 16.9091 8.35831 17.6534 8.35547 18.6449C8.35547 19.3153 8.42223 19.875 8.55575 20.3239C8.69212 20.7699 8.88388 21.1051 9.13104 21.3295C9.3782 21.5511 9.66797 21.6619 10.0004 21.6619Z" fill="currentColor"/></svg>`,
   file: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file"><path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"></path><polyline points="13 2 13 9 20 9"></polyline></svg>`,
-  captions: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="currentColor" d="M0 96C0 60.7 28.7 32 64 32H512c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V96zM200 208c14.2 0 27 6.1 35.8 16c8.8 9.9 24 10.7 33.9 1.9s10.7-24 1.9-33.9c-17.5-19.6-43.1-32-71.5-32c-53 0-96 43-96 96s43 96 96 96c28.4 0 54-12.4 71.5-32c8.8-9.9 8-25-1.9-33.9s-25-8-33.9 1.9c-8.8 9.9-21.6 16-35.8 16c-26.5 0-48-21.5-48-48s21.5-48 48-48zm144 48c0-26.5 21.5-48 48-48c14.2 0 27 6.1 35.8 16c8.8 9.9 24 10.7 33.9 1.9s10.7-24 1.9-33.9c-17.5-19.6-43.1-32-71.5-32c-53 0-96 43-96 96s43 96 96 96c28.4 0 54-12.4 71.5-32c8.8-9.9 8-25-1.9-33.9s-25-8-33.9 1.9c-8.8 9.9-21.6 16-35.8 16c-26.5 0-48-21.5-48-48z"/></svg>`,
+  captions: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 25 20"><path transform="translate(-3 -6)" d="M25.5,6H5.5A2.507,2.507,0,0,0,3,8.5v15A2.507,2.507,0,0,0,5.5,26h20A2.507,2.507,0,0,0,28,23.5V8.5A2.507,2.507,0,0,0,25.5,6ZM5.5,16h5v2.5h-5ZM18,23.5H5.5V21H18Zm7.5,0h-5V21h5Zm0-5H13V16H25.5Z" fill="currentColor"/></svg>`,
   link: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>`,
   circle_exclamation: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zm0-384c13.3 0 24 10.7 24 24V264c0 13.3-10.7 24-24 24s-24-10.7-24-24V152c0-13.3 10.7-24 24-24zM224 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"/></svg>`,
   casting: "",
   download: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>`,
+  gear: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M481.9 166.6c3.2 8.7 .5 18.4-6.4 24.6l-30.9 28.1c-7.7 7.1-11.4 17.5-10.9 27.9c.1 2.9 .2 5.8 .2 8.8s-.1 5.9-.2 8.8c-.5 10.5 3.1 20.9 10.9 27.9l30.9 28.1c6.9 6.2 9.6 15.9 6.4 24.6c-4.4 11.9-9.7 23.3-15.8 34.3l-4.7 8.1c-6.6 11-14 21.4-22.1 31.2c-5.9 7.2-15.7 9.6-24.5 6.8l-39.7-12.6c-10-3.2-20.8-1.1-29.7 4.6c-4.9 3.1-9.9 6.1-15.1 8.7c-9.3 4.8-16.5 13.2-18.8 23.4l-8.9 40.7c-2 9.1-9 16.3-18.2 17.8c-13.8 2.3-28 3.5-42.5 3.5s-28.7-1.2-42.5-3.5c-9.2-1.5-16.2-8.7-18.2-17.8l-8.9-40.7c-2.2-10.2-9.5-18.6-18.8-23.4c-5.2-2.7-10.2-5.6-15.1-8.7c-8.8-5.7-19.7-7.8-29.7-4.6L69.1 425.9c-8.8 2.8-18.6 .3-24.5-6.8c-8.1-9.8-15.5-20.2-22.1-31.2l-4.7-8.1c-6.1-11-11.4-22.4-15.8-34.3c-3.2-8.7-.5-18.4 6.4-24.6l30.9-28.1c7.7-7.1 11.4-17.5 10.9-27.9c-.1-2.9-.2-5.8-.2-8.8s.1-5.9 .2-8.8c.5-10.5-3.1-20.9-10.9-27.9L8.4 191.2c-6.9-6.2-9.6-15.9-6.4-24.6c4.4-11.9 9.7-23.3 15.8-34.3l4.7-8.1c6.6-11 14-21.4 22.1-31.2c5.9-7.2 15.7-9.6 24.5-6.8l39.7 12.6c10 3.2 20.8 1.1 29.7-4.6c4.9-3.1 9.9-6.1 15.1-8.7c9.3-4.8 16.5-13.2 18.8-23.4l8.9-40.7c2-9.1 9-16.3 18.2-17.8C213.3 1.2 227.5 0 242 0s28.7 1.2 42.5 3.5c9.2 1.5 16.2 8.7 18.2 17.8l8.9 40.7c2.2 10.2 9.4 18.6 18.8 23.4c5.2 2.7 10.2 5.6 15.1 8.7c8.8 5.7 19.7 7.7 29.7 4.6l39.7-12.6c8.8-2.8 18.6-.3 24.5 6.8c8.1 9.8 15.5 20.2 22.1 31.2l4.7 8.1c6.1 11 11.4 22.4 15.8 34.3zM242 336a80 80 0 1 0 0-160 80 80 0 1 0 0 160z"/></svg>`,
+  watch_party: `<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M319.4 372c48.5-31.3 80.6-85.9 80.6-148c0-97.2-78.8-176-176-176S48 126.8 48 224c0 62.1 32.1 116.6 80.6 148c1.2 17.3 4 38 7.2 57.1l.2 1C56 395.8 0 316.5 0 224C0 100.3 100.3 0 224 0S448 100.3 448 224c0 92.5-56 171.9-136 206.1l.2-1.1c3.1-19.2 6-39.8 7.2-57zm-2.3-38.1c-1.6-5.7-3.9-11.1-7-16.2c-5.8-9.7-13.5-17-21.9-22.4c19.5-17.6 31.8-43 31.8-71.3c0-53-43-96-96-96s-96 43-96 96c0 28.3 12.3 53.8 31.8 71.3c-8.4 5.4-16.1 12.7-21.9 22.4c-3.1 5.1-5.4 10.5-7 16.2C99.8 307.5 80 268 80 224c0-79.5 64.5-144 144-144s144 64.5 144 144c0 44-19.8 83.5-50.9 109.9zM224 312c32.9 0 64 8.6 64 43.8c0 33-12.9 104.1-20.6 132.9c-5.1 19-24.5 23.4-43.4 23.4s-38.2-4.4-43.4-23.4c-7.8-28.5-20.6-99.7-20.6-132.8c0-35.1 31.1-43.8 64-43.8zm0-144a56 56 0 1 1 0 112 56 56 0 1 1 0-112z"/></svg>`,
 };
 
 function ChromeCastButton() {

src/setup/locales/en/translation.json

@@ -61,7 +61,8 @@
       "episodes": "Episodes",
       "source": "Source",
       "captions": "Captions",
-      "download": "Download"
+      "download": "Download",
+      "settings": "Settings"
     },
     "popouts": {
       "sources": "Sources",

src/video/components/VideoPlayer.tsx

@@ -30,7 +30,7 @@ import { ReactNode, useCallback, useState } from "react";
 import { PopoutProviderAction } from "@/video/components/popouts/PopoutProviderAction";
 import { ChromecastAction } from "@/video/components/actions/ChromecastAction";
 import { CastingTextAction } from "@/video/components/actions/CastingTextAction";
-import { DownloadAction } from "@/video/components/actions/DownloadAction";
+import { SettingsAction } from "./actions/SettingsAction";
 
 type Props = VideoPlayerBaseProps;
 
@@ -143,10 +143,8 @@ export function VideoPlayer(props: Props) {
                     <div className="grid w-full grid-cols-[56px,1fr,56px] items-center">
                       <div />
                       <div className="flex items-center justify-center">
-                        <DownloadAction />
-                        <CaptionsSelectionAction />
                         <SeriesSelectionAction />
-                        <SourceSelectionAction />
+                        <SettingsAction />
                       </div>
                       <FullscreenAction />
                     </div>
@@ -154,14 +152,11 @@ export function VideoPlayer(props: Props) {
                     <>
                       <LeftSideControls />
                       <div className="flex-1" />
-                      <QualityDisplayAction />
                       <SeriesSelectionAction />
-                      <SourceSelectionAction />
                       <div className="mx-2 h-6 w-px bg-white opacity-50" />
+                      <SettingsAction />
                       <ChromecastAction />
                       <AirplayAction />
-                      <DownloadAction />
-                      <CaptionsSelectionAction />
                       <FullscreenAction />
                     </>
                   )}

src/video/components/actions/CaptionsSelectionAction.tsx

@@ -1,34 +1,17 @@
 import { Icons } from "@/components/Icon";
-import { useVideoPlayerDescriptor } from "@/video/state/hooks";
-import { VideoPlayerIconButton } from "@/video/components/parts/VideoPlayerIconButton";
-import { useControls } from "@/video/state/logic/controls";
-import { PopoutAnchor } from "@/video/components/popouts/PopoutAnchor";
-import { useIsMobile } from "@/hooks/useIsMobile";
 import { useTranslation } from "react-i18next";
+import { PopoutListAction } from "../popouts/PopoutUtils";
 
 interface Props {
-  className?: string;
+  onClick: () => any;
 }
 
 export function CaptionsSelectionAction(props: Props) {
   const { t } = useTranslation();
-  const descriptor = useVideoPlayerDescriptor();
-  const controls = useControls(descriptor);
-  const { isMobile } = useIsMobile();
 
   return (
-    <div className={props.className}>
+    <PopoutListAction icon={Icons.CAPTIONS} onClick={props.onClick}>
-      <div className="relative">
+      {t("videoPlayer.buttons.captions")}
-        <PopoutAnchor for="captions">
+    </PopoutListAction>
-          <VideoPlayerIconButton
-            className={props.className}
-            text={isMobile ? (t("videoPlayer.buttons.captions") as string) : ""}
-            wide={isMobile}
-            onClick={() => controls.openPopout("captions")}
-            icon={Icons.CAPTIONS}
-          />
-        </PopoutAnchor>
-      </div>
-    </div>
   );
 }

src/video/components/actions/SettingsAction.tsx

@@ -0,0 +1,40 @@
+import { Icons } from "@/components/Icon";
+import { useVideoPlayerDescriptor } from "@/video/state/hooks";
+import { VideoPlayerIconButton } from "@/video/components/parts/VideoPlayerIconButton";
+import { useControls } from "@/video/state/logic/controls";
+import { PopoutAnchor } from "@/video/components/popouts/PopoutAnchor";
+import { useInterface } from "@/video/state/logic/interface";
+import { useIsMobile } from "@/hooks/useIsMobile";
+import { useTranslation } from "react-i18next";
+
+interface Props {
+  className?: string;
+}
+
+export function SettingsAction(props: Props) {
+  const { t } = useTranslation();
+  const descriptor = useVideoPlayerDescriptor();
+  const controls = useControls(descriptor);
+  const videoInterface = useInterface(descriptor);
+  const { isMobile } = useIsMobile(false);
+
+  return (
+    <div className={props.className}>
+      <div className="relative">
+        <PopoutAnchor for="settings">
+          <VideoPlayerIconButton
+            active={videoInterface.popout === "settings"}
+            className={props.className}
+            onClick={() => controls.openPopout("settings")}
+            text={
+              isMobile
+                ? (t("videoPlayer.buttons.settings") as string)
+                : undefined
+            }
+            icon={Icons.GEAR}
+          />
+        </PopoutAnchor>
+      </div>
+    </div>
+  );
+}

src/video/components/actions/SourceSelectionAction.tsx

@@ -1,35 +1,23 @@
-import { Icons } from "@/components/Icon";
+import { Icon, Icons } from "@/components/Icon";
-import { useVideoPlayerDescriptor } from "@/video/state/hooks";
-import { VideoPlayerIconButton } from "@/video/components/parts/VideoPlayerIconButton";
-import { useControls } from "@/video/state/logic/controls";
-import { PopoutAnchor } from "@/video/components/popouts/PopoutAnchor";
-import { useInterface } from "@/video/state/logic/interface";
 import { useTranslation } from "react-i18next";
+import { PopoutListAction } from "../popouts/PopoutUtils";
+import { QualityDisplayAction } from "./QualityDisplayAction";
 
 interface Props {
-  className?: string;
+  onClick?: () => any;
 }
 
 export function SourceSelectionAction(props: Props) {
   const { t } = useTranslation();
-  const descriptor = useVideoPlayerDescriptor();
-  const videoInterface = useInterface(descriptor);
-  const controls = useControls(descriptor);
 
   return (
-    <div className={props.className}>
+    <PopoutListAction
-      <div className="relative">
+      icon={Icons.CLAPPER_BOARD}
-        <PopoutAnchor for="source">
+      onClick={props.onClick}
-          <VideoPlayerIconButton
+      right={<QualityDisplayAction />}
-            active={videoInterface.popout === "source"}
+      noChevron
-            icon={Icons.CLAPPER_BOARD}
+    >
-            iconSize="text-xl"
+      {t("videoPlayer.buttons.source")}
-            text={t("videoPlayer.buttons.source") as string}
+    </PopoutListAction>
-            wide
-            onClick={() => controls.openPopout("source")}
-          />
-        </PopoutAnchor>
-      </div>
-    </div>
   );
 }

src/video/components/actions/list-entries/DownloadAction.tsx

@@ -3,39 +3,29 @@ import { useVideoPlayerDescriptor } from "@/video/state/hooks";
 import { useSource } from "@/video/state/logic/source";
 import { MWStreamType } from "@/backend/helpers/streams";
 import { normalizeTitle } from "@/utils/normalizeTitle";
-import { useIsMobile } from "@/hooks/useIsMobile";
 import { useTranslation } from "react-i18next";
 import { useMeta } from "@/video/state/logic/meta";
-import { VideoPlayerIconButton } from "../parts/VideoPlayerIconButton";
+import { PopoutListAction } from "../../popouts/PopoutUtils";
 
-interface Props {
+export function DownloadAction() {
-  className?: string;
-}
-
-export function DownloadAction(props: Props) {
   const descriptor = useVideoPlayerDescriptor();
   const sourceInterface = useSource(descriptor);
-  const { isMobile } = useIsMobile();
   const { t } = useTranslation();
   const meta = useMeta(descriptor);
 
   const isHLS = sourceInterface.source?.type === MWStreamType.HLS;
 
+  if (isHLS) return null;
+
   const title = meta?.meta.meta.title;
 
   return (
-    <a
+    <PopoutListAction
       href={isHLS ? undefined : sourceInterface.source?.url}
-      rel="noreferrer"
-      target="_blank"
       download={title ? normalizeTitle(title) : undefined}
+      icon={Icons.DOWNLOAD}
     >
-      <VideoPlayerIconButton
+      {t("videoPlayer.buttons.download")}
-        className={props.className}
+    </PopoutListAction>
-        icon={Icons.DOWNLOAD}
-        disabled={isHLS}
-        text={isMobile ? (t("videoPlayer.buttons.download") as string) : ""}
-      />
-    </a>
   );
 }

src/video/components/parts/VideoPlayerIconButton.tsx

@@ -33,7 +33,7 @@ export const VideoPlayerIconButton = forwardRef<
           className={[
             "flex items-center justify-center rounded-full bg-denim-600 bg-opacity-0 transition-colors duration-100",
             props.active ? "!bg-denim-500 !bg-opacity-100" : "",
-            !props.noPadding ? (props.wide ? "py-2 px-4" : "p-2") : "",
+            !props.noPadding ? (props.wide ? "p-2 sm:px-4" : "p-2") : "",
             !props.disabled
               ? "group-hover:bg-opacity-50 group-active:bg-denim-500 group-active:bg-opacity-100"
               : "",

src/video/components/popouts/PopoutProviderAction.tsx

@@ -1,8 +1,11 @@
+import { useDrag } from "@use-gesture/react";
+import { a, useSpring, config, easings } from "@react-spring/web";
 import { Transition } from "@/components/Transition";
 import { useSyncPopouts } from "@/video/components/hooks/useSyncPopouts";
 import { EpisodeSelectionPopout } from "@/video/components/popouts/EpisodeSelectionPopout";
 import { SourceSelectionPopout } from "@/video/components/popouts/SourceSelectionPopout";
 import { CaptionSelectionPopout } from "@/video/components/popouts/CaptionSelectionPopout";
+import { SettingsPopout } from "@/video/components/popouts/SettingsPopout";
 import { useVideoPlayerDescriptor } from "@/video/state/hooks";
 import { useControls } from "@/video/state/logic/controls";
 import { useIsMobile } from "@/hooks/useIsMobile";
@@ -25,6 +28,7 @@ function ShowPopout(props: { popoutId: string | null }) {
   if (popoutId === "episodes") return <EpisodeSelectionPopout />;
   if (popoutId === "source") return <SourceSelectionPopout />;
   if (popoutId === "captions") return <CaptionSelectionPopout />;
+  if (popoutId === "settings") return <SettingsPopout />;
   return (
     <div className="flex w-full items-center justify-center p-10">
       Unknown popout
@@ -32,14 +36,74 @@ function ShowPopout(props: { popoutId: string | null }) {
   );
 }
 
-function PopoutContainer(props: { videoInterface: VideoInterfaceEvent }) {
+function MobilePopoutContainer(props: {
+  videoInterface: VideoInterfaceEvent;
+  onClose: () => void;
+}) {
+  const ref = useRef<HTMLDivElement>(null);
+  const height = 500;
+  const closing = useRef<boolean>(false);
+  const [{ y }, api] = useSpring(() => ({
+    y: 0,
+    onRest() {
+      if (!closing.current) return;
+      props.onClose();
+    },
+  }));
+
+  const bind = useDrag(
+    ({ last, velocity: [, vy], direction: [, dy], movement: [, my] }) => {
+      if (closing.current) return;
+      if (last) {
+        if (my > height * 0.5 || (vy > 0.5 && dy > 0)) {
+          api.start({
+            y: height * 1.2,
+            immediate: false,
+            config: { ...config.wobbly, velocity: vy, clamp: true },
+          });
+          closing.current = true;
+        } else {
+          api.start({
+            y: 0,
+            immediate: false,
+            config: config.wobbly,
+          });
+        }
+      } else {
+        api.start({ y: my, immediate: true });
+      }
+    },
+    {
+      from: () => [0, y.get()],
+      filterTaps: true,
+      bounds: { top: 0 },
+      rubberband: true,
+    }
+  );
+
+  return (
+    <a.div
+      ref={ref}
+      className="absolute inset-x-0 -bottom-[200px] z-10 mx-auto grid h-[700px] max-w-[400px] touch-none grid-rows-[auto,minmax(0,1fr)] overflow-hidden rounded-t-lg bg-ash-200"
+      style={{
+        y,
+      }}
+      {...bind()}
+    >
+      <div className="mx-auto mt-3 -mb-3 h-1 w-12 rounded-full bg-ash-500 bg-opacity-30" />
+      <ShowPopout popoutId={props.videoInterface.popout} />
+    </a.div>
+  );
+}
+
+function DesktopPopoutContainer(props: {
+  videoInterface: VideoInterfaceEvent;
+}) {
   const ref = useRef<HTMLDivElement>(null);
   const [right, setRight] = useState<number>(0);
   const [bottom, setBottom] = useState<number>(0);
   const [width, setWidth] = useState<number>(0);
 
-  const { isMobile } = useIsMobile(true);
-
   const calculateAndSetCoords = useCallback((rect: DOMRect, w: number) => {
     const buttonCenter = rect.left + rect.width / 2;
 
@@ -58,19 +122,16 @@ function PopoutContainer(props: { videoInterface: VideoInterfaceEvent }) {
   }, []);
 
   return (
-    <div
+    <a.div
       ref={ref}
-      className={[
+      className="absolute z-10 grid h-[500px] w-80 touch-none grid-rows-[auto,minmax(0,1fr)] overflow-hidden rounded-lg bg-ash-200"
-        "absolute z-10 grid w-80 grid-rows-[auto,minmax(0,1fr)] overflow-hidden rounded-lg bg-ash-200",
-        isMobile ? "h-[230px]" : " h-[500px]",
-      ].join(" ")}
       style={{
         right: `${right}px`,
         bottom: `${bottom}px`,
       }}
     >
       <ShowPopout popoutId={props.videoInterface.popout} />
-    </div>
+    </a.div>
   );
 }
 
@@ -78,6 +139,7 @@ export function PopoutProviderAction() {
   const descriptor = useVideoPlayerDescriptor();
   const videoInterface = useInterface(descriptor);
   const controls = useControls(descriptor);
+  const { isMobile } = useIsMobile(false);
   useSyncPopouts(descriptor);
 
   const handleClick = useCallback(() => {
@@ -92,7 +154,14 @@ export function PopoutProviderAction() {
     >
       <div className="popout-wrapper pointer-events-auto absolute inset-0">
         <div onClick={handleClick} className="absolute inset-0" />
-        <PopoutContainer videoInterface={videoInterface} />
+        {isMobile ? (
+          <MobilePopoutContainer
+            videoInterface={videoInterface}
+            onClose={handleClick}
+          />
+        ) : (
+          <DesktopPopoutContainer videoInterface={videoInterface} />
+        )}
       </div>
     </Transition>
   );

src/video/components/popouts/PopoutUtils.tsx

@@ -3,16 +3,32 @@ import { Spinner } from "@/components/layout/Spinner";
 import { ProgressRing } from "@/components/layout/ProgressRing";
 import { createRef, useEffect, useRef } from "react";
 
-interface PopoutListEntryTypes {
+interface PopoutListEntryBaseTypes {
   active?: boolean;
   children: React.ReactNode;
   onClick?: () => void;
   isOnDarkBackground?: boolean;
+}
+
+interface PopoutListEntryTypes extends PopoutListEntryBaseTypes {
   percentageCompleted?: number;
   loading?: boolean;
   errored?: boolean;
 }
 
+interface PopoutListEntryRootTypes extends PopoutListEntryBaseTypes {
+  right?: React.ReactNode;
+  noChevron?: boolean;
+}
+
+interface PopoutListActionTypes extends PopoutListEntryBaseTypes {
+  icon?: Icons;
+  right?: React.ReactNode;
+  download?: string;
+  href?: string;
+  noChevron?: boolean;
+}
+
 interface ScrollToActiveProps {
   children: React.ReactNode;
   className?: string;
@@ -87,7 +103,7 @@ export function PopoutSection(props: PopoutSectionProps) {
   );
 }
 
-export function PopoutListEntry(props: PopoutListEntryTypes) {
+export function PopoutListEntryBase(props: PopoutListEntryRootTypes) {
   const bg = props.isOnDarkBackground ? "bg-ash-200" : "bg-ash-400";
   const hover = props.isOnDarkBackground
     ? "hover:bg-ash-200"
@@ -108,34 +124,83 @@ export function PopoutListEntry(props: PopoutListEntryTypes) {
         <div className="absolute left-0 h-8 w-0.5 bg-bink-500" />
       )}
       <span className="truncate">{props.children}</span>
-      <div className="relative h-4 w-4 min-w-[1rem]">
+      <div className="relative min-h-[1rem] min-w-[1rem]">
-        {props.errored && (
+        {!props.noChevron && (
-          <Icon
-            icon={Icons.WARNING}
-            className="absolute inset-0 text-rose-400"
-          />
-        )}
-        {props.loading && !props.errored && (
-          <Spinner className="absolute inset-0 text-base [--color:#9C93B5]" />
-        )}
-        {!props.loading && !props.errored && (
           <Icon
             className="absolute inset-0 translate-x-2 text-white opacity-0 transition-[opacity,transform] duration-100 group-hover:translate-x-0 group-hover:opacity-100"
             icon={Icons.CHEVRON_RIGHT}
           />
         )}
-        {props.percentageCompleted && !props.loading && !props.errored ? (
+        {props.right}
-          <ProgressRing
-            className="absolute inset-0 text-bink-600 opacity-100 transition-[opacity] group-hover:opacity-0"
-            backingRingClassname="stroke-ash-500"
-            percentage={
-              props.percentageCompleted > 90 ? 100 : props.percentageCompleted
-            }
-          />
-        ) : (
-          ""
-        )}
       </div>
     </div>
   );
 }
+
+export function PopoutListEntry(props: PopoutListEntryTypes) {
+  return (
+    <PopoutListEntryBase
+      isOnDarkBackground={props.isOnDarkBackground}
+      active={props.active}
+      onClick={props.onClick}
+      noChevron={!props.loading && !props.errored}
+      right={
+        <>
+          {props.errored && (
+            <Icon
+              icon={Icons.WARNING}
+              className="absolute inset-0 text-rose-400"
+            />
+          )}
+          {props.loading && !props.errored && (
+            <Spinner className="absolute inset-0 text-base [--color:#9C93B5]" />
+          )}
+          {props.percentageCompleted && !props.loading && !props.errored ? (
+            <ProgressRing
+              className="absolute inset-0 text-bink-600 opacity-100 transition-[opacity] group-hover:opacity-0"
+              backingRingClassname="stroke-ash-500"
+              percentage={
+                props.percentageCompleted > 90 ? 100 : props.percentageCompleted
+              }
+            />
+          ) : (
+            ""
+          )}
+        </>
+      }
+    >
+      {props.children}
+    </PopoutListEntryBase>
+  );
+}
+
+export function PopoutListAction(props: PopoutListActionTypes) {
+  const entry = (
+    <PopoutListEntryBase
+      active={props.active}
+      isOnDarkBackground={props.isOnDarkBackground}
+      right={props.right}
+      onClick={props.href ? undefined : props.onClick}
+      noChevron={props.noChevron}
+    >
+      <div className="flex items-center space-x-3">
+        {props.icon ? <Icon className="text-xl" icon={props.icon} /> : null}
+        <div>{props.children}</div>
+      </div>
+    </PopoutListEntryBase>
+  );
+
+  return props.href ? (
+    <a
+      href={props.href ? props.href : undefined}
+      rel="noreferrer"
+      target="_blank"
+      download={props.download ? props.download : undefined}
+      onClick={props.onClick}
+    >
+      {entry}
+    </a>
+  ) : (
+    entry
+  );
+}

src/video/components/popouts/SettingsPopout.tsx

@@ -0,0 +1,22 @@
+import { DownloadAction } from "@/video/components/actions/list-entries/DownloadAction";
+import { useState } from "react";
+import { CaptionsSelectionAction } from "../actions/CaptionsSelectionAction";
+import { SourceSelectionAction } from "../actions/SourceSelectionAction";
+import { CaptionSelectionPopout } from "./CaptionSelectionPopout";
+import { PopoutSection } from "./PopoutUtils";
+import { SourceSelectionPopout } from "./SourceSelectionPopout";
+
+export function SettingsPopout() {
+  const [popoutId, setPopoutId] = useState("");
+
+  if (popoutId === "source") return <SourceSelectionPopout />;
+  if (popoutId === "captions") return <CaptionSelectionPopout />;
+
+  return (
+    <PopoutSection>
+      <DownloadAction />
+      <SourceSelectionAction onClick={() => setPopoutId("source")} />
+      <CaptionsSelectionAction onClick={() => setPopoutId("captions")} />
+    </PopoutSection>
+  );
+}