fix(tv): center option label when no checkmark shown

The inner row applied a constant left padding meant to balance the
checkmark group on selected cards. On base cards (no checkmark) it
pushed the label slightly right, off-center. Apply the offset only
when the checkmark is rendered (selected and unfocused).

.claude/learned-facts/use-network-aware-query-client-limitations.md

@@ -6,6 +6,4 @@
 
 ## Detail
 
-**Updated 2026-06-29**: This limitation no longer applies. The hook was rewritten to use a `Proxy` (not `Object.create`). It overrides only `invalidateQueries` (network-aware) / `forceInvalidateQueries`, and binds every other method to the real `queryClient` target (`value.bind(target)`). So private-field methods like `getQueriesData`, `setQueryData`, and `removeQueries` work correctly through it now — no need to fall back to a separate `useQueryClient`. (Confirmed when adding `queryClient.removeQueries` to `clearAllJellyseerData` in `hooks/useJellyseerr.ts`.)
+The `useNetworkAwareQueryClient` hook uses `Object.create(queryClient)` which breaks QueryClient methods that use JavaScript private fields (like `getQueriesData`, `setQueriesData`, `setQueryData`). Only use it when you ONLY need `invalidateQueries`. For cache manipulation, use standard `useQueryClient` from `@tanstack/react-query`.
-
-Historical (pre-2026-06): the hook used `Object.create(queryClient)`, which broke methods relying on JavaScript private fields; back then only `invalidateQueries` was safe.

.github/workflows/build-apps.yml

@@ -57,7 +57,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
@@ -79,7 +79,7 @@ jobs:
           java-version: "17"
 
       - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.gradle/caches/modules-2
@@ -92,7 +92,7 @@ jobs:
         run: bun run prebuild
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: android/.gradle
           key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -157,7 +157,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
@@ -179,7 +179,7 @@ jobs:
           java-version: "17"
 
       - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.gradle/caches/modules-2
@@ -192,7 +192,7 @@ jobs:
         run: bun run prebuild:tv
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: android/.gradle
           key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -244,7 +244,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
@@ -316,7 +316,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
@@ -383,7 +383,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
@@ -453,7 +453,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}

.github/workflows/check-lockfile.yml

@@ -33,7 +33,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.bun/install/cache

.github/workflows/linting.yml

@@ -114,7 +114,7 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           # renovate: datasource=node-version depName=node versioning=node
-          node-version: "24.18.0"
+          node-version: "24.17.0"
 
       - name: "🍞 Setup Bun"
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0

.github/workflows/release.yml

@@ -77,7 +77,7 @@ jobs:
           bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}

README.md

@@ -73,7 +73,7 @@ Thanks to [@Alexk2309](https://github.com/Alexk2309) for the hard work building
 
 ## 🛣️ Roadmap
 
-Check out our [Roadmap](https://github.com/orgs/streamyfin/projects/3/views/1) to see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
+Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
 
 ## 📥 Download Streamyfin
 

app/(auth)/(tabs)/(home)/settings.tv.tsx

@@ -1,13 +1,12 @@
 import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "@tanstack/react-query";
 import { Directory, Paths } from "expo-file-system";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
-import { useCallback, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
 import { TVPINEntryModal } from "@/components/login/TVPINEntryModal";
@@ -22,7 +21,6 @@ import {
   TVSettingsToggle,
 } from "@/components/tv";
 import { useScaledTVTypography } from "@/constants/TVTypography";
-import { JellyseerrApi, useJellyseerr } from "@/hooks/useJellyseerr";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { useTVUserSwitchModal } from "@/hooks/useTVUserSwitchModal";
 import { APP_LANGUAGES } from "@/i18n";
@@ -38,6 +36,7 @@ import {
   InactivityTimeout,
   type MpvCacheMode,
   type MpvVoDriver,
+  type SegmentSkipMode,
   TVTypographyScale,
   useSettings,
 } from "@/utils/atoms/settings";
@@ -49,10 +48,26 @@ import {
 } from "@/utils/secureCredentials";
 import { clearTopShelfCacheSafely } from "@/utils/topshelf/cache";
 
+const SEGMENT_SKIP_ROWS: {
+  key:
+    | "skipIntro"
+    | "skipOutro"
+    | "skipRecap"
+    | "skipCommercial"
+    | "skipPreview";
+  labelKey: string;
+}[] = [
+  { key: "skipIntro", labelKey: "skip_intro" },
+  { key: "skipOutro", labelKey: "skip_outro" },
+  { key: "skipRecap", labelKey: "skip_recap" },
+  { key: "skipCommercial", labelKey: "skip_commercial" },
+  { key: "skipPreview", labelKey: "skip_preview" },
+];
+
 export default function SettingsTV() {
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
-  const { settings, updateSettings, pluginSettings } = useSettings();
+  const { settings, updateSettings } = useSettings();
   const { logout, loginWithSavedCredential, loginWithPassword } = useJellyfin();
   const [user] = useAtom(userAtom);
   const [api] = useAtom(apiAtom);
@@ -61,51 +76,6 @@ export default function SettingsTV() {
   const { showUserSwitchModal } = useTVUserSwitchModal();
   const typography = useScaledTVTypography();
   const queryClient = useQueryClient();
-  const { jellyseerrApi, setJellyseerrUser, clearAllJellyseerData } =
-    useJellyseerr();
-
-  // Jellyseerr connection state
-  const [jellyseerrServerUrl, setJellyseerrServerUrl] = useState(
-    settings.jellyseerrServerUrl || "",
-  );
-  const [jellyseerrPassword, setJellyseerrPassword] = useState("");
-
-  const isJellyseerrLocked =
-    pluginSettings?.jellyseerrServerUrl?.locked === true;
-  const isJellyseerrConnected = !!jellyseerrApi;
-
-  const handleJellyseerrUrlBlur = useCallback(() => {
-    const url = jellyseerrServerUrl.trim();
-    updateSettings({ jellyseerrServerUrl: url || undefined });
-  }, [jellyseerrServerUrl, updateSettings]);
-
-  const jellyseerrLoginMutation = useMutation({
-    mutationFn: async () => {
-      const url = jellyseerrServerUrl.trim();
-      if (!url) throw new Error("Missing server url");
-      if (!user?.Name) throw new Error("Missing user info");
-      const tempApi = new JellyseerrApi(url);
-      const testResult = await tempApi.test();
-      if (!testResult.isValid) throw new Error("Invalid server url");
-      return tempApi.login(user.Name, jellyseerrPassword);
-    },
-    onSuccess: (loggedInUser) => {
-      setJellyseerrUser(loggedInUser);
-      updateSettings({ jellyseerrServerUrl: jellyseerrServerUrl.trim() });
-    },
-    onError: () => {
-      toast.error(t("jellyseerr.failed_to_login"));
-    },
-    onSettled: () => {
-      setJellyseerrPassword("");
-    },
-  });
-
-  const handleDisconnectJellyseerr = useCallback(() => {
-    clearAllJellyseerData();
-    setJellyseerrServerUrl("");
-    setJellyseerrPassword("");
-  }, [clearAllJellyseerData]);
 
   // Local state for OpenSubtitles API key (only commit on blur)
   const [openSubtitlesApiKey, setOpenSubtitlesApiKey] = useState(
@@ -582,6 +552,30 @@ export default function SettingsTV() {
     );
   }, [inactivityTimeoutOptions, t]);
 
+  // Segment skip: same auto/ask/none choice for every segment type.
+  const segmentSkipModeLabel = (mode: SegmentSkipMode) =>
+    t(`home.settings.other.segment_skip_${mode}`);
+
+  const buildSegmentSkipOptions = (
+    current: SegmentSkipMode,
+  ): TVOptionItem<SegmentSkipMode>[] => [
+    {
+      label: t("home.settings.other.segment_skip_auto"),
+      value: "auto",
+      selected: current === "auto",
+    },
+    {
+      label: t("home.settings.other.segment_skip_ask"),
+      value: "ask",
+      selected: current === "ask",
+    },
+    {
+      label: t("home.settings.other.segment_skip_none"),
+      value: "none",
+      selected: current === "none",
+    },
+  ];
+
   return (
     <View style={{ flex: 1, backgroundColor: "#000000" }}>
       <View style={{ flex: 1 }}>
@@ -866,6 +860,30 @@ export default function SettingsTV() {
             formatValue={(v) => `${v} MB`}
           />
 
+          {/* Segment Skip Section */}
+          <TVSectionHeader
+            title={t("home.settings.other.segment_skip_settings")}
+          />
+          {SEGMENT_SKIP_ROWS.map((row, index) => {
+            const current = (settings[row.key] ?? "ask") as SegmentSkipMode;
+            const rowLabel = t(`home.settings.other.${row.labelKey}`);
+            return (
+              <TVSettingsOptionButton
+                key={row.key}
+                label={rowLabel}
+                value={segmentSkipModeLabel(current)}
+                isFirst={index === 0}
+                onPress={() =>
+                  showOptions({
+                    title: rowLabel,
+                    options: buildSegmentSkipOptions(current),
+                    onSelect: (value) => updateSettings({ [row.key]: value }),
+                  })
+                }
+              />
+            );
+          })}
+
           {/* Appearance Section */}
           <TVSectionHeader title={t("home.settings.appearance.title")} />
           <TVSettingsOptionButton
@@ -924,72 +942,6 @@ export default function SettingsTV() {
             onToggle={(value) => updateSettings({ tvThemeMusicEnabled: value })}
           />
 
-          {/* seerr Section */}
-          <TVSectionHeader title='seerr' />
-          <Text
-            style={{
-              color: "#9CA3AF",
-              fontSize: typography.callout - 2,
-              marginBottom: 16,
-              marginLeft: 8,
-            }}
-          >
-            {t("home.settings.plugins.jellyseerr.server_url_hint")}
-          </Text>
-          <TVSettingsTextInput
-            label={t("home.settings.plugins.jellyseerr.server_url")}
-            value={jellyseerrServerUrl}
-            placeholder={t(
-              "home.settings.plugins.jellyseerr.server_url_placeholder",
-            )}
-            onChangeText={setJellyseerrServerUrl}
-            onBlur={handleJellyseerrUrlBlur}
-            disabled={isJellyseerrLocked || jellyseerrLoginMutation.isPending}
-          />
-          {!isJellyseerrConnected && !isJellyseerrLocked && (
-            <>
-              <TVSettingsTextInput
-                label={t("home.settings.plugins.jellyseerr.password")}
-                value={jellyseerrPassword}
-                placeholder={t(
-                  "home.settings.plugins.jellyseerr.password_placeholder",
-                  { username: user?.Name },
-                )}
-                onChangeText={setJellyseerrPassword}
-                secureTextEntry
-                disabled={jellyseerrLoginMutation.isPending}
-              />
-              <TVSettingsOptionButton
-                label={
-                  jellyseerrLoginMutation.isPending
-                    ? t("common.connecting")
-                    : t("common.connect")
-                }
-                value=''
-                onPress={() => jellyseerrLoginMutation.mutate()}
-                disabled={jellyseerrLoginMutation.isPending}
-              />
-            </>
-          )}
-          <TVSettingsRow
-            label={
-              isJellyseerrConnected
-                ? t("common.connected")
-                : t("common.not_connected")
-            }
-            value=''
-            showChevron={false}
-          />
-          {isJellyseerrConnected && !isJellyseerrLocked && (
-            <TVSettingsOptionButton
-              label={t(
-                "home.settings.plugins.jellyseerr.reset_jellyseerr_config_button",
-              )}
-              value=''
-              onPress={handleDisconnectJellyseerr}
-            />
-          )}
-
           {/* Storage Section */}
           <TVSectionHeader title={t("home.settings.storage.storage_title")} />
           <TVSettingsOptionButton

app/(auth)/(tabs)/(home)/settings/segment-skip/page.tsx

@@ -0,0 +1,101 @@
+import { Ionicons } from "@expo/vector-icons";
+import { useNavigation } from "expo-router";
+import { TFunction } from "i18next";
+import { useEffect, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { ListGroup } from "@/components/list/ListGroup";
+import { ListItem } from "@/components/list/ListItem";
+import { PlatformDropdown } from "@/components/PlatformDropdown";
+import { SegmentSkipMode, useSettings } from "@/utils/atoms/settings";
+
+type SkipSettingKey =
+  | "skipIntro"
+  | "skipOutro"
+  | "skipRecap"
+  | "skipCommercial"
+  | "skipPreview";
+
+const SEGMENTS: ReadonlyArray<{ key: SkipSettingKey; labelKey: string }> = [
+  { key: "skipIntro", labelKey: "skip_intro" },
+  { key: "skipOutro", labelKey: "skip_outro" },
+  { key: "skipRecap", labelKey: "skip_recap" },
+  { key: "skipCommercial", labelKey: "skip_commercial" },
+  { key: "skipPreview", labelKey: "skip_preview" },
+];
+
+const SEGMENT_SKIP_OPTIONS = (
+  t: TFunction<"translation", undefined>,
+): Array<{ label: string; value: SegmentSkipMode }> => [
+  { label: t("home.settings.other.segment_skip_auto"), value: "auto" },
+  { label: t("home.settings.other.segment_skip_ask"), value: "ask" },
+  { label: t("home.settings.other.segment_skip_none"), value: "none" },
+];
+
+export default function SegmentSkipPage() {
+  const { settings, updateSettings, pluginSettings } = useSettings();
+  const { t } = useTranslation();
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    navigation.setOptions({
+      title: t("home.settings.other.segment_skip_settings"),
+    });
+  }, [navigation, t]);
+
+  const options = useMemo(() => SEGMENT_SKIP_OPTIONS(t), [t]);
+
+  if (!settings) return null;
+
+  return (
+    <View className='px-4'>
+      <ListGroup>
+        {SEGMENTS.map(({ key, labelKey }) => {
+          const current = settings[key];
+          const locked = pluginSettings?.[key]?.locked ?? false;
+          const groups = [
+            {
+              options: options.map((o) => ({
+                type: "radio" as const,
+                label: o.label,
+                value: o.value,
+                selected: o.value === current,
+                disabled: locked,
+                onPress: () => {
+                  if (locked) return;
+                  updateSettings({ [key]: o.value });
+                },
+              })),
+            },
+          ];
+          return (
+            <ListItem
+              key={key}
+              title={t(`home.settings.other.${labelKey}`)}
+              subtitle={t(`home.settings.other.${labelKey}_description`)}
+              disabled={locked}
+            >
+              <PlatformDropdown
+                groups={groups}
+                trigger={
+                  <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                    <Text className='mr-1 text-[#8E8D91]'>
+                      {t(`home.settings.other.segment_skip_${current}`)}
+                    </Text>
+                    <Ionicons
+                      name='chevron-expand-sharp'
+                      size={18}
+                      color='#5A5960'
+                    />
+                  </View>
+                }
+                title={t(`home.settings.other.${labelKey}`)}
+              />
+            </ListItem>
+          );
+        })}
+      </ListGroup>
+    </View>
+  );
+}

app/(auth)/(tabs)/(search)/index.tsx

@@ -7,12 +7,7 @@ import { useAsyncDebouncer } from "@tanstack/react-pacer";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { Image } from "expo-image";
-import {
+import { useLocalSearchParams, useNavigation, useSegments } from "expo-router";
-  useIsFocused,
-  useLocalSearchParams,
-  useNavigation,
-  useSegments,
-} from "expo-router";
 import { useAtom } from "jotai";
 import { orderBy, uniqBy } from "lodash";
 import {
@@ -25,13 +20,7 @@ import {
   useState,
 } from "react";
 import { useTranslation } from "react-i18next";
-import {
+import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
-  Alert,
-  Platform,
-  ScrollView,
-  TouchableOpacity,
-  View,
-} from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
 import { Text } from "@/components/common/Text";
@@ -52,10 +41,7 @@ import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
 import { SearchTabButtons } from "@/components/search/SearchTabButtons";
 import { TVSearchPage } from "@/components/search/TVSearchPage";
 import useRouter from "@/hooks/useAppRouter";
-import {
+import { useJellyseerr } from "@/hooks/useJellyseerr";
-  useJellyseerr,
-  validateJellyseerrSession,
-} from "@/hooks/useJellyseerr";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
@@ -120,40 +106,8 @@ export default function SearchPage() {
 
   const [api] = useAtom(apiAtom);
 
-  const isFocused = useIsFocused();
   const { settings } = useSettings();
   const { jellyseerrApi } = useJellyseerr();
-
-  // Prompt the user to connect when a Jellyseerr server is configured but no
-  // session exists yet (only once per focus, and only while the tab is focused).
-  const jellyseerrAlertedRef = useRef(false);
-  useEffect(() => {
-    if (!isFocused || !settings?.jellyseerrServerUrl || jellyseerrApi) return;
-    if (jellyseerrAlertedRef.current) return;
-    jellyseerrAlertedRef.current = true;
-    Alert.alert(
-      t("jellyseerr.connect_to_jellyseerr"),
-      t("jellyseerr.connect_in_settings"),
-    );
-  }, [isFocused, settings?.jellyseerrServerUrl, jellyseerrApi, t]);
-
-  // Validate the Jellyseerr session when switching to Discover; warn if expired.
-  useEffect(() => {
-    if (
-      searchType !== "Discover" ||
-      !jellyseerrApi ||
-      !settings?.jellyseerrServerUrl
-    )
-      return;
-    validateJellyseerrSession(settings.jellyseerrServerUrl).then((status) => {
-      if (status.valid) return;
-      Alert.alert(
-        t("jellyseerr.session_expired"),
-        t("jellyseerr.session_expired_connect_again"),
-      );
-    });
-  }, [searchType, jellyseerrApi, settings?.jellyseerrServerUrl, t]);
-
   const [jellyseerrOrderBy, setJellyseerrOrderBy] =
     useState<JellyseerrSearchSort>(
       JellyseerrSearchSort[
@@ -351,8 +305,6 @@ export default function SearchPage() {
         },
         hideWhenScrolling: false,
         autoFocus: false,
-        // Android: color of the user-typed text (was dark and unreadable on the dark header)
-        textColor: "#fff",
         // Android: placeholder and icon color
         hintTextColor: "#fff",
         headerIconColor: "#fff",

app/(auth)/(tabs)/_layout.tsx

@@ -3,24 +3,16 @@ import {
   type NativeBottomTabNavigationEventMap,
   type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { Stack, useSegments, withLayoutContext } from "expo-router";
+import { withLayoutContext } from "expo-router";
 import type {
   ParamListBase,
   TabNavigationState,
 } from "expo-router/react-navigation";
-import { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
-import type { TVNavBarTab } from "@/components/tv/TVNavBar";
-import { TVNavBar } from "@/components/tv/TVNavBar";
 import { Colors } from "@/constants/Colors";
-import useRouter from "@/hooks/useAppRouter";
+import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
-import {
-  isTabRoute,
-  useTVHomeBackHandler,
-  useTVTabRootBackHandler,
-} from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
 
@@ -41,108 +33,13 @@ export const NativeTabs = withLayoutContext<
   NativeBottomTabNavigationEventMap
 >(Navigator);
 
-const IS_ANDROID_TV = Platform.isTV && Platform.OS === "android";
-
-function TVTabLayout() {
-  const { settings } = useSettings();
-  const { t } = useTranslation();
-  const segments = useSegments();
-  const router = useRouter();
-
-  const currentTab = segments.find(isTabRoute);
-  const lastSegment = segments[segments.length - 1] ?? "";
-  const atTabRoot = isTabRoute(lastSegment) || lastSegment === "index";
-
-  const tabs: TVNavBarTab[] = useMemo(
-    () =>
-      [
-        { key: "(home)", label: t("tabs.home") },
-        { key: "(search)", label: t("tabs.search") },
-        { key: "(favorites)", label: t("tabs.favorites") },
-        !settings?.streamyStatsServerUrl || settings?.hideWatchlistsTab
-          ? null
-          : { key: "(watchlists)", label: t("watchlists.title") },
-        { key: "(libraries)", label: t("tabs.library") },
-        !settings?.showCustomMenuLinks
-          ? null
-          : { key: "(custom-links)", label: t("tabs.custom_links") },
-        { key: "(settings)", label: t("tabs.settings") },
-      ].filter((tab): tab is TVNavBarTab => tab !== null),
-    [
-      settings?.streamyStatsServerUrl,
-      settings?.hideWatchlistsTab,
-      settings?.showCustomMenuLinks,
-      t,
-    ],
-  );
-
-  const activeTabKey = currentTab ?? "(home)";
-
-  const visibleKeys = useMemo(
-    () => new Set(tabs.map((tab) => tab.key)),
-    [tabs],
-  );
-
-  const handleTabChange = useCallback(
-    (key: string) => {
-      if (key === currentTab) return;
-
-      if (key === "(home)") eventBus.emit("scrollToTop");
-      if (key === "(search)") eventBus.emit("searchTabPressed");
-
-      router.replace(`/(auth)/(tabs)/${key}`);
-    },
-    [currentTab, router],
-  );
-
-  const navigateHome = useCallback(() => {
-    router.replace("/(auth)/(tabs)/(home)");
-  }, [router]);
-  useTVTabRootBackHandler(navigateHome, atTabRoot, currentTab);
-
-  // If current tab is no longer visible (setting changed), navigate to home
-  useEffect(() => {
-    if (!visibleKeys.has(activeTabKey) && activeTabKey !== "(home)") {
-      router.replace("/(auth)/(tabs)/(home)");
-    }
-  }, [visibleKeys, activeTabKey, router]);
-
-  return (
-    <View style={{ flex: 1 }}>
-      <SystemBars hidden={false} style='light' />
-      <Stack
-        screenOptions={{ headerShown: false, animation: "none" }}
-        initialRouteName='(home)'
-      >
-        <Stack.Screen name='index' redirect />
-      </Stack>
-      <TVNavBar
-        tabs={tabs}
-        activeTabKey={activeTabKey}
-        onTabChange={handleTabChange}
-        style={{
-          position: "absolute",
-          top: 0,
-          left: 0,
-          right: 0,
-          zIndex: 1000,
-        }}
-      />
-    </View>
-  );
-}
-
 export default function TabLayout() {
   const { settings } = useSettings();
   const { t } = useTranslation();
 
-  // Must be called before any conditional return (rules of hooks)
+  // Handle TV back button - prevent app exit when at root
   useTVHomeBackHandler();
 
-  if (IS_ANDROID_TV) {
-    return <TVTabLayout />;
-  }
-
   return (
     <View style={{ flex: 1 }}>
       <SystemBars hidden={false} style='light' />

app/(auth)/player/direct-player.tsx

@@ -456,23 +456,10 @@ export default function DirectPlayerPage() {
     });
     reportPlaybackStopped();
     setIsPlaybackStopped(true);
-    // Synchronously destroy the mpv instance + decoder + surface buffers
+    videoRef.current?.pause();
-    // BEFORE the screen unmounts. Otherwise the next screen (or the next
-    // episode's player) mounts while the old 4K decoder is still alive,
-    // causing OOM on low-RAM devices. Native stop() is idempotent so the
-    // later React unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-    // Pre-libmpv-1.0 used `stop()`:
-    // videoRef.current?.stop();
     revalidateProgressCache();
     // Resume inactivity timer when leaving player (TV only)
     resumeInactivityTimer();
-    // Release the keep-awake wakelock acquired during playback so it
-    // doesn't follow us back to the home screen and block the TV
-    // screensaver. activateKeepAwakeAsync() is tag-scoped to this module
-    // and only released on the "paused" event; without this, navigating
-    // away mid-play leaves FLAG_KEEP_SCREEN_ON set on the window.
-    deactivateKeepAwake();
   }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);
 
   useEffect(() => {
@@ -1118,15 +1105,6 @@ export default function DirectPlayerPage() {
         nextItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
     }).toString();
 
-    // Destroy the current mpv instance BEFORE navigating so the old 4K
-    // decoder + surface buffers are freed before the new player screen
-    // mounts. Without this, Expo Router briefly holds two simultaneous
-    // mpv instances during the transition (~768 MB of surface buffers
-    // for two 4K HDR10+ decoders) and OOM-kills the app on low-RAM
-    // devices. Native stop() is idempotent so the subsequent React
-    // unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-
     router.replace(`player/direct-player?${queryParams}` as any);
   }, [
     nextItem,
@@ -1137,7 +1115,6 @@ export default function DirectPlayerPage() {
     bitrateValue,
     router,
     isPlaybackStopped,
-    videoRef,
   ]);
 
   // Apply subtitle settings when video loads

app/(auth)/tv-option-modal.tsx

@@ -11,10 +11,7 @@ import {
 } from "react-native";
 import { Text } from "@/components/common/Text";
 import { TVOptionCard } from "@/components/tv";
-import {
+import { useScaledTVTypography } from "@/constants/TVTypography";
-  useScaledTVTypography,
-  useTVRelativeScale,
-} from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useTVBackPress } from "@/hooks/useTVBackPress";
 import { tvOptionModalAtom } from "@/utils/atoms/tvOptionModal";
@@ -25,7 +22,6 @@ export default function TVOptionModal() {
   const router = useRouter();
   const modalState = useAtomValue(tvOptionModalAtom);
   const typography = useScaledTVTypography();
-  const relativeScale = useTVRelativeScale();
 
   const [isReady, setIsReady] = useState(false);
   const firstCardRef = useRef<View>(null);
@@ -101,15 +97,8 @@ export default function TVOptionModal() {
   }
 
   const { title, options } = modalState;
-  // Honor the caller-provided card size (e.g. wider cards for long root-folder
+  const scaledCardWidth = scaleSize(160);
-  // paths) and grow it in step with the user's text-scale setting so larger
+  const scaledCardHeight = scaleSize(75);
-  // fonts don't get clipped.
-  const scaledCardWidth = scaleSize(
-    (modalState.cardWidth ?? 160) * relativeScale,
-  );
-  const scaledCardHeight = scaleSize(
-    (modalState.cardHeight ?? 75) * relativeScale,
-  );
 
   return (
     <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>

app/(auth)/tv-request-modal.tsx

@@ -15,12 +15,11 @@ import {
 import { Text } from "@/components/common/Text";
 import { TVRequestOptionRow } from "@/components/jellyseerr/tv/TVRequestOptionRow";
 import { TVToggleOptionRow } from "@/components/jellyseerr/tv/TVToggleOptionRow";
-import { TVButton } from "@/components/tv";
+import { TVButton, TVOptionSelector } from "@/components/tv";
 import type { TVOptionItem } from "@/components/tv/TVOptionSelector";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { tvRequestModalAtom } from "@/utils/atoms/tvRequestModal";
 import type {
   QualityProfile,
@@ -36,7 +35,6 @@ export default function TVRequestModalPage() {
   const modalState = useAtomValue(tvRequestModalAtom);
   const { t } = useTranslation();
   const { jellyseerrApi, jellyseerrUser, requestMedia } = useJellyseerr();
-  const { showOptions } = useTVOptionModal();
 
   const [isReady, setIsReady] = useState(false);
   const [requestOverrides, setRequestOverrides] = useState<MediaRequestBody>({
@@ -45,6 +43,10 @@ export default function TVRequestModalPage() {
     userId: jellyseerrUser?.id,
   });
 
+  const [activeSelector, setActiveSelector] = useState<
+    "profile" | "folder" | "user" | null
+  >(null);
+
   const overlayOpacity = useRef(new Animated.Value(0)).current;
   const sheetTranslateY = useRef(new Animated.Value(200)).current;
 
@@ -240,14 +242,17 @@ export default function TVRequestModalPage() {
   // Handlers
   const handleProfileChange = useCallback((profileId: number) => {
     setRequestOverrides((prev) => ({ ...prev, profileId }));
+    setActiveSelector(null);
   }, []);
 
   const handleFolderChange = useCallback((rootFolder: string) => {
     setRequestOverrides((prev) => ({ ...prev, rootFolder }));
+    setActiveSelector(null);
   }, []);
 
   const handleUserChange = useCallback((userId: number) => {
     setRequestOverrides((prev) => ({ ...prev, userId }));
+    setActiveSelector(null);
   }, []);
 
   const handleTagToggle = useCallback(
@@ -348,37 +353,18 @@ export default function TVRequestModalPage() {
                   <TVRequestOptionRow
                     label={t("jellyseerr.quality_profile")}
                     value={selectedProfileName}
-                    onPress={() =>
+                    onPress={() => setActiveSelector("profile")}
-                      showOptions({
-                        title: t("jellyseerr.quality_profile"),
-                        options: qualityProfileOptions,
-                        onSelect: handleProfileChange,
-                      })
-                    }
                     hasTVPreferredFocus
                   />
                   <TVRequestOptionRow
                     label={t("jellyseerr.root_folder")}
                     value={selectedFolderName}
-                    onPress={() =>
+                    onPress={() => setActiveSelector("folder")}
-                      showOptions({
-                        title: t("jellyseerr.root_folder"),
-                        options: rootFolderOptions,
-                        onSelect: handleFolderChange,
-                        cardWidth: 280,
-                      })
-                    }
                   />
                   <TVRequestOptionRow
                     label={t("jellyseerr.request_as")}
                     value={selectedUserName}
-                    onPress={() =>
+                    onPress={() => setActiveSelector("user")}
-                      showOptions({
-                        title: t("jellyseerr.request_as"),
-                        options: userOptions,
-                        onSelect: handleUserChange,
-                      })
-                    }
                   />
 
                   {tagItems.length > 0 && (
@@ -423,6 +409,33 @@ export default function TVRequestModalPage() {
           </TVFocusGuideView>
         </BlurView>
       </Animated.View>
+
+      {/* Sub-selectors */}
+      <TVOptionSelector
+        visible={activeSelector === "profile"}
+        title={t("jellyseerr.quality_profile")}
+        options={qualityProfileOptions}
+        onSelect={handleProfileChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+      />
+      <TVOptionSelector
+        visible={activeSelector === "folder"}
+        title={t("jellyseerr.root_folder")}
+        options={rootFolderOptions}
+        onSelect={handleFolderChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+        cardWidth={280}
+      />
+      <TVOptionSelector
+        visible={activeSelector === "user"}
+        title={t("jellyseerr.request_as")}
+        options={userOptions}
+        onSelect={handleUserChange}
+        onClose={() => setActiveSelector(null)}
+        cancelLabel={t("jellyseerr.cancel")}
+      />
     </Animated.View>
   );
 }

app/(auth)/tv-season-select-modal.tsx

@@ -26,7 +26,6 @@ import {
   MediaType,
 } from "@/utils/jellyseerr/server/constants/media";
 import type { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
-import { scaleSize } from "@/utils/scaleSize";
 import { store } from "@/utils/store";
 
 interface TVSeasonToggleCardProps {
@@ -50,7 +49,6 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
   hasTVPreferredFocus,
 }) => {
   const { t } = useTranslation();
-  const typography = useScaledTVTypography();
   const { focused, handleFocus, handleBlur, animatedStyle } =
     useTVFocusAnimation({ scaleAmount: 1.08 });
 
@@ -121,10 +119,7 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
           <Text
             style={[
               styles.seasonTitle,
-              {
+              { color: focused ? "#000000" : "#FFFFFF" },
-                fontSize: typography.callout,
-                color: focused ? "#000000" : "#FFFFFF",
-              },
             ]}
             numberOfLines={1}
           >
@@ -137,7 +132,6 @@ const TVSeasonToggleCard: React.FC<TVSeasonToggleCardProps> = ({
               style={[
                 styles.episodeCount,
                 {
-                  fontSize: typography.callout - 4,
                   color: focused ? "rgba(0,0,0,0.6)" : "rgba(255,255,255,0.6)",
                 },
               ]}
@@ -257,15 +251,14 @@ export default function TVSeasonSelectModalPage() {
     };
 
     if (modalState.hasAdvancedRequestPermission) {
-      // Replace this sheet with the advanced request modal so it takes our
+      // Close this modal and open the advanced request modal
-      // place in the stack instead of stacking on top (which breaks focus).
+      router.back();
       showRequestModal({
         requestBody: body,
         title: modalState.title,
         id: modalState.mediaId,
         mediaType: MediaType.TV,
         onRequested: modalState.onRequested,
-        replace: true,
       });
       return;
     }
@@ -408,7 +401,7 @@ const styles = StyleSheet.create({
     gap: 16,
   },
   seasonCard: {
-    width: scaleSize(220),
+    width: 160,
     paddingVertical: 16,
     paddingHorizontal: 16,
     borderRadius: 12,
@@ -422,10 +415,7 @@ const styles = StyleSheet.create({
     marginBottom: 8,
   },
   seasonInfo: {
-    // Note: no `flex: 1` here — the card is an auto-height column, so flex:1
+    flex: 1,
-    // (flexBasis: 0) would collapse this box and hide the text. Let it size to
-    // its content instead.
-    alignSelf: "stretch",
   },
   seasonTitle: {
     fontWeight: "600",
@@ -436,7 +426,9 @@ const styles = StyleSheet.create({
     alignItems: "center",
     justifyContent: "space-between",
   },
-  episodeCount: {},
+  episodeCount: {
+    fontSize: 14,
+  },
   statusBadge: {
     width: 22,
     height: 22,

app/_layout.tsx

@@ -7,7 +7,6 @@ import { onlineManager, QueryClient } from "@tanstack/react-query";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import * as BackgroundTask from "expo-background-task";
 import * as Device from "expo-device";
-import { Image } from "expo-image";
 import { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
@@ -101,22 +100,6 @@ SplashScreen.setOptions({
   fade: true,
 });
 
-// Cap expo-image's in-memory cache. Default is unbounded (maxMemoryCost=0),
-// which on a 2GB Android TV box leads to ~200MB of decoded backdrops/posters
-// pinned in RAM after browsing. Caps are intentionally tighter on TV (which
-// has less RAM and runs alongside libmpv/MediaCodec) than on mobile.
-// Cost is measured in bytes of decoded bitmap (ARGB8888 = 4 bytes/pixel).
-try {
-  Image.configureCache({
-    maxMemoryCost: Platform.isTV
-      ? 8 * 1024 * 1024 // ~8 MB on TV
-      : 128 * 1024 * 1024, // ~128 MB on mobile
-    maxDiskSize: 200 * 1024 * 1024, // 200 MB disk cache on all platforms
-  });
-} catch {
-  // configureCache is a no-op on some platforms/versions; safe to ignore.
-}
-
 function useNotificationObserver() {
   const router = useRouter();
 

bun.lock

@@ -111,7 +111,7 @@
         "cross-env": "10.1.0",
         "expo-doctor": "1.19.9",
         "husky": "9.1.7",
-        "lint-staged": "17.0.8",
+        "lint-staged": "17.0.7",
         "react-test-renderer": "19.2.3",
         "typescript": "6.0.3",
       },
@@ -1270,7 +1270,7 @@
 
     "lines-and-columns": ["lines-and-columns@1.2.4", "", {}, "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="],
 
-    "lint-staged": ["lint-staged@17.0.8", "", { "dependencies": { "listr2": "^10.2.1", "picomatch": "^4.0.4", "string-argv": "^0.3.2", "tinyexec": "^1.2.4" }, "optionalDependencies": { "yaml": "^2.9.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-B2P/d+jVW0UXOQ0MVMLrB/9ydA1P+zz6jYfdrbbEd9ur3S2rcbduFWKiUCC02Sm5hbC8nrm7y24WuYMG54HfxA=="],
+    "lint-staged": ["lint-staged@17.0.7", "", { "dependencies": { "listr2": "^10.2.1", "picomatch": "^4.0.4", "string-argv": "^0.3.2", "tinyexec": "^1.2.4" }, "optionalDependencies": { "yaml": "^2.9.0" }, "bin": { "lint-staged": "bin/lint-staged.js" } }, "sha512-JrSobt+tW3rH8IOMi8tDZd3foorM5yPEkLD/V2NxobgHrFfHWGee4MOLVuZeScgxftEwbHrPHIFA/ZL+nUJeuA=="],
 
     "listr2": ["listr2@10.2.1", "", { "dependencies": { "cli-truncate": "^5.2.0", "eventemitter3": "^5.0.4", "log-update": "^6.1.0", "rfdc": "^1.4.1", "wrap-ansi": "^10.0.0" } }, "sha512-7I5knELsJKTUjXG+A6BkKAiGkW1i25fNa/xlUl9hFtk15WbE9jndA89xu5FzQKrY5llajE1hfZZFMILXkDHk/Q=="],
 

components/home/Home.tv.tsx

@@ -140,11 +140,9 @@ export const Home = () => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Prefetch to disk only - the full-size 1920x1080 backdrop (~8MB
+      // Prefetch the image before starting the crossfade
-      // decoded ARGB) is too large to pin in the memory cache on every
-      // focus change. Disk cache is fast enough for a 500ms crossfade.
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/home/InfiniteScrollingCollectionList.tv.tsx

@@ -326,9 +326,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           showsHorizontalScrollIndicator={false}
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.5}
-          initialNumToRender={4}
+          initialNumToRender={5}
-          maxToRenderPerBatch={2}
+          maxToRenderPerBatch={3}
-          windowSize={3}
+          windowSize={5}
           removeClippedSubviews={false}
           maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
           style={{ overflow: "visible" }}

components/home/TVHeroCarousel.tsx

@@ -256,11 +256,8 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch: backdrops are ~8MB decoded ARGB; keeping them
-      // out of the memory cache avoids bloat when the user cycles through
-      // hero items quickly.
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }
@@ -382,7 +379,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
   if (items.length === 0) return null;
 
   // Extra top padding for tvOS to clear the menu bar
-  const tvosTopPadding = scaleSize(145);
+  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
   const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;
 
   return (

components/jellyseerr/discover/TVDiscoverSlide.tsx

@@ -7,7 +7,6 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import {
@@ -167,7 +166,6 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
   isFirstSlide = false,
 }) => {
   const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
   const { t } = useTranslation();
   const { jellyseerrApi, isJellyseerrMovieOrTvResult } = useJellyseerr();
 
@@ -240,7 +238,7 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
           fontWeight: "bold",
           color: "#FFFFFF",
           marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
         }}
       >
         {slideTitle}
@@ -251,7 +249,7 @@ export const TVDiscoverSlide: React.FC<TVDiscoverSlideProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
           paddingVertical: SCALE_PADDING,
           gap: 20,
         }}

components/persons/TVActorPage.tsx

@@ -156,9 +156,9 @@ export const TVActorPage: React.FC<TVActorPageProps> = ({ personId }) => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
+      // Prefetch the image before starting the crossfade
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/search/TVJellyseerrSearchResults.tsx

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { Animated, FlatList, Pressable, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVSizes } from "@/constants/TVSizes";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { MediaStatus } from "@/utils/jellyseerr/server/constants/media";
@@ -234,7 +233,6 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
@@ -245,7 +243,7 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
           fontWeight: "bold",
           color: "#FFFFFF",
           marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
         }}
       >
         {title}
@@ -256,7 +254,7 @@ const TVJellyseerrMovieSection: React.FC<TVJellyseerrMovieSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
           paddingVertical: SCALE_PADDING,
           gap: 20,
         }}
@@ -287,7 +285,6 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
@@ -298,7 +295,7 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
           fontWeight: "bold",
           color: "#FFFFFF",
           marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
         }}
       >
         {title}
@@ -309,7 +306,7 @@ const TVJellyseerrTvSection: React.FC<TVJellyseerrTvSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
           paddingVertical: SCALE_PADDING,
           gap: 20,
         }}
@@ -340,7 +337,6 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
   onItemPress,
 }) => {
   const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
   if (!items || items.length === 0) return null;
 
   return (
@@ -351,7 +347,7 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
           fontWeight: "bold",
           color: "#FFFFFF",
           marginBottom: 16,
-          marginLeft: sizes.padding.horizontal,
+          marginLeft: SCALE_PADDING,
         }}
       >
         {title}
@@ -362,7 +358,7 @@ const TVJellyseerrPersonSection: React.FC<TVJellyseerrPersonSectionProps> = ({
         keyExtractor={(item) => item.id.toString()}
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{
-          paddingHorizontal: sizes.padding.horizontal,
+          paddingHorizontal: SCALE_PADDING,
           paddingVertical: SCALE_PADDING,
           gap: 20,
         }}

components/search/TVSearchPage.tsx

@@ -22,6 +22,7 @@ import { TVJellyseerrSearchResults } from "./TVJellyseerrSearchResults";
 import { TVSearchSection } from "./TVSearchSection";
 import { TVSearchTabBadges } from "./TVSearchTabBadges";
 
+const HORIZONTAL_PADDING = 60;
 const TOP_PADDING = 100;
 // Height of the native search bar itself. The tvOS grid keyboard presents as
 // its own overlay when the field is focused, so we only reserve the bar height
@@ -162,7 +163,6 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
   discoverSliders,
 }) => {
   const typography = useScaledTVTypography();
-  const sizes = useScaledTVSizes();
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
   const [api] = useAtom(apiAtom);
@@ -251,7 +251,7 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
         ) : (
           <View
             style={{
-              marginHorizontal: sizes.padding.horizontal,
+              marginHorizontal: HORIZONTAL_PADDING,
               marginBottom: 24,
             }}
           >
@@ -280,15 +280,12 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
         showsVerticalScrollIndicator={false}
         keyboardDismissMode='on-drag'
         contentContainerStyle={{
-          // Top padding so the focus-scale/shadow on the first row (filter
-          // badges) isn't clipped against the ScrollView's top edge.
-          paddingTop: 16,
           paddingBottom: insets.bottom + 60,
         }}
       >
         {/* Search Type Tab Badges */}
         {showDiscover && (
-          <View style={{ marginHorizontal: sizes.padding.horizontal }}>
+          <View style={{ marginHorizontal: HORIZONTAL_PADDING }}>
             <TVSearchTabBadges
               searchType={searchType}
               setSearchType={setSearchType}

components/settings/PlaybackControlsSettings.tsx

@@ -8,6 +8,7 @@ import { BITRATES } from "@/components/BitrateSelector";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import { PLAYBACK_SPEEDS } from "@/components/PlaybackSpeedSelector";
 import DisabledSetting from "@/components/settings/DisabledSetting";
+import useRouter from "@/hooks/useAppRouter";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { ScreenOrientationEnum, useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
@@ -15,6 +16,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const PlaybackControlsSettings: React.FC = () => {
+  const router = useRouter();
   const { settings, updateSettings, pluginSettings } = useSettings();
   const { t } = useTranslation();
 
@@ -251,6 +253,15 @@ export const PlaybackControlsSettings: React.FC = () => {
             title={t("home.settings.other.max_auto_play_episode_count")}
           />
         </ListItem>
+
+        {/* Media Segment Skip Settings */}
+        <ListItem
+          title={t("home.settings.other.segment_skip_settings")}
+          subtitle={t("home.settings.other.segment_skip_settings_description")}
+          onPress={() => router.push("/settings/segment-skip/page")}
+        >
+          <Ionicons name='chevron-forward' size={20} color='#8E8D91' />
+        </ListItem>
       </ListGroup>
     </DisabledSetting>
   );

components/tv/TVNavBar.tsx

@@ -1,155 +0,0 @@
-import React from "react";
-import {
-  Animated,
-  Pressable,
-  ScrollView,
-  StyleProp,
-  View,
-  ViewStyle,
-} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { TVPadding } from "@/constants/TVSizes";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import { scaleSize } from "@/utils/scaleSize";
-
-export interface TVNavBarTab {
-  key: string;
-  label: string;
-}
-
-export interface TVNavBarProps {
-  tabs: TVNavBarTab[];
-  activeTabKey: string;
-  onTabChange: (key: string) => void;
-  style?: StyleProp<ViewStyle>;
-}
-
-const TVNavBarTabItem: React.FC<{
-  label: string;
-  isActive: boolean;
-  onSelect: () => void;
-  onLayout: (e: {
-    nativeEvent: { layout: { x: number; width: number } };
-  }) => void;
-  hasTVPreferredFocus: boolean;
-}> = ({ label, isActive, onSelect, onLayout, hasTVPreferredFocus }) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({
-      scaleAmount: 1.05,
-      duration: 120,
-    });
-
-  const bg = focused
-    ? "rgba(255, 255, 255, 0.95)"
-    : isActive
-      ? "rgba(255, 255, 255, 0.15)"
-      : "transparent";
-
-  const textColor = focused
-    ? "#000"
-    : isActive
-      ? "#fff"
-      : "rgba(255, 255, 255, 0.7)";
-
-  return (
-    <Pressable
-      onPress={onSelect}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-      onLayout={onLayout}
-    >
-      <Animated.View
-        style={[
-          animatedStyle,
-          {
-            backgroundColor: bg,
-            borderRadius: scaleSize(24),
-            borderWidth: isActive && !focused ? 1 : 0,
-            borderColor: "rgba(255, 255, 255, 0.3)",
-            paddingHorizontal: scaleSize(28),
-            paddingVertical: scaleSize(14),
-          },
-        ]}
-      >
-        <Text
-          style={{
-            fontSize: typography.heading,
-            color: textColor,
-            fontWeight: isActive || focused ? "600" : "400",
-          }}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export const TVNavBar: React.FC<TVNavBarProps> = ({
-  tabs,
-  activeTabKey,
-  onTabChange,
-  style,
-}) => {
-  const scrollRef = React.useRef<ScrollView>(null);
-  const tabLayouts = React.useRef<Record<string, { x: number; width: number }>>(
-    {},
-  );
-  const insets = useSafeAreaInsets();
-
-  const handleTabLayout = React.useCallback(
-    (key: string) =>
-      (e: { nativeEvent: { layout: { x: number; width: number } } }) => {
-        tabLayouts.current[key] = e.nativeEvent.layout;
-      },
-    [],
-  );
-
-  const handleTabChange = React.useCallback(
-    (key: string) => {
-      onTabChange(key);
-
-      const layout = tabLayouts.current[key];
-      if (layout && scrollRef.current) {
-        scrollRef.current.scrollTo({
-          x: Math.max(0, layout.x - TVPadding.horizontal / 2),
-          animated: true,
-        });
-      }
-    },
-    [onTabChange],
-  );
-
-  if (tabs.length === 0) return null;
-
-  return (
-    <View style={[{ paddingTop: insets.top + 16, paddingBottom: 8 }, style]}>
-      <ScrollView
-        ref={scrollRef}
-        horizontal
-        showsHorizontalScrollIndicator={false}
-        keyboardShouldPersistTaps='handled'
-        contentContainerStyle={{
-          flexGrow: 1,
-          justifyContent: "center",
-          gap: scaleSize(12),
-        }}
-      >
-        {tabs.map((tab) => (
-          <TVNavBarTabItem
-            key={tab.key}
-            label={tab.label}
-            isActive={tab.key === activeTabKey}
-            onSelect={() => handleTabChange(tab.key)}
-            onLayout={handleTabLayout(tab.key)}
-            hasTVPreferredFocus={tab.key === activeTabKey}
-          />
-        ))}
-      </ScrollView>
-    </View>
-  );
-};

components/tv/TVOptionCard.tsx

@@ -61,17 +61,39 @@ export const TVOptionCard = React.forwardRef<View, TVOptionCardProps>(
             },
           ]}
         >
-          <Text
+          {/* Selected + unfocused: label and checkmark form a centered group.
+              The left padding offsets the checkmark's width so the label stays
+              optically centered. Without a checkmark, no offset → label centered. */}
+          <View
             style={{
-              fontSize: typography.callout,
+              flexDirection: "row",
-              color: focused ? "#000" : "#fff",
+              alignItems: "center",
-              fontWeight: focused || selected ? "600" : "400",
+              justifyContent: "center",
-              textAlign: "center",
+              // Offset checkmark width only when it's shown, else label sits right.
+              paddingLeft: selected && !focused ? scaleSize(10) : 0,
             }}
-            numberOfLines={4}
           >
-            {label}
+            <Text
-          </Text>
+              style={{
+                fontSize: typography.callout,
+                color: focused ? "#000" : "#fff",
+                fontWeight: focused || selected ? "600" : "400",
+                textAlign: "center",
+                flexShrink: 1,
+              }}
+              numberOfLines={4}
+            >
+              {label}
+            </Text>
+            {selected && !focused && (
+              <Ionicons
+                name='checkmark'
+                size={scaleSize(26)}
+                color='rgba(255,255,255,0.8)'
+                style={{ marginLeft: scaleSize(8), flexShrink: 0 }}
+              />
+            )}
+          </View>
           {sublabel && (
             <Text
               style={{
@@ -85,21 +107,6 @@ export const TVOptionCard = React.forwardRef<View, TVOptionCardProps>(
               {sublabel}
             </Text>
           )}
-          {selected && !focused && (
-            <View
-              style={{
-                position: "absolute",
-                top: 8,
-                right: 8,
-              }}
-            >
-              <Ionicons
-                name='checkmark'
-                size={16}
-                color='rgba(255,255,255,0.8)'
-              />
-            </View>
-          )}
         </Animated.View>
       </Pressable>
     );

components/tv/TVPosterCard.tsx

@@ -448,8 +448,8 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
         <Image
           placeholder={{ blurhash }}
           key={item.Id}
+          id={item.Id}
           source={{ uri: imageUrl }}
-          recyclingKey={item.Id}
           cachePolicy='memory-disk'
           contentFit='cover'
           style={{

components/tv/TVSkipSegmentCard.tsx

@@ -19,10 +19,27 @@ import { Text } from "@/components/common/Text";
 import { scaleSize } from "@/utils/scaleSize";
 import { useTVFocusAnimation } from "./hooks/useTVFocusAnimation";
 
+export type TVSkipSegmentType =
+  | "intro"
+  | "credits"
+  | "outro"
+  | "recap"
+  | "commercial"
+  | "preview";
+
+const SEGMENT_LABEL_KEY: Record<TVSkipSegmentType, string> = {
+  intro: "player.skip_intro",
+  credits: "player.skip_credits",
+  outro: "player.skip_outro",
+  recap: "player.skip_recap",
+  commercial: "player.skip_commercial",
+  preview: "player.skip_preview",
+};
+
 export interface TVSkipSegmentCardProps {
   show: boolean;
   onPress: () => void;
-  type: "intro" | "credits";
+  type: TVSkipSegmentType;
   /** Whether controls are visible - affects card position */
   controlsVisible?: boolean;
   /** Callback ref setter for focus guide destination pattern */
@@ -72,8 +89,7 @@ export const TVSkipSegmentCard: FC<TVSkipSegmentCardProps> = ({
     bottom: bottomPosition.value,
   }));
 
-  const labelText =
+  const labelText = t(SEGMENT_LABEL_KEY[type]);
-    type === "intro" ? t("player.skip_intro") : t("player.skip_credits");
 
   if (!show) return null;
 

components/tv/index.ts

@@ -35,8 +35,6 @@ export type { TVLanguageCardProps } from "./TVLanguageCard";
 export { TVLanguageCard } from "./TVLanguageCard";
 export type { TVMetadataBadgesProps } from "./TVMetadataBadges";
 export { TVMetadataBadges } from "./TVMetadataBadges";
-export type { TVNavBarProps, TVNavBarTab } from "./TVNavBar";
-export { TVNavBar } from "./TVNavBar";
 export type { TVNextEpisodeCountdownProps } from "./TVNextEpisodeCountdown";
 export { TVNextEpisodeCountdown } from "./TVNextEpisodeCountdown";
 export type { TVOptionButtonProps } from "./TVOptionButton";

components/video-player/controls/BottomControls.tsx

@@ -34,11 +34,13 @@ interface BottomControlsProps {
   showRemoteBubble: boolean;
   currentTime: number;
   remainingTime: number;
-  showSkipButton: boolean;
+  showSkipSegmentButton: boolean;
-  showSkipCreditButton: boolean;
+  skipSegmentButtonText: string;
+  showSkipOutroButton: boolean;
+  skipOutroButtonText: string;
   hasContentAfterCredits: boolean;
-  skipIntro: () => void;
+  onSkipSegment: () => void;
-  skipCredit: () => void;
+  onSkipOutro: () => void;
   nextItem?: BaseItemDto | null;
   handleNextEpisodeAutoPlay: () => void;
   handleNextEpisodeManual: () => void;
@@ -86,11 +88,13 @@ export const BottomControls: FC<BottomControlsProps> = ({
   showRemoteBubble,
   currentTime,
   remainingTime,
-  showSkipButton,
+  showSkipSegmentButton,
-  showSkipCreditButton,
+  skipSegmentButtonText,
+  showSkipOutroButton,
+  skipOutroButtonText,
   hasContentAfterCredits,
-  skipIntro,
+  onSkipSegment,
-  skipCredit,
+  onSkipOutro,
   nextItem,
   handleNextEpisodeAutoPlay,
   handleNextEpisodeManual,
@@ -181,19 +185,18 @@ export const BottomControls: FC<BottomControlsProps> = ({
         </View>
         <View className='flex flex-row items-center space-x-2 shrink-0'>
           <SkipButton
-            showButton={showSkipButton}
+            showButton={showSkipSegmentButton}
-            onPress={skipIntro}
+            onPress={onSkipSegment}
-            buttonText='Skip Intro'
+            buttonText={skipSegmentButtonText}
           />
-          {/* Smart Skip Credits behavior:
+          {/* Outro button defers to "Next Episode" when credits run to the
-              - Show "Skip Credits" if there's content after credits OR no next episode
+              video end and a next episode exists. */}
-              - Show "Next Episode" if credits extend to video end AND next episode exists */}
           <SkipButton
             showButton={
-              showSkipCreditButton && (hasContentAfterCredits || !nextItem)
+              showSkipOutroButton && (hasContentAfterCredits || !nextItem)
             }
-            onPress={skipCredit}
+            onPress={onSkipOutro}
-            buttonText='Skip Credits'
+            buttonText={skipOutroButtonText}
           />
           {settings.autoPlayNextEpisode !== false &&
             (settings.maxAutoPlayEpisodeCount.value === -1 ||
@@ -204,7 +207,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
                   !nextItem
                     ? false
                     : // Show during credits if no content after, OR near end of video
-                      (showSkipCreditButton && !hasContentAfterCredits) ||
+                      (showSkipOutroButton && !hasContentAfterCredits) ||
                       remainingTime < 10000
                 }
                 onFinish={handleNextEpisodeAutoPlay}

components/video-player/controls/Controls.tsx

@@ -5,6 +5,7 @@ import type {
 } from "@jellyfin/sdk/lib/generated-client";
 import { useLocalSearchParams } from "expo-router";
 import { type FC, useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { StyleSheet, useWindowDimensions, View } from "react-native";
 import Animated, {
   Easing,
@@ -16,9 +17,8 @@ import Animated, {
 } from "react-native-reanimated";
 import ContinueWatchingOverlay from "@/components/video-player/controls/ContinueWatchingOverlay";
 import useRouter from "@/hooks/useAppRouter";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
 import { useHaptic } from "@/hooks/useHaptic";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
+import { useMediaSegments } from "@/hooks/useMediaSegments";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
 import { useTrickplay } from "@/hooks/useTrickplay";
 import type { TechnicalInfo } from "@/modules/mpv-player";
@@ -26,6 +26,7 @@ import { DownloadedItem } from "@/providers/Downloads/types";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import { useSegments } from "@/utils/segments";
 import { ticksToMs } from "@/utils/time";
 import { BottomControls } from "./BottomControls";
 import { CenterControls } from "./CenterControls";
@@ -316,27 +317,38 @@ export const Controls: FC<Props> = ({
     subtitleIndex: string;
   }>();
 
-  const { showSkipButton, skipIntro } = useIntroSkipper(
+  // Fetch all segments for the current item
-    item.Id!,
+  const { data: segments } = useSegments(
-    currentTime,
+    item.Id ?? "",
-    seek,
-    play,
     offline,
-    api,
     downloadedFiles,
+    api,
   );
 
-  const { showSkipCreditButton, skipCredit, hasContentAfterCredits } =
+  // Unified segment orchestration (identical mechanism on mobile and TV):
-    useCreditSkipper(
+  // overlap priority + a single auto-skip driver live in the shared hook.
-      item.Id!,
+  const {
-      currentTime,
+    activeSegment,
-      seek,
+    skipActiveSegment: onSkipSegment,
-      play,
+    showSkipButton: showSkipSegmentButton,
-      offline,
+    isOutroActive: showSkipOutroButton,
-      api,
+    skipOutro: onSkipOutro,
-      downloadedFiles,
+    hasContentAfterCredits,
-      maxMs,
+  } = useMediaSegments({
-    );
+    segments,
+    currentTime,
+    maxMs,
+    seek,
+    play,
+    isPlaying,
+    isBuffering,
+  });
+
+  const { t } = useTranslation();
+  const skipSegmentButtonText = activeSegment
+    ? t(`player.skip_${activeSegment.type.toLowerCase()}`)
+    : t("player.skip_intro");
+  const skipOutroButtonText = t("player.skip_outro");
 
   const goToItemCommon = useCallback(
     (item: BaseItemDto) => {
@@ -570,11 +582,13 @@ export const Controls: FC<Props> = ({
               showRemoteBubble={showRemoteBubble}
               currentTime={currentTime}
               remainingTime={remainingTime}
-              showSkipButton={showSkipButton}
+              showSkipSegmentButton={showSkipSegmentButton}
-              showSkipCreditButton={showSkipCreditButton}
+              skipSegmentButtonText={skipSegmentButtonText}
+              showSkipOutroButton={showSkipOutroButton}
+              skipOutroButtonText={skipOutroButtonText}
               hasContentAfterCredits={hasContentAfterCredits}
-              skipIntro={skipIntro}
+              onSkipSegment={onSkipSegment}
-              skipCredit={skipCredit}
+              onSkipOutro={onSkipOutro}
               nextItem={nextItem}
               handleNextEpisodeAutoPlay={handleNextEpisodeAutoPlay}
               handleNextEpisodeManual={handleNextEpisodeManual}

components/video-player/controls/Controls.tv.tsx

@@ -38,9 +38,9 @@ import {
 import { TVFocusableProgressBar } from "@/components/tv/TVFocusableProgressBar";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
+import { useMediaSegments } from "@/hooks/useMediaSegments";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
+import type { SegmentType } from "@/hooks/useSegmentSkipper";
 import { useTrickplay } from "@/hooks/useTrickplay";
 import { useTVOptionModal } from "@/hooks/useTVOptionModal";
 import { useTVSubtitleModal } from "@/hooks/useTVSubtitleModal";
@@ -51,6 +51,7 @@ import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import { useSegments } from "@/utils/segments";
 import { formatTimeString, msToTicks, ticksToMs } from "@/utils/time";
 import { CONTROLS_CONSTANTS } from "./constants";
 import { useVideoContext } from "./contexts/VideoContext";
@@ -199,6 +200,7 @@ export const Controls: FC<Props> = ({
   isSeeking,
   progress,
   cacheProgress,
+  isBuffering,
   showControls,
   setShowControls,
   mediaSource,
@@ -427,30 +429,42 @@ export const Controls: FC<Props> = ({
     seek,
   });
 
-  // Skip intro/credits hooks
+  // Segment skipping (intro + outro/credits) via the unified hook.
-  // Note: hooks expect seek callback that takes ms, and seek prop already expects ms
   const offline = useOfflineMode();
-  const { showSkipButton, skipIntro } = useIntroSkipper(
+
-    item.Id!,
+  const { data: segments } = useSegments(
-    currentTime,
+    item.Id ?? "",
-    seek,
-    _play,
     offline,
-    api,
     downloadedFiles,
+    api,
   );
 
-  const { showSkipCreditButton, skipCredit, hasContentAfterCredits } =
+  // Unified segment orchestration (identical mechanism on mobile and TV):
-    useCreditSkipper(
+  // overlap priority + a single auto-skip driver live in the shared hook.
-      item.Id!,
+  const {
-      currentTime,
+    activeSegment,
-      seek,
+    skipActiveSegment,
-      _play,
+    showSkipButton,
-      offline,
+    isOutroActive,
-      api,
+    skipOutro: skipCredit,
-      downloadedFiles,
+    hasContentAfterCredits,
-      max.value,
+  } = useMediaSegments({
-    );
+    segments,
+    currentTime,
+    maxMs,
+    seek,
+    play: _play,
+    isPlaying,
+    isBuffering,
+  });
+
+  // The outro keeps its dedicated card (it composes with the Next Episode
+  // countdown); the other four share the generic skip card.
+  const showSkipCreditButton = isOutroActive;
+  const activeSegmentType =
+    isOutroActive || !activeSegment
+      ? "intro"
+      : (activeSegment.type.toLowerCase() as Lowercase<SegmentType>);
 
   // Countdown logic
   const isCountdownActive = useMemo(() => {
@@ -1126,11 +1140,11 @@ export const Controls: FC<Props> = ({
         />
       )}
 
-      {/* Skip intro card */}
+      {/* Generic skip card (intro / recap / commercial / preview) */}
       <TVSkipSegmentCard
         show={showSkipButton && !isCountdownActive}
-        onPress={skipIntro}
+        onPress={skipActiveSegment}
-        type='intro'
+        type={activeSegmentType}
         controlsVisible={showControls}
         refSetter={setSkipSegmentRef}
         hasTVPreferredFocus={!showControls}

components/video-player/controls/TechnicalInfoOverlay.tsx

@@ -342,12 +342,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
           {info?.cacheSeconds !== undefined && (
             <Text style={textStyle}>
               Buffer: {info.cacheSeconds.toFixed(1)}s
-              {info?.demuxerMaxBytes !== undefined
-                ? ` (cap ${info.demuxerMaxBytes}MB` +
-                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
-                  `${info?.cacheSecsLimit !== undefined && info.cacheSecsLimit < 3600 ? ` · ${info.cacheSecsLimit.toFixed(0)}s` : ""}` +
-                  ")"
-                : ""}
             </Text>
           )}
           {info?.voDriver && (
@@ -356,12 +350,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
               {info.hwdec ? ` / ${info.hwdec}` : ""}
             </Text>
           )}
-          {info?.estimatedVfFps !== undefined && (
-            <Text style={textStyle}>
-              Output FPS: {info.estimatedVfFps.toFixed(2)}
-              {info?.fps ? ` (container ${formatFps(info.fps)})` : ""}
-            </Text>
-          )}
           {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
             <Text style={[textStyle, styles.warningText]}>
               Dropped: {info.droppedFrames} frames

constants/TVTypography.ts

@@ -55,20 +55,6 @@ export type ScaledTVTypography = {
   callout: number;
 };
 
-/**
- * Returns the user's text-scale factor relative to the Default scale (1.0 at
- * Default, >1 for Large/ExtraLarge, <1 for Small). Use it to scale containers
- * (e.g. option-card width/height) in step with the scaled font so larger text
- * settings don't overflow fixed boxes.
- */
-export const useTVRelativeScale = (): number => {
-  const { settings } = useSettings();
-  const scale =
-    scaleMultipliers[settings.tvTypographyScale] ??
-    scaleMultipliers[TVTypographyScale.Default];
-  return scale / scaleMultipliers[TVTypographyScale.Default];
-};
-
 /**
  * Hook that returns scaled TV typography values based on user settings.
  * Use this instead of the static TVTypography constant for dynamic scaling.

hooks/useCreditSkipper.ts

@@ -1,109 +0,0 @@
-import { Api } from "@jellyfin/sdk";
-import { useCallback, useEffect, useState } from "react";
-import { DownloadedItem } from "@/providers/Downloads/types";
-import { useSegments } from "@/utils/segments";
-import { msToSeconds, secondsToMs } from "@/utils/time";
-import { useHaptic } from "./useHaptic";
-
-/**
- * Custom hook to handle skipping credits in a media player.
- * The player reports time values in milliseconds.
- */
-export const useCreditSkipper = (
-  itemId: string,
-  currentTime: number,
-  seek: (ms: number) => void,
-  play: () => void,
-  isOffline = false,
-  api: Api | null = null,
-  downloadedFiles: DownloadedItem[] | undefined = undefined,
-  totalDuration?: number,
-) => {
-  const [showSkipCreditButton, setShowSkipCreditButton] = useState(false);
-  const lightHapticFeedback = useHaptic("light");
-
-  // Convert ms to seconds for comparison with timestamps
-  const currentTimeSeconds = msToSeconds(currentTime);
-
-  const totalDurationInSeconds =
-    totalDuration != null ? msToSeconds(totalDuration) : undefined;
-
-  // Regular function (not useCallback) to match useIntroSkipper pattern
-  const wrappedSeek = (seconds: number) => {
-    seek(secondsToMs(seconds));
-  };
-
-  const { data: segments } = useSegments(
-    itemId,
-    isOffline,
-    downloadedFiles,
-    api,
-  );
-  const creditTimestamps = segments?.creditSegments?.[0];
-
-  // Determine if there's content after credits (credits don't extend to video end)
-  // Use a 5-second buffer to account for timing discrepancies
-  const hasContentAfterCredits = (() => {
-    if (
-      !creditTimestamps ||
-      totalDurationInSeconds == null ||
-      !Number.isFinite(totalDurationInSeconds)
-    ) {
-      return false;
-    }
-    const creditsEndToVideoEnd =
-      totalDurationInSeconds - creditTimestamps.endTime;
-    // If credits end more than 5 seconds before video ends, there's content after
-    return creditsEndToVideoEnd > 5;
-  })();
-
-  useEffect(() => {
-    if (creditTimestamps) {
-      const shouldShow =
-        currentTimeSeconds > creditTimestamps.startTime &&
-        currentTimeSeconds < creditTimestamps.endTime;
-
-      setShowSkipCreditButton(shouldShow);
-    } else {
-      // Reset button state when no credit timestamps exist
-      if (showSkipCreditButton) {
-        setShowSkipCreditButton(false);
-      }
-    }
-  }, [creditTimestamps, currentTimeSeconds, showSkipCreditButton]);
-
-  const skipCredit = useCallback(() => {
-    if (!creditTimestamps) return;
-
-    try {
-      lightHapticFeedback();
-
-      // Calculate the target seek position
-      let seekTarget = creditTimestamps.endTime;
-
-      // If we have total duration, ensure we don't seek past the end of the video.
-      // Some media sources report credit end times that exceed the actual video duration,
-      // which causes the player to pause/stop when seeking past the end.
-      // Leave a small buffer (2 seconds) to trigger the natural end-of-video flow
-      // (next episode countdown, etc.) instead of an abrupt pause.
-      if (totalDurationInSeconds && seekTarget >= totalDurationInSeconds) {
-        seekTarget = Math.max(0, totalDurationInSeconds - 2);
-      }
-
-      wrappedSeek(seekTarget);
-      setTimeout(() => {
-        play();
-      }, 200);
-    } catch (error) {
-      console.error("[CREDIT_SKIPPER] Error skipping credit", error);
-    }
-  }, [
-    creditTimestamps,
-    lightHapticFeedback,
-    wrappedSeek,
-    play,
-    totalDurationInSeconds,
-  ]);
-
-  return { showSkipCreditButton, skipCredit, hasContentAfterCredits };
-};

hooks/useIntroSkipper.ts

@@ -1,68 +0,0 @@
-import { Api } from "@jellyfin/sdk";
-import { useCallback, useEffect, useState } from "react";
-import { DownloadedItem } from "@/providers/Downloads/types";
-import { useSegments } from "@/utils/segments";
-import { msToSeconds, secondsToMs } from "@/utils/time";
-import { useHaptic } from "./useHaptic";
-
-/**
- * Custom hook to handle skipping intros in a media player.
- * MPV player uses milliseconds for time.
- *
- * @param {number} currentTime - The current playback time in milliseconds.
- */
-export const useIntroSkipper = (
-  itemId: string,
-  currentTime: number,
-  seek: (ms: number) => void,
-  play: () => void,
-  isOffline = false,
-  api: Api | null = null,
-  downloadedFiles: DownloadedItem[] | undefined = undefined,
-) => {
-  const [showSkipButton, setShowSkipButton] = useState(false);
-  // Convert ms to seconds for comparison with timestamps
-  const currentTimeSeconds = msToSeconds(currentTime);
-  const lightHapticFeedback = useHaptic("light");
-
-  const wrappedSeek = (seconds: number) => {
-    seek(secondsToMs(seconds));
-  };
-
-  const { data: segments } = useSegments(
-    itemId,
-    isOffline,
-    downloadedFiles,
-    api,
-  );
-  const introTimestamps = segments?.introSegments?.[0];
-
-  useEffect(() => {
-    if (introTimestamps) {
-      const shouldShow =
-        currentTimeSeconds > introTimestamps.startTime &&
-        currentTimeSeconds < introTimestamps.endTime;
-
-      setShowSkipButton(shouldShow);
-    } else {
-      if (showSkipButton) {
-        setShowSkipButton(false);
-      }
-    }
-  }, [introTimestamps, currentTimeSeconds, showSkipButton]);
-
-  const skipIntro = useCallback(() => {
-    if (!introTimestamps) return;
-    try {
-      lightHapticFeedback();
-      wrappedSeek(introTimestamps.endTime);
-      setTimeout(() => {
-        play();
-      }, 200);
-    } catch (error) {
-      console.error("[INTRO_SKIPPER] Error skipping intro", error);
-    }
-  }, [introTimestamps, lightHapticFeedback, wrappedSeek, play]);
-
-  return { showSkipButton, skipIntro };
-};

hooks/useJellyseerr.ts

@@ -70,35 +70,6 @@ export const clearJellyseerrStorageData = () => {
   storage.remove(JELLYSEERR_COOKIES);
 };
 
-export type JellyseerrSessionStatus =
-  | { valid: true }
-  | { valid: false; reason: "no_session" | "expired" };
-
-/**
- * Checks whether the persisted Jellyseerr session (user + cookies) is still
- * valid by hitting the server status endpoint. Clears local session data if the
- * request fails (expired/revoked cookie).
- */
-export async function validateJellyseerrSession(
-  serverUrl: string,
-): Promise<JellyseerrSessionStatus> {
-  const user = storage.get<JellyseerrUser>(JELLYSEERR_USER);
-  const cookies = storage.get<string[]>(JELLYSEERR_COOKIES);
-
-  if (!user || !cookies) {
-    return { valid: false, reason: "no_session" };
-  }
-
-  try {
-    const api = new JellyseerrApi(serverUrl);
-    await api.axios.get(Endpoints.API_V1 + Endpoints.STATUS);
-    return { valid: true };
-  } catch {
-    clearJellyseerrStorageData();
-    return { valid: false, reason: "expired" };
-  }
-}
-
 export enum Endpoints {
   STATUS = "/status",
   API_V1 = "/api/v1",
@@ -479,8 +450,7 @@ export const useJellyseerr = () => {
     clearJellyseerrStorageData();
     setJellyseerrUser(undefined);
     updateSettings({ jellyseerrServerUrl: undefined });
-    queryClient.removeQueries({ queryKey: ["search", "jellyseerr"] });
+  }, []);
-  }, [queryClient]);
 
   const requestMedia = useCallback(
     (title: string, request: MediaRequestBody, onSuccess?: () => void) => {

hooks/useMediaSegments.ts

@@ -0,0 +1,220 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { MediaTimeSegment } from "@/providers/Downloads/types";
+import type { SegmentSkipMode } from "@/utils/atoms/settings";
+import type { SegmentBuckets } from "@/utils/segments";
+import { type SegmentType, useSegmentSkipper } from "./useSegmentSkipper";
+
+const noop = () => {};
+
+// Delay the FIRST auto-skip until playback has been stable this long. Seeking a
+// transcoded stream the instant the first frame appears (e.g. a 0:00 intro)
+// asks the transcode for a segment it hasn't produced yet and stalls at 0:00;
+// direct-play is always seekable so the delay is invisible there.
+const AUTO_SKIP_ARM_DELAY_MS = 1500;
+
+export interface ActiveSegment {
+  type: SegmentType;
+  currentSegment: MediaTimeSegment;
+  skipSegment: (useHaptics?: boolean) => void;
+  skipMode: SegmentSkipMode;
+}
+
+interface UseMediaSegmentsProps {
+  segments: SegmentBuckets | undefined;
+  /** Current playback position, in ms. */
+  currentTime: number;
+  /** Total media duration, in ms. */
+  maxMs?: number;
+  /** Player seek, expects ms. */
+  seek: (ms: number) => void;
+  /** Player resume. */
+  play: () => void;
+  isPlaying: boolean;
+  /** True while the player is (re)buffering; auto-skip waits for this to clear. */
+  isBuffering?: boolean;
+}
+
+export interface UseMediaSegmentsReturn {
+  /** Highest-priority segment under the playhead (excludes 'none' types), or null. */
+  activeSegment: ActiveSegment | null;
+  /** Skip the active segment (no-op when there is none). */
+  skipActiveSegment: (useHaptics?: boolean) => void;
+  /** Show the generic skip button: an active segment that is not the outro. */
+  showSkipButton: boolean;
+  /** The active segment is the outro/credits (it gets its own button/card). */
+  isOutroActive: boolean;
+  /** Skip the outro, independent of which button the priority shows. */
+  skipOutro: (useHaptics?: boolean) => void;
+  /** The outro ends before the media end, i.e. there is content after credits. */
+  hasContentAfterCredits: boolean;
+}
+
+/**
+ * Unified media-segment orchestration shared by the mobile and TV player controls.
+ * Owns the per-type skippers, the seek-with-delayed-play workaround, the overlap
+ * priority (Commercial > Recap > Intro > Preview > Outro) and a SINGLE auto-skip
+ * driver, so overlapping auto-enabled segments can't fire competing seeks and both
+ * platforms behave identically.
+ */
+export const useMediaSegments = ({
+  segments,
+  currentTime,
+  maxMs,
+  seek,
+  play,
+  isPlaying,
+  isBuffering = false,
+}: UseMediaSegmentsProps): UseMediaSegmentsReturn => {
+  // Keep sub-second precision: segment boundaries are fractional seconds, so
+  // flooring currentTime would detect segments up to ~1s late / end them early.
+  const currentTimeSeconds = currentTime / 1000;
+  const maxSeconds = maxMs ? maxMs / 1000 : undefined;
+
+  // Seek-with-delayed-play workaround: some seeks otherwise resume from the
+  // pre-seek position. playingRef avoids a stale closure on isPlaying.
+  const playTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const playingRef = useRef(isPlaying);
+  useEffect(() => {
+    playingRef.current = isPlaying;
+  }, [isPlaying]);
+  useEffect(() => {
+    return () => {
+      if (playTimeoutRef.current) clearTimeout(playTimeoutRef.current);
+    };
+  }, []);
+
+  const seekSeconds = useCallback(
+    (timeInSeconds: number) => {
+      if (playTimeoutRef.current) clearTimeout(playTimeoutRef.current);
+      seek(timeInSeconds * 1000);
+      playTimeoutRef.current = setTimeout(() => {
+        if (playingRef.current) play();
+        playTimeoutRef.current = null;
+      }, 200);
+    },
+    [seek, play],
+  );
+
+  const introSkipper = useSegmentSkipper({
+    segments: segments?.introSegments ?? [],
+    segmentType: "Intro",
+    currentTime: currentTimeSeconds,
+    seek: seekSeconds,
+  });
+  const outroSkipper = useSegmentSkipper({
+    segments: segments?.creditSegments ?? [],
+    segmentType: "Outro",
+    currentTime: currentTimeSeconds,
+    totalDuration: maxSeconds,
+    seek: seekSeconds,
+  });
+  const recapSkipper = useSegmentSkipper({
+    segments: segments?.recapSegments ?? [],
+    segmentType: "Recap",
+    currentTime: currentTimeSeconds,
+    seek: seekSeconds,
+  });
+  const commercialSkipper = useSegmentSkipper({
+    segments: segments?.commercialSegments ?? [],
+    segmentType: "Commercial",
+    currentTime: currentTimeSeconds,
+    seek: seekSeconds,
+  });
+  const previewSkipper = useSegmentSkipper({
+    segments: segments?.previewSegments ?? [],
+    segmentType: "Preview",
+    currentTime: currentTimeSeconds,
+    seek: seekSeconds,
+  });
+
+  // Priority when multiple segments overlap: Commercial > Recap > Intro > Preview > Outro.
+  const activeSegment = useMemo<ActiveSegment | null>(() => {
+    const byPriority: Array<[SegmentType, typeof introSkipper]> = [
+      ["Commercial", commercialSkipper],
+      ["Recap", recapSkipper],
+      ["Intro", introSkipper],
+      ["Preview", previewSkipper],
+      ["Outro", outroSkipper],
+    ];
+    for (const [type, skipper] of byPriority) {
+      if (skipper.currentSegment) {
+        return {
+          type,
+          currentSegment: skipper.currentSegment,
+          skipSegment: skipper.skipSegment,
+          skipMode: skipper.skipMode,
+        };
+      }
+    }
+    return null;
+  }, [
+    commercialSkipper.currentSegment,
+    commercialSkipper.skipSegment,
+    commercialSkipper.skipMode,
+    recapSkipper.currentSegment,
+    recapSkipper.skipSegment,
+    recapSkipper.skipMode,
+    introSkipper.currentSegment,
+    introSkipper.skipSegment,
+    introSkipper.skipMode,
+    previewSkipper.currentSegment,
+    previewSkipper.skipSegment,
+    previewSkipper.skipMode,
+    outroSkipper.currentSegment,
+    outroSkipper.skipSegment,
+    outroSkipper.skipMode,
+  ]);
+
+  // Single auto-skip driver: only the priority-resolved active segment skips,
+  // so overlapping auto-enabled segments can't trigger competing seeks.
+  const autoSkipTriggeredRef = useRef<string | null>(null);
+  const [autoSkipArmed, setAutoSkipArmed] = useState(false);
+
+  // Reset per item (its segments change): re-allow skipping and re-arm so the
+  // next episode's transcode has time to become seekable. We do NOT reset the
+  // guard when the active segment momentarily disappears — seeking a transcoded
+  // stream makes the reported position bounce back into a 0:00 intro, and
+  // clearing the guard there caused an infinite seek loop that crashed mpv.
+  useEffect(() => {
+    autoSkipTriggeredRef.current = null;
+    setAutoSkipArmed(false);
+  }, [segments]);
+
+  // Arm auto-skip once playback has been genuinely stable (not buffering) for a
+  // short moment, so the first seek lands on an established (seekable) timeline.
+  useEffect(() => {
+    if (autoSkipArmed || isBuffering || !isPlaying) return;
+    const id = setTimeout(() => setAutoSkipArmed(true), AUTO_SKIP_ARM_DELAY_MS);
+    return () => clearTimeout(id);
+  }, [autoSkipArmed, isBuffering, isPlaying]);
+
+  useEffect(() => {
+    if (
+      !autoSkipArmed ||
+      !activeSegment ||
+      !isPlaying ||
+      isBuffering ||
+      activeSegment.skipMode !== "auto"
+    )
+      return;
+    const { startTime, endTime } = activeSegment.currentSegment;
+    const segmentId = `${activeSegment.type}:${startTime}-${endTime}`;
+    if (autoSkipTriggeredRef.current === segmentId) return;
+    autoSkipTriggeredRef.current = segmentId;
+    activeSegment.skipSegment(false);
+  }, [activeSegment, isPlaying, isBuffering, autoSkipArmed]);
+
+  const isOutroActive = activeSegment?.type === "Outro";
+
+  return {
+    activeSegment,
+    skipActiveSegment: activeSegment?.skipSegment ?? noop,
+    showSkipButton: !!activeSegment && !isOutroActive,
+    isOutroActive,
+    skipOutro: outroSkipper.skipSegment,
+    hasContentAfterCredits:
+      outroSkipper.currentSegment && maxSeconds
+        ? outroSkipper.currentSegment.endTime < maxSeconds
+        : false,
+  };
+};

hooks/useSegmentSkipper.ts

@@ -0,0 +1,104 @@
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import { MediaTimeSegment } from "@/providers/Downloads/types";
+import { SegmentSkipMode, useSettings } from "@/utils/atoms/settings";
+import { useHaptic } from "./useHaptic";
+
+export type SegmentType =
+  | "Intro"
+  | "Outro"
+  | "Recap"
+  | "Commercial"
+  | "Preview";
+
+const SEGMENT_TO_SETTING: Record<
+  SegmentType,
+  "skipIntro" | "skipOutro" | "skipRecap" | "skipCommercial" | "skipPreview"
+> = {
+  Intro: "skipIntro",
+  Outro: "skipOutro",
+  Recap: "skipRecap",
+  Commercial: "skipCommercial",
+  Preview: "skipPreview",
+};
+
+interface UseSegmentSkipperProps {
+  segments: MediaTimeSegment[];
+  segmentType: SegmentType;
+  currentTime: number;
+  totalDuration?: number;
+  seek: (time: number) => void;
+}
+
+interface UseSegmentSkipperReturn {
+  currentSegment: MediaTimeSegment | null;
+  skipSegment: (useHaptics?: boolean) => void;
+  skipMode: SegmentSkipMode;
+}
+
+/**
+ * Generic hook for a single media segment type (intro, outro, recap, commercial, preview).
+ * Reports the segment currently under the playhead, its skip mode, and a skip action.
+ * Auto-skip is NOT performed here: the consumer drives it from the priority-resolved
+ * active segment so overlapping segments can't trigger competing seeks.
+ */
+export const useSegmentSkipper = ({
+  segments,
+  segmentType,
+  currentTime,
+  totalDuration,
+  seek,
+}: UseSegmentSkipperProps): UseSegmentSkipperReturn => {
+  const { settings } = useSettings();
+  const haptic = useHaptic();
+
+  const skipMode: SegmentSkipMode =
+    settings?.[SEGMENT_TO_SETTING[segmentType]] ?? "none";
+
+  const currentSegment = useMemo(
+    () =>
+      segments.find(
+        (s) => currentTime >= s.startTime && currentTime < s.endTime,
+      ) ?? null,
+    [segments, currentTime],
+  );
+
+  // Refs keep skipSegment's identity stable across seek/haptic changes
+  // (haptic is unstable when disabled), so the consumer's auto-skip effect
+  // doesn't re-fire spuriously.
+  const seekRef = useRef(seek);
+  const hapticRef = useRef(haptic);
+  useEffect(() => {
+    seekRef.current = seek;
+    hapticRef.current = haptic;
+  });
+
+  const skipSegment = useCallback(
+    (useHaptics = true) => {
+      if (!currentSegment || skipMode === "none") return;
+
+      // Outro endTime sometimes exceeds the actual file duration. Keep a 2s
+      // buffer so the player's natural end-of-video flow (next-episode
+      // countdown, etc.) still fires instead of stalling at the exact end.
+      let target = currentSegment.endTime;
+      if (
+        segmentType === "Outro" &&
+        totalDuration != null &&
+        Number.isFinite(totalDuration) &&
+        target >= totalDuration
+      ) {
+        target = Math.max(0, totalDuration - 2);
+      }
+
+      seekRef.current(target);
+
+      if (useHaptics) hapticRef.current();
+    },
+    [currentSegment, segmentType, totalDuration, skipMode],
+  );
+
+  return {
+    currentSegment: skipMode === "none" ? null : currentSegment,
+    skipSegment,
+    skipMode,
+  };
+};

hooks/useTVBackHandler.ts

@@ -4,42 +4,41 @@ import { Platform } from "react-native";
 import {
   disableTVMenuKeyInterception,
   enableTVMenuKeyInterception,
-  useTVBackPress,
 } from "./useTVBackPress";
 
 export { enableTVMenuKeyInterception } from "./useTVBackPress";
 
-/** All tab route names used in the bottom tab navigator. */
-export const TAB_ROUTES = [
-  "(home)",
-  "(search)",
-  "(favorites)",
-  "(libraries)",
-  "(watchlists)",
-  "(custom-links)",
-  "(settings)",
-] as const;
-
-export type TabRoute = (typeof TAB_ROUTES)[number];
-
-/** Check if a segment string is a tab route. */
-export function isTabRoute(s: string): s is TabRoute {
-  return (TAB_ROUTES as readonly string[]).includes(s);
-}
-
 /**
  * Check if we're at the root of a tab
  */
 function isAtTabRoot(segments: string[]): boolean {
   const lastSegment = segments[segments.length - 1];
-  return isTabRoute(lastSegment) || lastSegment === "index";
+  const tabNames = [
+    "(home)",
+    "(search)",
+    "(favorites)",
+    "(libraries)",
+    "(watchlists)",
+    "(settings)",
+    "(custom-links)",
+  ];
+  return tabNames.includes(lastSegment) || lastSegment === "index";
 }
 
 /**
  * Get the current tab name from segments
  */
-function getCurrentTab(segments: string[]): TabRoute | undefined {
+function getCurrentTab(segments: string[]): string | undefined {
-  return segments.find(isTabRoute);
+  return segments.find(
+    (s) =>
+      s === "(home)" ||
+      s === "(search)" ||
+      s === "(favorites)" ||
+      s === "(libraries)" ||
+      s === "(watchlists)" ||
+      s === "(settings)" ||
+      s === "(custom-links)",
+  );
 }
 
 /**
@@ -50,6 +49,7 @@ function getCurrentTab(segments: string[]): TabRoute | undefined {
 export function useTVHomeBackHandler() {
   const segments = useSegments();
 
+  // Get current state
   const currentTab = getCurrentTab(segments);
   const atTabRoot = isAtTabRoot(segments);
   const isOnHomeRoot = atTabRoot && currentTab === "(home)";
@@ -65,24 +65,3 @@ export function useTVHomeBackHandler() {
     enableTVMenuKeyInterception();
   }, [isOnHomeRoot]);
 }
-
-/**
- * Handles back press at a non-Home tab root on Android TV by navigating to Home.
- *
- * Without NativeTabs, the Stack navigator used for the Android TV nav bar has no
- * built-in tab-level back handling — pressing back at a tab root would pop the
- * Stack entirely and exit the tab navigator. This hook intercepts that and routes
- * to Home instead.
- */
-export function useTVTabRootBackHandler(
-  onNavigateHome: () => void,
-  isAtTabRoot: boolean,
-  currentTab: string | undefined,
-) {
-  useTVBackPress(() => {
-    if (!Platform.isTV || Platform.OS !== "android") return false;
-    if (!isAtTabRoot || currentTab === "(home)") return false;
-    onNavigateHome();
-    return true;
-  }, [isAtTabRoot, currentTab, onNavigateHome]);
-}

hooks/useTVRequestModal.ts

@@ -11,12 +11,6 @@ interface ShowRequestModalParams {
   id: number;
   mediaType: MediaType;
   onRequested: () => void;
-  /**
-   * Replace the current route instead of pushing. Use when opening the request
-   * modal from another modal (e.g. the season selector) so the new sheet takes
-   * its place rather than stacking on top of it (which breaks TV focus).
-   */
-  replace?: boolean;
 }
 
 export const useTVRequestModal = () => {
@@ -31,11 +25,7 @@ export const useTVRequestModal = () => {
         mediaType: params.mediaType,
         onRequested: params.onRequested,
       });
-      if (params.replace) {
+      router.push("/(auth)/tv-request-modal");
-        router.replace("/(auth)/tv-request-modal");
-      } else {
-        router.push("/(auth)/tv-request-modal");
-      }
     },
     [router],
   );

modules/mpv-player/android/build.gradle

@@ -53,5 +53,5 @@ android {
 
 dependencies {
   // libmpv from Maven Central
-  implementation 'dev.jdtech.mpv:libmpv:1.0.0'
+  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt

@@ -3,14 +3,14 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.AssetManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.system.Os
 import android.util.Log
 import android.view.Surface
 import java.io.File
-import java.util.Locale
+import java.io.FileOutputStream
 
 /**
  * MPV renderer that wraps libmpv for video playback.
@@ -76,14 +76,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     private var surface: Surface? = null
     private var isRunning = false
-
+    private var isStopping = false
-    // This renderer's own mpv handle. Per-instance (not singleton) — each
-    // player screen gets a fresh mpv handle and drops the reference on stop.
-    // We intentionally do NOT call a destroy() equivalent: libmpv 1.0's
-    // nativeDestroy has an internal use-after-free we can't fix from Kotlin,
-    // so we mirror Findroid and let the JVM GC + native finalization path
-    // reclaim resources. Only one player is alive at a time in this app.
-    private var mpv: MPVLib? = null
     
     // Cached state
     private var cachedPosition: Double = 0.0
@@ -146,105 +139,103 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         if (isRunning) return
         
         try {
-            // Per-instance handle — see class-level comment. Each player gets
+            MPVLib.create(context)
-            // its own mpv; we drop the reference in stop().
+            MPVLib.addObserver(this)
-            val mpv = MPVLib.create(context)
-            this.mpv = mpv
-            mpv.addObserver(this)
             
-            // Resolved once — TV gets the memory-pressure customizations
+            /**
-            // (SCUDO_OPTIONS, hwdec/profile, demuxer-seekable-cache, larger
+             * Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
-            // audio-buffer) that would be counterproductive on higher-RAM
+             *
-            // mobile devices. Demuxer cache sizes are NOT included here —
+             * Technical Background:
-            // those come from user settings via load().
+             * ====================
-            val isTV = isTvDevice()
+             * On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
-
+             * format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
-            // mpv config directory — used by the config-dir option below and
+             * even when subtitle tracks are properly detected and loaded.
-            // as XDG_CONFIG_HOME for fontconfig.
+             *
+             * Why This Is Necessary:
+             * =====================
+             * 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
+             *    mpv cannot access them directly due to sandboxing and library isolation.
+             *
+             * 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
+             *    configured directory, mpv either:
+             *    - Fails silently (subtitles don't appear)
+             *    - Falls back to a default font that may not support the required character set
+             *    - Crashes or produces rendering errors
+             *
+             * 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
+             *    MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
+             *
+             * Reference:
+             * =========
+             * This workaround is documented in the mpv-android project:
+             * https://github.com/mpv-android/mpv-android/issues/96
+             *
+             * The issue discusses that without a font in the config directory, SubRip subtitles fail to load
+             * properly on Android, and the solution is to copy a font file to a known location that mpv can access.
+             */
+            // Create mpv config directory and copy font files
             val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
+            //Log.i(TAG, "mpv config dir: $mpvDir")
             if (!mpvDir.exists()) mpvDir.mkdirs()
-
+            // This needs to be named `subfont.ttf` else it won't work
-            // Point fontconfig (new in libmpv 1.0) at writable app dirs so it
+            arrayOf("subfont.ttf").forEach { fileName ->
-            // persists its font index across runs instead of re-walking
+                val file = File(mpvDir, fileName)
-            // /system/fonts on every subtitle/seek event. Each rebuild costs
+                if (file.exists()) return@forEach
-            // ~1-2 s and ~10-30 MB of scudo:primary memory that scudo then
+                context.assets
-            // holds onto. Without this we see "No usable fontconfig
+                    .open(fileName, AssetManager.ACCESS_STREAMING)
-            // configuration file found, using fallback" on every re-init.
+                    .copyTo(FileOutputStream(file))
-            try {
-                val cacheDir = context.cacheDir.absolutePath
-                val configDir = (context.getExternalFilesDir(null) ?: context.filesDir).absolutePath
-                Os.setenv("XDG_CACHE_HOME", cacheDir, true)
-                Os.setenv("XDG_CONFIG_HOME", configDir, true)
-                Os.setenv("HOME", configDir, true)
-            } catch (e: Exception) {
-                Log.w(TAG, "Could not set XDG/HOME env for fontconfig: ${e.message}")
             }
-
+            MPVLib.setOptionString("config", "yes")
-            mpv?.setOptionString("config", "yes")
+            MPVLib.setOptionString("config-dir", mpvDir.path)
-            mpv?.setOptionString("config-dir", mpvDir.path)
             
             // Configure mpv options before initialization (based on Findroid)
             this.voDriver = voDriver
-            mpv?.setOptionString("vo", voDriver)
+            MPVLib.setOptionString("vo", voDriver)
-            mpv?.setOptionString("gpu-context", "android")
+            MPVLib.setOptionString("gpu-context", "android")
-            mpv?.setOptionString("opengl-es", "yes")
+            MPVLib.setOptionString("opengl-es", "yes")
             
-            // Hardware decoder codecs (shared)
+            // Hardware decode path:
-            mpv?.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+            //  - Real TV hardware: zero-copy `mediacodec` (fastest on low-power devices).
-
-            // Pause on initial cache fill (shared default). The actual
-            // cache mode, cache-secs, and demuxer cache sizes come from
-            // user preferences and are applied per-load in load().
-            mpv?.setOptionString("cache-pause-initial", "yes")
-
-            // Hardware decode path + TV-only memory options. Demuxer cache
-            // sizes and cache-secs are NOT set here — they come from user
-            // preferences via load().
-            //  - Emulator: software decode. Its MediaCodec can't bind an
-            //    output surface (surface 0x0); HEVC then fails cleanly and
-            //    mpv auto-falls-back to software, but H.264 "opens"
-            //    deceptively and wedges the core with no fallback (black
-            //    video, then any command — seek/pause — deadlocks the UI
-            //    thread → ANR). hwdec=no makes every codec render via the
-            //    gpu-next VO. Real devices unaffected.
-            //  - Real TV hardware: zero-copy `mediacodec` (fastest on
-            //    low-power devices) + fast profile.
             //  - Real phone: `mediacodec-copy` (broadest compatibility).
+            //  - Emulator: software decode. Its MediaCodec can't bind an output surface
+            //    (surface 0x0); HEVC then fails cleanly and mpv auto-falls-back to software,
+            //    but H.264 "opens" deceptively and wedges the core with no fallback (black
+            //    video, then any command — seek/pause — deadlocks the UI thread → ANR).
+            //    hwdec=no makes every codec render via the gpu-next VO. Real devices unaffected.
             when {
-                isEmulator() -> mpv?.setOptionString("hwdec", "no")
+                isEmulator() -> MPVLib.setOptionString("hwdec", "no")
-                isTV -> {
+                isTvDevice() -> {
-                    mpv?.setOptionString("hwdec", "mediacodec")
+                    MPVLib.setOptionString("hwdec", "mediacodec")
-                    mpv?.setOptionString("profile", "fast")
+                    MPVLib.setOptionString("profile", "fast")
-                    // Don't retain already-played content for backward
-                    // seeking over a network source — Jellyfin can re-fetch
-                    // on demand. Saves up to ~30 MiB on long seeks and
-                    // reduces swap pressure.
-                    mpv?.setOptionString("demuxer-seekable-cache", "no")
-                    // Larger audio buffer to absorb page-fault stalls
-                    // (default ~0.2s). Cheap insurance against the audio
-                    // underruns that happen when the kernel is swap-thrashing.
-                    mpv?.setOptionString("audio-buffer", "0.5")
                 }
-                else -> mpv?.setOptionString("hwdec", "mediacodec-copy")
+                else -> MPVLib.setOptionString("hwdec", "mediacodec-copy")
             }
+            MPVLib.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+            
+            // Cache settings for better network streaming
+            MPVLib.setOptionString("cache", "yes")
+            MPVLib.setOptionString("cache-pause-initial", "yes")
+            MPVLib.setOptionString("demuxer-max-bytes", "150MiB")
+            MPVLib.setOptionString("demuxer-max-back-bytes", "75MiB")
+            MPVLib.setOptionString("demuxer-readahead-secs", "20")
             
             // Seeking optimization - faster seeking at the cost of less precision
             // Use keyframe seeking by default (much faster for network streams)
-            mpv?.setOptionString("hr-seek", "no")
+            MPVLib.setOptionString("hr-seek", "no")
             // Drop frames during seeking for faster response
-            mpv?.setOptionString("hr-seek-framedrop", "yes")
+            MPVLib.setOptionString("hr-seek-framedrop", "yes")
             
             // Subtitle settings
-            mpv?.setOptionString("sub-scale-with-window", "no")
+            MPVLib.setOptionString("sub-scale-with-window", "no")
-            mpv?.setOptionString("sub-use-margins", "no")
+            MPVLib.setOptionString("sub-use-margins", "no")
-            mpv?.setOptionString("subs-match-os-language", "yes")
+            MPVLib.setOptionString("subs-match-os-language", "yes")
-            mpv?.setOptionString("subs-fallback", "yes")
+            MPVLib.setOptionString("subs-fallback", "yes")
             
             // Important: Start with force-window=no, will be set to yes when surface is attached
-            mpv?.setOptionString("force-window", "no")
+            MPVLib.setOptionString("force-window", "no")
-            mpv?.setOptionString("keep-open", "always")
+            MPVLib.setOptionString("keep-open", "always")
             
-            mpv.initialize()
+            MPVLib.initialize()
             
             // Observe properties
             observeProperties()
@@ -258,68 +249,21 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     }
     
     fun stop() {
+        if (isStopping) return
         if (!isRunning) return
+        
+        isStopping = true
         isRunning = false
         
-        val m = mpv
+        try {
-        mpv = null
+            MPVLib.removeObserver(this)
+            MPVLib.detachSurface()
+            MPVLib.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error stopping MPV: ${e.message}")
+        }
         
-        // Clear cached media state on the main thread so the next player
+        isStopping = false
-        // screen doesn't observe stale position/duration values during the
-        // (async) teardown below.
-        currentUrl = null
-        currentHeaders = null
-        pendingExternalSubtitles = emptyList()
-        initialSubtitleId = null
-        initialAudioId = null
-        cachedPosition = 0.0
-        cachedDuration = 0.0
-        cachedCacheSeconds = 0.0
-
-        if (m == null) return
-
-        // Teardown runs on a background daemon thread. mpv's "stop" command
-        // flushes the demuxer queue and releases the MediaCodec hardware
-        // decoder — synchronous JNI work that can block for hundreds of ms
-        // on TV hardware. Running it on the main thread produced a visible
-        // delay/stutter between pressing "exit" and the confirm alert
-        // appearing. The local `m` keeps the MPVLib instance alive for the
-        // lifetime of this thread even though we've already nulled `mpv`.
-        Thread {
-            // Drop force-window BEFORE issuing stop. With keep-open=always +
-            // force-window=yes, mpv tears down the decoder at stop time but
-            // tries to keep the VO alive — which fires an internal
-            // video-reconfig. On libmpv 1.0's gpu-next/android backend that
-            // reconfig path crashes with "Missing surface pointer" because we
-            // detach the Surface below before mpv's worker reaches the
-            // reconfig step (command() is async). Setting force-window=no
-            // first makes mpv tear VO down cleanly instead of attempting a
-            // doomed re-init, eliminating the fatal VO error and the
-            // "playback won't restart" aftermath.
-            try {
-                m.setOptionString("force-window", "no")
-            } catch (e: Exception) {
-                Log.e(TAG, "Error clearing force-window: ${e.message}")
-            }
-            try {
-                // Stop playback — flushes demuxer queue and signals MediaCodec
-                // to release its hardware decoders. This is the bulk of what
-                // we can reclaim without calling destroy().
-                m.command(arrayOf("stop"))
-            } catch (e: Exception) {
-                Log.e(TAG, "Error stopping mpv playback: ${e.message}")
-            }
-            try {
-                m.removeObserver(this)
-            } catch (e: Exception) {
-                Log.e(TAG, "Error removing mpv observer: ${e.message}")
-            }
-            try {
-                m.detachSurface()
-            } catch (e: Exception) {
-                Log.e(TAG, "Error detaching mpv surface: ${e.message}")
-            }
-        }.also { it.isDaemon = true }.start()
     }
     
     /**
@@ -334,10 +278,10 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = surface
         Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
         if (isRunning) {
-            mpv?.attachSurface(surface)
+            MPVLib.attachSurface(surface)
-            mpv?.setOptionString("force-window", "yes")
+            MPVLib.setOptionString("force-window", "yes")
             // Read back vo to confirm it's still active
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
         }
     }
@@ -357,8 +301,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = null
         Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
         if (isRunning) {
-            mpv?.detachSurface()
+            MPVLib.detachSurface()
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
         }
     }
@@ -369,7 +313,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
      */
     fun updateSurfaceSize(width: Int, height: Int) {
         if (isRunning) {
-            mpv?.setPropertyString("android-surface-size", "${width}x$height")
+            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
             Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
         } else {
             Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
@@ -385,9 +329,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         if (!isRunning) return
         val pos = cachedPosition
         Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        mpv?.command(arrayOf("frame-step"))
+        MPVLib.command(arrayOf("frame-step"))
         if (pos > 0) {
-            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
+            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
         }
     }
     
@@ -397,11 +341,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         startPosition: Double? = null,
         externalSubtitles: List<String>? = null,
         initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null,
+        initialAudioId: Int? = null
-        cacheEnabled: String? = null,
-        cacheSeconds: Int? = null,
-        demuxerMaxBytes: Int? = null,
-        demuxerMaxBackBytes: Int? = null
     ) {
         currentUrl = url
         currentHeaders = headers
@@ -414,26 +354,16 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         mainHandler.post { delegate?.onLoadingChanged(true) }
         
         // Stop previous playback
-        mpv?.command(arrayOf("stop"))
+        MPVLib.command(arrayOf("stop"))
         
         // Set HTTP headers if provided
         updateHttpHeaders(headers)
         
-        // Apply cache/buffer settings from user preferences (mirrors iOS).
+        // Set start position
-        // These override the conservative defaults applied in start() so the
-        // TV/mobile settings screen actually takes effect on Android.
-        cacheEnabled?.let { mpv?.setOptionString("cache", it) }
-        cacheSeconds?.let { mpv?.setOptionString("cache-secs", it.toString()) }
-        demuxerMaxBytes?.let { mpv?.setOptionString("demuxer-max-bytes", "${it}MiB") }
-        demuxerMaxBackBytes?.let { mpv?.setOptionString("demuxer-max-back-bytes", "${it}MiB") }
-        
-        // Set start position. mpv's time parser requires '.' as the decimal
-        // separator; use Locale.US so devices with other default locales
-        // (e.g. ',' as decimal separator) don't break resume-from-position.
         if (startPosition != null && startPosition > 0) {
-            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
+            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
         } else {
-            mpv?.setPropertyString("start", "0")
+            MPVLib.setPropertyString("start", "0")
         }
         
         // Set initial audio track if specified
@@ -453,7 +383,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         // Load the file
-        mpv?.command(arrayOf("loadfile", url, "replace"))
+        MPVLib.command(arrayOf("loadfile", url, "replace"))
     }
     
     fun reloadCurrentItem() {
@@ -469,29 +399,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        mpv?.setPropertyString("http-header-fields", headerString)
+        MPVLib.setPropertyString("http-header-fields", headerString)
     }
     
     private fun observeProperties() {
-        mpv?.observeProperty("duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("duration", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("pause", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("track-list/count", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
-        mpv?.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
         // Video dimensions for PiP aspect ratio
-        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
     }
     
     // MARK: - Playback Controls
     
     fun play() {
-        mpv?.setPropertyBoolean("pause", false)
+        MPVLib.setPropertyBoolean("pause", false)
     }
     
     fun pause() {
-        mpv?.setPropertyBoolean("pause", true)
+        MPVLib.setPropertyBoolean("pause", true)
     }
     
     fun togglePause() {
@@ -501,22 +431,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun seekTo(seconds: Double) {
         val clamped = maxOf(0.0, seconds)
         cachedPosition = clamped
-        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
+        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
     }
     
     fun seekBy(seconds: Double) {
         val newPosition = maxOf(0.0, cachedPosition + seconds)
         cachedPosition = newPosition
-        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
+        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
     }
     
     fun setSpeed(speed: Double) {
         _playbackSpeed = speed
-        mpv?.setPropertyDouble("speed", speed)
+        MPVLib.setPropertyDouble("speed", speed)
     }
     
     fun getSpeed(): Double {
-        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
+        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
     }
     
     // MARK: - Subtitle Controls
@@ -524,19 +454,19 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getSubtitleTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "sub") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
             
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -548,61 +478,61 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun setSubtitleTrack(trackId: Int) {
         Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
         if (trackId < 0) {
-            mpv?.setPropertyString("sid", "no")
+            MPVLib.setPropertyString("sid", "no")
         } else {
-            mpv?.setPropertyInt("sid", trackId)
+            MPVLib.setPropertyInt("sid", trackId)
         }
     }
     
     fun disableSubtitles() {
-        mpv?.setPropertyString("sid", "no")
+        MPVLib.setPropertyString("sid", "no")
     }
     
     fun getCurrentSubtitleTrack(): Int {
-        return mpv?.getPropertyInt("sid") ?: 0
+        return MPVLib.getPropertyInt("sid") ?: 0
     }
     
     fun addSubtitleFile(url: String, select: Boolean = true) {
         val flag = if (select) "select" else "cached"
-        mpv?.command(arrayOf("sub-add", url, flag))
+        MPVLib.command(arrayOf("sub-add", url, flag))
     }
     
     // MARK: - Subtitle Positioning
     
     fun setSubtitlePosition(position: Int) {
-        mpv?.setPropertyInt("sub-pos", position)
+        MPVLib.setPropertyInt("sub-pos", position)
     }
     
     fun setSubtitleScale(scale: Double) {
-        mpv?.setPropertyDouble("sub-scale", scale)
+        MPVLib.setPropertyDouble("sub-scale", scale)
     }
     
     fun setSubtitleMarginY(margin: Int) {
-        mpv?.setPropertyInt("sub-margin-y", margin)
+        MPVLib.setPropertyInt("sub-margin-y", margin)
     }
     
     fun setSubtitleAlignX(alignment: String) {
-        mpv?.setPropertyString("sub-align-x", alignment)
+        MPVLib.setPropertyString("sub-align-x", alignment)
     }
     
     fun setSubtitleAlignY(alignment: String) {
-        mpv?.setPropertyString("sub-align-y", alignment)
+        MPVLib.setPropertyString("sub-align-y", alignment)
     }
     
     fun setSubtitleFontSize(size: Int) {
-        mpv?.setPropertyInt("sub-font-size", size)
+        MPVLib.setPropertyInt("sub-font-size", size)
     }
 
     fun setSubtitleBorderStyle(style: String) {
-        mpv?.setPropertyString("sub-border-style", style)
+        MPVLib.setPropertyString("sub-border-style", style)
     }
 
     fun setSubtitleBackgroundColor(color: String) {
-        mpv?.setPropertyString("sub-back-color", color)
+        MPVLib.setPropertyString("sub-back-color", color)
     }
 
     fun setSubtitleAssOverride(mode: String) {
-        mpv?.setPropertyString("sub-ass-override", mode)
+        MPVLib.setPropertyString("sub-ass-override", mode)
     }
 
     // MARK: - Audio Track Controls
@@ -610,25 +540,25 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getAudioTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "audio") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+            MPVLib.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
             
-            val channels = mpv?.getPropertyInt("track-list/$i/audio-channels")
+            val channels = MPVLib.getPropertyInt("track-list/$i/audio-channels")
             if (channels != null && channels > 0) {
                 track["channels"] = channels
             }
             
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -639,11 +569,11 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     fun setAudioTrack(trackId: Int) {
         Log.i(TAG, "setAudioTrack: setting aid to $trackId")
-        mpv?.setPropertyInt("aid", trackId)
+        MPVLib.setPropertyInt("aid", trackId)
     }
     
     fun getCurrentAudioTrack(): Int {
-        return mpv?.getPropertyInt("aid") ?: 0
+        return MPVLib.getPropertyInt("aid") ?: 0
     }
 
     // MARK: - Video Scaling
@@ -652,7 +582,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         // panscan: 0.0 = fit (letterbox), 1.0 = fill (crop)
         val panscanValue = if (zoomed) 1.0 else 0.0
         Log.i(TAG, "setZoomedToFill: setting panscan to $panscanValue")
-        mpv?.setPropertyDouble("panscan", panscanValue)
+        MPVLib.setPropertyDouble("panscan", panscanValue)
     }
 
     // MARK: - Technical Info
@@ -661,79 +591,58 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         val info = mutableMapOf<String, Any>()
 
         // Video dimensions
-        mpv?.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
             info["videoWidth"] = it
         }
-        mpv?.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
             info["videoHeight"] = it
         }
 
         // Video codec
-        mpv?.getPropertyString("video-format")?.let {
+        MPVLib.getPropertyString("video-format")?.let {
             info["videoCodec"] = it
         }
 
         // Audio codec
-        mpv?.getPropertyString("audio-codec-name")?.let {
+        MPVLib.getPropertyString("audio-codec-name")?.let {
             info["audioCodec"] = it
         }
 
         // FPS (container fps)
-        mpv?.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
             info["fps"] = it
         }
 
         // Video bitrate (bits per second)
-        mpv?.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
             info["videoBitrate"] = it
         }
 
         // Audio bitrate (bits per second)
-        mpv?.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
             info["audioBitrate"] = it
         }
 
         // Demuxer cache duration (seconds of video buffered)
-        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
+        MPVLib.getPropertyDouble("demuxer-cache-duration")?.let {
             info["cacheSeconds"] = it
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        mpv?.getPropertyInt("demuxer-max-bytes")?.let { bytes ->
-            info["demuxerMaxBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyInt("demuxer-max-back-bytes")?.let { bytes ->
-            info["demuxerMaxBackBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyDouble("cache-secs")?.let { secs ->
-            info["cacheSecsLimit"] = secs
-        }
-
         // Dropped frames
-        mpv?.getPropertyInt("frame-drop-count")?.let {
+        MPVLib.getPropertyInt("frame-drop-count")?.let {
             info["droppedFrames"] = it
         }
 
         // Active video output driver (read from MPV to confirm what's actually applied)
-        mpv?.getPropertyString("vo")?.let {
+        MPVLib.getPropertyString("vo")?.let {
             info["voDriver"] = it
         }
 
-        // Active hardware decoder.
+        // Active hardware decoder
-        // hwdec-current yields e.g. "mediacodec",
+        MPVLib.getPropertyString("hwdec-active")?.let {
-        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
-        mpv?.getPropertyString("hwdec-current")?.let {
             info["hwdec"] = it
         }
 
-        // Estimated video output fps (renderer-side, after filtering).
-        // Useful for diagnosing display/pipeline drops vs container fps.
-        mpv?.getPropertyDouble("estimated-vf-fps")?.takeIf { it > 0 }?.let {
-            info["estimatedVfFps"] = it
-        }
-
         return info
     }
 
@@ -826,7 +735,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                     pendingExternalSubtitles.forEachIndexed { index, subUrl ->
                         android.util.Log.d("MPVRenderer", "Adding external subtitle [$index]: $subUrl")
                         // "auto" flag = add without auto-selecting (order preserved, MPVLib.command is sync)
-                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
+                        MPVLib.command(arrayOf("sub-add", subUrl, "auto"))
                     }
                     pendingExternalSubtitles = emptyList()
                 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt

@@ -1,29 +1,20 @@
 package expo.modules.mpvplayer
 
 import android.content.Context
+import android.util.Log
+import android.view.Surface
 import dev.jdtech.mpv.MPVLib as LibMPV
 
 /**
- * Per-instance wrapper around the dev.jdtech.mpv.MPVLib class.
+ * Wrapper around the dev.jdtech.mpv.MPVLib class.
- *
+ * This provides a consistent interface for the rest of the app.
- * libmpv 1.0 exposes an instance-based API: each `LibMPV.create(ctx)` returns
- * a fresh, independent handle. Each player creates its own MPVLib instance
- * (Findroid pattern) and on teardown we simply drop the reference. We do NOT
- * call `LibMPV.destroy()` — its native implementation has an internal
- * use-after-free on libmpv 1.0 that we cannot fix from Kotlin. Letting the
- * GC reach the JVM-level finalizer (or never reaching it, since the native
- * handle lives in process-global state until exit) is strictly safer than
- * crashing.
- *
- * Trade-off: mpv's native footprint (decoder + demuxer cache) for one player
- * stays allocated until the next player's allocation displaces it in scudo's
- * arena. On a TV app where the player is the dominant memory consumer and
- * only one player is alive at a time, this is acceptable.
  */
-class MPVLib private constructor(private val instance: LibMPV) {
+object MPVLib {
+    private const val TAG = "MPVLib"
     
-    // Event observer interface — mirrors dev.jdtech.mpv.MPVLib.EventObserver
+    private var initialized = false
-    // so MPVLayerRenderer implements a stable, wrapper-owned signature.
+    
+    // Event observer interface
     interface EventObserver {
         fun eventProperty(property: String)
         fun eventProperty(property: String, value: Long)
@@ -35,141 +26,195 @@ class MPVLib private constructor(private val instance: LibMPV) {
     
     private val observers = mutableListOf<EventObserver>()
     
-    // Library event observer that forwards LibMPV callbacks to our observers.
+    // Library event observer that forwards to our observers
     private val libObserver = object : LibMPV.EventObserver {
-        override fun eventProperty(property: String) =
+        override fun eventProperty(property: String) {
-            dispatch { it.eventProperty(property) }
-
-        override fun eventProperty(property: String, value: Long) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Boolean) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: String) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Double) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun event(eventId: Int) =
-            dispatch { it.event(eventId) }
-
-        private inline fun dispatch(block: (EventObserver) -> Unit) {
             synchronized(observers) {
-                observers.forEach(block)
+                for (observer in observers) {
+                    observer.eventProperty(property)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Long) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Boolean) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: String) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Double) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun event(eventId: Int) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.event(eventId)
+                }
             }
         }
     }
     
     fun addObserver(observer: EventObserver) {
-        synchronized(observers) { observers.add(observer) }
+        synchronized(observers) {
+            observers.add(observer)
+        }
     }
     
     fun removeObserver(observer: EventObserver) {
-        synchronized(observers) { observers.remove(observer) }
+        synchronized(observers) {
+            observers.remove(observer)
+        }
+    }
+    
+    // MPV Event IDs
+    const val MPV_EVENT_NONE = 0
+    const val MPV_EVENT_SHUTDOWN = 1
+    const val MPV_EVENT_LOG_MESSAGE = 2
+    const val MPV_EVENT_GET_PROPERTY_REPLY = 3
+    const val MPV_EVENT_SET_PROPERTY_REPLY = 4
+    const val MPV_EVENT_COMMAND_REPLY = 5
+    const val MPV_EVENT_START_FILE = 6
+    const val MPV_EVENT_END_FILE = 7
+    const val MPV_EVENT_FILE_LOADED = 8
+    const val MPV_EVENT_IDLE = 11
+    const val MPV_EVENT_TICK = 14
+    const val MPV_EVENT_CLIENT_MESSAGE = 16
+    const val MPV_EVENT_VIDEO_RECONFIG = 17
+    const val MPV_EVENT_AUDIO_RECONFIG = 18
+    const val MPV_EVENT_SEEK = 20
+    const val MPV_EVENT_PLAYBACK_RESTART = 21
+    const val MPV_EVENT_PROPERTY_CHANGE = 22
+    const val MPV_EVENT_QUEUE_OVERFLOW = 24
+    
+    // End file reason
+    const val MPV_END_FILE_REASON_EOF = 0
+    const val MPV_END_FILE_REASON_STOP = 2
+    const val MPV_END_FILE_REASON_QUIT = 3
+    const val MPV_END_FILE_REASON_ERROR = 4
+    const val MPV_END_FILE_REASON_REDIRECT = 5
+    
+    /**
+     * Create and initialize the MPV library
+     */
+    fun create(context: Context, configDir: String? = null) {
+        if (initialized) return
+        
+        try {
+            LibMPV.create(context)
+            LibMPV.addObserver(libObserver)
+            initialized = true
+            Log.i(TAG, "libmpv created successfully")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to create libmpv: ${e.message}")
+            throw e
+        }
     }
     
     fun initialize() {
-        instance.init()
+        LibMPV.init()
     }
     
-    fun attachSurface(surface: android.view.Surface) {
+    fun destroy() {
-        instance.attachSurface(surface)
+        if (!initialized) return
+        try {
+            LibMPV.removeObserver(libObserver)
+            LibMPV.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error destroying mpv: ${e.message}")
+        }
+        initialized = false
+    }
+    
+    fun isInitialized(): Boolean = initialized
+    
+    fun attachSurface(surface: Surface) {
+        LibMPV.attachSurface(surface)
     }
     
     fun detachSurface() {
-        instance.detachSurface()
+        LibMPV.detachSurface()
     }
     
-    fun command(cmd: Array<String>) {
+    fun command(cmd: Array<String?>) {
-        instance.command(cmd)
+        LibMPV.command(cmd)
     }
     
     fun setOptionString(name: String, value: String): Int {
-        return instance.setOptionString(name, value)
+        return LibMPV.setOptionString(name, value)
     }
     
-    fun getPropertyInt(name: String): Int? = try {
+    fun getPropertyInt(name: String): Int? {
-        instance.getPropertyInt(name)
+        return try {
-    } catch (e: Exception) { null }
+            LibMPV.getPropertyInt(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
     
-    fun getPropertyDouble(name: String): Double? = try {
+    fun getPropertyDouble(name: String): Double? {
-        instance.getPropertyDouble(name)
+        return try {
-    } catch (e: Exception) { null }
+            LibMPV.getPropertyDouble(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
     
-    fun getPropertyBoolean(name: String): Boolean? = try {
+    fun getPropertyBoolean(name: String): Boolean? {
-        instance.getPropertyBoolean(name)
+        return try {
-    } catch (e: Exception) { null }
+            LibMPV.getPropertyBoolean(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
     
-    fun getPropertyString(name: String): String? = try {
+    fun getPropertyString(name: String): String? {
-        instance.getPropertyString(name)
+        return try {
-    } catch (e: Exception) { null }
+            LibMPV.getPropertyString(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
     
     fun setPropertyInt(name: String, value: Int) {
-        instance.setPropertyInt(name, value)
+        LibMPV.setPropertyInt(name, value)
     }
     
     fun setPropertyDouble(name: String, value: Double) {
-        instance.setPropertyDouble(name, value)
+        LibMPV.setPropertyDouble(name, value)
     }
     
     fun setPropertyBoolean(name: String, value: Boolean) {
-        instance.setPropertyBoolean(name, value)
+        LibMPV.setPropertyBoolean(name, value)
     }
     
     fun setPropertyString(name: String, value: String) {
-        instance.setPropertyString(name, value)
+        LibMPV.setPropertyString(name, value)
     }
     
     fun observeProperty(name: String, format: Int) {
-        instance.observeProperty(name, format)
+        LibMPV.observeProperty(name, format)
-    }
-
-    companion object {
-        /**
-         * Create a fresh mpv handle. Each call returns an independent instance —
-         * do not share across players. Attach exactly one [EventObserver] per
-         * player via [addObserver].
-         */
-        fun create(context: Context): MPVLib {
-            val lib = LibMPV.create(context)
-                ?: throw IllegalStateException("LibMPV.create returned null")
-            val wrapper = MPVLib(lib)
-            // The libObserver is attached for the lifetime of this MPVLib
-            // instance and forwards every LibMPV callback to our observers
-            // list. Player-specific observers are added/removed via
-            // addObserver/removeObserver.
-            lib.addObserver(wrapper.libObserver)
-            return wrapper
-        }
-
-        // MPV Event IDs (kept here so observers can reference them without
-        // holding a reference to an instance).
-        const val MPV_EVENT_NONE = 0
-        const val MPV_EVENT_SHUTDOWN = 1
-        const val MPV_EVENT_LOG_MESSAGE = 2
-        const val MPV_EVENT_GET_PROPERTY_REPLY = 3
-        const val MPV_EVENT_SET_PROPERTY_REPLY = 4
-        const val MPV_EVENT_COMMAND_REPLY = 5
-        const val MPV_EVENT_START_FILE = 6
-        const val MPV_EVENT_END_FILE = 7
-        const val MPV_EVENT_FILE_LOADED = 8
-        const val MPV_EVENT_IDLE = 11
-        const val MPV_EVENT_TICK = 14
-        const val MPV_EVENT_CLIENT_MESSAGE = 16
-        const val MPV_EVENT_VIDEO_RECONFIG = 17
-        const val MPV_EVENT_AUDIO_RECONFIG = 18
-        const val MPV_EVENT_SEEK = 20
-        const val MPV_EVENT_PLAYBACK_RESTART = 21
-        const val MPV_EVENT_PROPERTY_CHANGE = 22
-        const val MPV_EVENT_QUEUE_OVERFLOW = 24
-
-        // End file reason
-        const val MPV_END_FILE_REASON_EOF = 0
-        const val MPV_END_FILE_REASON_STOP = 2
-        const val MPV_END_FILE_REASON_QUIT = 3
-        const val MPV_END_FILE_REASON_ERROR = 4
-        const val MPV_END_FILE_REASON_REDIRECT = 5
     }
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -29,10 +29,6 @@ class MpvPlayerModule : Module() {
                 
                 val urlString = source["url"] as? String ?: return@Prop
                 
-                // Parse cache config if provided (mirrors iOS)
-                @Suppress("UNCHECKED_CAST")
-                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
-
                 @Suppress("UNCHECKED_CAST")
                 val config = VideoLoadConfig(
                     url = urlString,
@@ -42,11 +38,7 @@ class MpvPlayerModule : Module() {
                     autoplay = (source["autoplay"] as? Boolean) ?: true,
                     initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
                     initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    voDriver = source["voDriver"] as? String,
+                    voDriver = source["voDriver"] as? String
-                    cacheEnabled = cacheConfig?.get("enabled") as? String,
-                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
-                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
-                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
                 )
                 
                 view.loadVideo(config)
@@ -68,15 +60,6 @@ class MpvPlayerModule : Module() {
                 view.pause()
             }
 
-            // Stop playback and release the MediaCodec decoder + demuxer.
-            // Does not synchronously tear down the native mpv handle (see
-            // MPVLib / MpvPlayerView.destroy docs). Call before navigating
-            // away from the player screen to avoid OOM during screen
-            // transitions on low-RAM devices.
-            AsyncFunction("destroy") { view: MpvPlayerView ->
-                view.destroy()
-            }
-
             // Async function to seek to position
             AsyncFunction("seekTo") { view: MpvPlayerView, position: Double ->
                 view.seekTo(position)

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -26,11 +26,7 @@ data class VideoLoadConfig(
     val autoplay: Boolean = true,
     val initialSubtitleId: Int? = null,
     val initialAudioId: Int? = null,
-    val voDriver: String? = null,
+    val voDriver: String? = null
-    val cacheEnabled: String? = null,
-    val cacheSeconds: Int? = null,
-    val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null
 )
 
 /**
@@ -64,7 +60,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
     private var pendingSurface: Surface? = null
-    private var activeSurface: Surface? = null
     private var surfaceTexture: SurfaceTexture? = null
 
     // PiP state tracking
@@ -136,7 +131,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             rendererStarted = true
 
             pendingSurface?.let { surface ->
-                activeSurface = surface
                 renderer?.attachSurface(surface)
                 pendingSurface = null
             }
@@ -155,11 +149,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         surfaceReady = true
 
         if (rendererStarted) {
-            // Release the previous wrapper Surface before losing the only
-            // reference to it. cleanup() only runs on detach, so without this
-            // repeated PiP/background/resize cycles leak native surface objects.
-            activeSurface?.release()
-            activeSurface = surface
             renderer?.attachSurface(surface)
         } else {
             pendingSurface = surface
@@ -218,11 +207,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             startPosition = config.startPosition,
             externalSubtitles = config.externalSubtitles,
             initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId,
+            initialAudioId = config.initialAudioId
-            cacheEnabled = config.cacheEnabled,
-            cacheSeconds = config.cacheSeconds,
-            demuxerMaxBytes = config.demuxerMaxBytes,
-            demuxerMaxBackBytes = config.demuxerMaxBackBytes
         )
 
         if (config.autoplay) {
@@ -251,51 +236,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         pipController?.setPlaybackRate(0.0)
     }
 
-    /**
-     * Stop playback and release decoder resources.
-     *
-     * Delegates to [MPVLayerRenderer.stop], which issues mpv's "stop" command
-     * on a background thread (flushing the demuxer and releasing the
-     * MediaCodec hardware decoder) and drops the per-instance mpv handle.
-     *
-     * NOTE: this does NOT call `LibMPV.destroy()`. libmpv 1.0's
-     * nativeDestroy has an internal use-after-free on the JNI global ref
-     * path, so the native mpv handle is intentionally left for the JVM GC
-     * / native finalizer rather than torn down synchronously. See
-     * [MPVLib] class doc for the full rationale.
-     *
-     * Call this BEFORE navigating away from the player screen so the
-     * decoder is reclaimed before the next screen (or the next episode's
-     * player) mounts. Otherwise Expo Router renders the new screen first
-     * and you briefly have two mpv instances + two 4K decoders alive —
-     * instant OOM on a 2 GB device.
-     */
-    fun destroy() {
-        renderer?.stop()
-
-        // Reset view-level state so a subsequent loadVideo() on the SAME view
-        // instance re-creates the mpv handle and re-attaches the still-live
-        // TextureView surface. Without this, rendererStarted stays true and
-        // ensureRendererStarted() early-returns, so renderer.start() is never
-        // called again — but stop() already nulled the renderer's mpv handle.
-        // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
-        // against mpv == null, where every mpv?.command() (including the
-        // "stop" and load commands) silently no-ops, leaving a black frame.
-        //
-        // This path is hit by direct-player.tsx's goToNextItem()/stop(),
-        // which call destroy() immediately before router.replace() to the
-        // same route — Expo Router reuses the same MpvPlayerView instance,
-        // so the next source load happens on this view without a remount.
-        rendererStarted = false
-        currentUrl = null
-        // Move the active surface back to pending so ensureRendererStarted()
-        // re-attaches it to the freshly created mpv instance on next load.
-        // The Surface itself is still valid — onSurfaceTextureDestroyed has
-        // not fired because the TextureView is not being unmounted.
-        activeSurface?.let { pendingSurface = it }
-        activeSurface = null
-    }
-
     fun seekTo(position: Double) {
         renderer?.seekTo(position)
     }
@@ -539,32 +479,13 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     // MARK: - Cleanup
 
-    /**
-     * Proactively tear down the player. Called from onDetachedFromWindow so
-     * the app releases mpv + decoder buffers when the View detaches from the
-     * window. The JS-facing destroy() is intentionally thinner (just
-     * renderer.stop()) — see this thread for why the full teardown was kept
-     * off the JS path.
-     */
     fun cleanup() {
         isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
-        renderer?.delegate = null
+        surfaceTexture = null
-
-        // Release the Surface that wraps the SurfaceTexture. These Surface
-        // objects are created in onSurfaceTextureAvailable and were never
-        // released; each playback session previously leaked one. The
-        // SurfaceTexture itself is owned by TextureView and released by it
-        // via onSurfaceTextureDestroyed, so we leave it alone.
-        pendingSurface?.release()
-        pendingSurface = null
-        activeSurface?.release()
-        activeSurface = null
         surfaceReady = false
-        currentUrl = null
-        rendererStarted = false
     }
 
     override fun onDetachedFromWindow() {

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -1020,44 +1020,12 @@ final class MPVLayerRenderer {
             info["cacheSeconds"] = cacheSeconds
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        var demuxerMaxBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBytes) >= 0 {
-            info["demuxerMaxBytes"] = Int(demuxerMaxBytes / (1024 * 1024))
-        }
-        var demuxerMaxBackBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-back-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBackBytes) >= 0 {
-            info["demuxerMaxBackBytes"] = Int(demuxerMaxBackBytes / (1024 * 1024))
-        }
-        var cacheSecsLimit: Double = 0
-        if getProperty(handle: handle, name: "cache-secs", format: MPV_FORMAT_DOUBLE, value: &cacheSecsLimit) >= 0 {
-            info["cacheSecsLimit"] = cacheSecsLimit
-        }
-
         // Dropped frames
         var droppedFrames: Int64 = 0
         if getProperty(handle: handle, name: "frame-drop-count", format: MPV_FORMAT_INT64, value: &droppedFrames) >= 0 {
             info["droppedFrames"] = Int(droppedFrames)
         }
 
-        // Active video output driver
-        if let voDriver = getStringProperty(handle: handle, name: "vo") {
-            info["voDriver"] = voDriver
-        }
-
-        // Active hardware decoder
-        if let hwdec = getStringProperty(handle: handle, name: "hwdec-current") {
-            info["hwdec"] = hwdec
-        }
-
-        // Estimated video output fps (post-filter)
-        var estimatedVfFps: Double = 0
-        if getProperty(handle: handle, name: "estimated-vf-fps", format: MPV_FORMAT_DOUBLE, value: &estimatedVfFps) >= 0 && estimatedVfFps > 0 {
-            info["estimatedVfFps"] = estimatedVfFps
-        }
-
         return info
     }
 }

modules/mpv-player/ios/MpvPlayerModule.swift

@@ -75,12 +75,6 @@ public class MpvPlayerModule: Module {
         view.pause()
       }
       
-      // Synchronously destroy mpv instance + decoder before navigating
-      // away from the player screen (cross-platform; matches Android).
-      AsyncFunction("destroy") { (view: MpvPlayerView) in
-        view.destroy()
-      }
-
       // Async function to seek to position
       AsyncFunction("seekTo") { (view: MpvPlayerView, position: Double) in
         view.seekTo(position: position)

modules/mpv-player/ios/MpvPlayerView.swift

@@ -289,49 +289,6 @@ class MpvPlayerView: ExpoView {
 		pipController?.updatePlaybackState()
 	}
 
-	/**
-	 * Synchronously stop and destroy the mpv instance + decoder so memory is
-	 * freed before the next screen mounts. Safe to call multiple times — the
-	 * underlying renderer.stop() guards against re-entry.
-	 *
-	 * Cross-platform counterpart of MpvPlayerView.destroy() on Android.
-	 */
-	func destroy() {
-		renderer?.stop()
-
-		// Reset view state and re-create the mpv handle so a subsequent
-		// loadVideo() on the SAME view instance can actually load.
-		// Without this, stop() leaves renderer.mpv == nil, and the next
-		// loadVideo(config:) calls renderer.load() which early-returns
-		// at `guard let handle = self.mpv else { return }` — but only
-		// after flipping isLoading = true and dispatching the loading
-		// delegate callback, so the JS layer is stuck in a perpetual
-		// "loading" state with no actual playback.
-		//
-		// This path is hit by direct-player.tsx's goToNextItem()/stop(),
-		// which call destroy() immediately before router.replace() to
-		// the same route — Expo Router reuses the same MpvPlayerView
-		// instance, so the next `source` prop update arrives on this
-		// view without a remount. setupView() is otherwise the only
-		// place start() is called, so without re-starting here the
-		// renderer stays dead until the whole view is unmounted and
-		// recreated.
-		//
-		// start() is idempotent (`guard !isRunning else { return }`)
-		// and stop() has already nulled mpv synchronously before
-		// dispatching the async mpv_terminate_destroy, so creating a
-		// fresh handle here is safe even while the old handle's
-		// teardown is still in flight on a background queue (libmpv
-		// handles are independent).
-		currentURL = nil
-		intendedPlayState = false
-		do {
-			try renderer?.start()
-		} catch {
-			onError(["error": "Failed to restart renderer after destroy: \(error.localizedDescription)"])
-		}
-	}
-
 	func seekTo(position: Double) {
 		// Update cached position and Now Playing immediately for smooth Control Center feedback
 		cachedPosition = position

modules/mpv-player/src/MpvPlayer.types.ts

@@ -89,14 +89,6 @@ export type MpvPlayerViewProps = {
 export interface MpvPlayerViewRef {
   play: () => Promise<void>;
   pause: () => Promise<void>;
-  /**
-   * Synchronously destroy the mpv instance + decoder + surface buffers.
-   * Call before navigating away from the player screen so memory is
-   * freed before the next screen mounts. Safe to call multiple times.
-   */
-  destroy: () => Promise<void>;
-  // Pre-libmpv-1.0 alias (kept for source-history reference):
-  // stop: () => Promise<void>;
   seekTo: (position: number) => Promise<void>;
   seekBy: (offset: number) => Promise<void>;
   setSpeed: (speed: number) => Promise<void>;
@@ -162,17 +154,9 @@ export type TechnicalInfo = {
   videoBitrate?: number;
   audioBitrate?: number;
   cacheSeconds?: number;
-  /** Configured demuxer forward cache cap (MiB), read back from mpv */
-  demuxerMaxBytes?: number;
-  /** Configured demuxer backward cache cap (MiB), read back from mpv */
-  demuxerMaxBackBytes?: number;
-  /** Configured cache-secs floor, read back from mpv */
-  cacheSecsLimit?: number;
   droppedFrames?: number;
   /** Active video output driver (read from MPV at runtime) */
   voDriver?: string;
   /** Active hardware decoder (read from MPV at runtime) */
   hwdec?: string;
-  /** Estimated video output fps (mpv "estimated-vf-fps") */
-  estimatedVfFps?: number;
 };

modules/mpv-player/src/MpvPlayerView.tsx

@@ -20,9 +20,6 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
       pause: async () => {
         await nativeRef.current?.pause();
       },
-      destroy: async () => {
-        await nativeRef.current?.destroy();
-      },
       seekTo: async (position: number) => {
         await nativeRef.current?.seekTo(position);
       },

package.json

@@ -134,7 +134,7 @@
     "cross-env": "10.1.0",
     "expo-doctor": "1.19.9",
     "husky": "9.1.7",
-    "lint-staged": "17.0.8",
+    "lint-staged": "17.0.7",
     "react-test-renderer": "19.2.3",
     "typescript": "6.0.3"
   },

plugins/withGradleProperties.js

@@ -27,9 +27,6 @@ module.exports = function withCustomPlugin(config) {
   // https://github.com/expo/expo/issues/32558
   config = setGradlePropertiesValue(config, "android.enableJetifier", "true");
 
-  // NDK version required by libmpv 1.0.0
-  config = setGradlePropertiesValue(config, "ndkVersion", "29.0.14206865");
-
   // Increase memory
   config = setGradlePropertiesValue(
     config,

providers/Downloads/types.ts

@@ -32,12 +32,6 @@ export interface MediaTimeSegment {
   text: string;
 }
 
-export interface Segment {
-  startTime: number;
-  endTime: number;
-  text: string;
-}
-
 /** Represents a single downloaded media item with all necessary metadata for offline playback. */
 export interface DownloadedItem {
   /** The Jellyfin item DTO. */
@@ -56,6 +50,12 @@ export interface DownloadedItem {
   introSegments?: MediaTimeSegment[];
   /** The credit segments for the item. */
   creditSegments?: MediaTimeSegment[];
+  /** The recap segments for the item. */
+  recapSegments?: MediaTimeSegment[];
+  /** The commercial segments for the item. */
+  commercialSegments?: MediaTimeSegment[];
+  /** The preview segments for the item. */
+  previewSegments?: MediaTimeSegment[];
   /** The user data for the item. */
   userData: UserData;
 }
@@ -144,6 +144,12 @@ export type JobStatus = {
   introSegments?: MediaTimeSegment[];
   /** Pre-downloaded credit segments (optional) - downloaded before video starts */
   creditSegments?: MediaTimeSegment[];
+  /** Pre-downloaded recap segments (optional) - downloaded before video starts */
+  recapSegments?: MediaTimeSegment[];
+  /** Pre-downloaded commercial segments (optional) - downloaded before video starts */
+  commercialSegments?: MediaTimeSegment[];
+  /** Pre-downloaded preview segments (optional) - downloaded before video starts */
+  previewSegments?: MediaTimeSegment[];
   /** The audio stream index selected for this download */
   audioStreamIndex?: number;
   /** The subtitle stream index selected for this download */

translations/en.json

@@ -304,6 +304,21 @@
         "default_playback_speed": "Default playback speed",
         "auto_play_next_episode": "Auto-play next episode",
         "max_auto_play_episode_count": "Max auto-play episode count",
+        "segment_skip_settings": "Segment skip settings",
+        "segment_skip_settings_description": "Configure skip behavior for intros, credits, and other segments",
+        "skip_intro": "Skip intro",
+        "skip_intro_description": "Action when intro segment is detected",
+        "skip_outro": "Skip outro/credits",
+        "skip_outro_description": "Action when outro/credits segment is detected",
+        "skip_recap": "Skip recap",
+        "skip_recap_description": "Action when recap segment is detected",
+        "skip_commercial": "Skip commercial",
+        "skip_commercial_description": "Action when commercial segment is detected",
+        "skip_preview": "Skip preview",
+        "skip_preview_description": "Action when preview segment is detected",
+        "segment_skip_none": "None",
+        "segment_skip_ask": "Show skip button",
+        "segment_skip_auto": "Auto skip",
         "disabled": "Disabled"
       },
       "music": {
@@ -505,11 +520,7 @@
     "episodes": "Episodes",
     "movies": "Movies",
     "loading": "Loading…",
-    "seeAll": "See all",
+    "seeAll": "See all"
-    "connect": "Connect",
-    "connecting": "Connecting…",
-    "connected": "Connected",
-    "not_connected": "Not connected"
   },
   "search": {
     "search": "Search...",
@@ -633,6 +644,10 @@
     "settings": "Settings",
     "skip_intro": "Skip intro",
     "skip_credits": "Skip credits",
+    "skip_outro": "Skip outro",
+    "skip_recap": "Skip recap",
+    "skip_commercial": "Skip commercial",
+    "skip_preview": "Skip preview",
     "stopPlayback": "Stop playback",
     "stopPlayingTitle": "Stop playing \"{{title}}\"?",
     "stopPlayingConfirm": "Are you sure you want to stop playback?",
@@ -736,10 +751,6 @@
     "request_button": "Request",
     "are_you_sure_you_want_to_request_all_seasons": "Are you sure you want to request all seasons?",
     "failed_to_login": "Failed to log in",
-    "connect_to_jellyseerr": "Connect to Jellyseerr",
-    "connect_in_settings": "Jellyseerr is available. Connect in Settings to enable request features.",
-    "session_expired": "Session expired",
-    "session_expired_connect_again": "Your Jellyseerr session has expired. Please reconnect in Settings.",
     "cast": "Cast",
     "details": "Details",
     "status": "Status",

translations/sv.json

@@ -505,11 +505,7 @@
     "episodes": "Episodes",
     "movies": "Movies",
     "loading": "Loading…",
-    "seeAll": "See all",
+    "seeAll": "See all"
-    "connect": "Anslut",
-    "connecting": "Ansluter…",
-    "connected": "Ansluten",
-    "not_connected": "Inte ansluten"
   },
   "search": {
     "search": "Sök...",
@@ -736,10 +732,6 @@
     "request_button": "Önska",
     "are_you_sure_you_want_to_request_all_seasons": "Är du säker på att du vill begära alla säsonger?",
     "failed_to_login": "Inloggningen Misslyckades",
-    "connect_to_jellyseerr": "Anslut till Jellyseerr",
-    "connect_in_settings": "Jellyseerr är tillgängligt. Anslut i Inställningar för att aktivera förfrågningsfunktioner.",
-    "session_expired": "Sessionen har gått ut",
-    "session_expired_connect_again": "Din Jellyseerr-session har gått ut. Anslut igen i Inställningar.",
     "cast": "Roller",
     "details": "Detaljer",
     "status": "Status",

utils/atoms/settings.ts

@@ -9,7 +9,6 @@ import {
 import { t } from "i18next";
 import { atom, useAtom, useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo } from "react";
-import { Platform } from "react-native";
 import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom } from "@/providers/JellyfinProvider";
@@ -184,6 +183,9 @@ export enum TVTypographyScale {
   ExtraLarge = "extraLarge",
 }
 
+// Segment skip behavior options
+export type SegmentSkipMode = "none" | "ask" | "auto";
+
 // Audio transcoding mode - controls how surround audio is handled
 // This controls server-side transcoding behavior for audio streams.
 // MPV decodes via FFmpeg and supports most formats, but mobile devices
@@ -247,6 +249,12 @@ export type Settings = {
   maxAutoPlayEpisodeCount: MaxAutoPlayEpisodeCount;
   autoPlayEpisodeCount: number;
   autoPlayNextEpisode: boolean;
+  // Media segment skip preferences
+  skipIntro: SegmentSkipMode;
+  skipOutro: SegmentSkipMode;
+  skipRecap: SegmentSkipMode;
+  skipCommercial: SegmentSkipMode;
+  skipPreview: SegmentSkipMode;
   // Playback speed settings
   defaultPlaybackSpeed: number;
   playbackSpeedPerMedia: Record<string, number>;
@@ -350,6 +358,12 @@ export const defaultValues: Settings = {
   maxAutoPlayEpisodeCount: { key: "3", value: 3 },
   autoPlayEpisodeCount: 0,
   autoPlayNextEpisode: true,
+  // Media segment skip defaults
+  skipIntro: "ask",
+  skipOutro: "ask",
+  skipRecap: "ask",
+  skipCommercial: "ask",
+  skipPreview: "ask",
   // Playback speed defaults
   defaultPlaybackSpeed: 1.0,
   playbackSpeedPerMedia: {},
@@ -362,16 +376,11 @@ export const defaultValues: Settings = {
   mpvSubtitleFontSize: undefined,
   mpvSubtitleBackgroundEnabled: false,
   mpvSubtitleBackgroundOpacity: 75,
-  // MPV buffer/cache defaults.
+  // MPV buffer/cache defaults
-  // Android TV gets tighter caps — combined with libmpv 1.0's larger
-  // baseline (fontconfig + libxml2 + libplacebo HDR path + scudo
-  // retention) the larger mobile budget pushes 2 GB Android TV boxes
-  // into swap death during 4K HDR playback. Apple TV has more RAM and
-  // keeps the full budget. Users can override via the settings screen.
   mpvCacheEnabled: "auto",
   mpvCacheSeconds: 10,
-  mpvDemuxerMaxBytes: Platform.isTV && Platform.OS === "android" ? 75 : 150, // MB
+  mpvDemuxerMaxBytes: 150, // MB
-  mpvDemuxerMaxBackBytes: Platform.isTV && Platform.OS === "android" ? 30 : 50, // MB
+  mpvDemuxerMaxBackBytes: 50, // MB
   // MPV video output driver defaults (Android only)
   mpvVoDriver: "gpu-next",
   // Gesture controls

utils/segments.ts

@@ -1,46 +1,40 @@
 import { Api } from "@jellyfin/sdk";
+import { MediaSegmentType } from "@jellyfin/sdk/lib/generated-client/models/media-segment-type";
+import { getMediaSegmentsApi } from "@jellyfin/sdk/lib/utils/api/media-segments-api";
 import { useQuery } from "@tanstack/react-query";
 import React from "react";
 import { DownloadedItem, MediaTimeSegment } from "@/providers/Downloads/types";
 import { getAuthHeaders } from "./jellyfin/jellyfin";
 
-// New Jellyfin 10.11+ Media Segments API types
+export interface SegmentBuckets {
-interface MediaSegmentDto {
+  introSegments: MediaTimeSegment[];
-  Id: string;
+  creditSegments: MediaTimeSegment[];
-  ItemId: string;
+  recapSegments: MediaTimeSegment[];
-  Type: "Intro" | "Outro" | "Recap" | "Commercial" | "Preview";
+  commercialSegments: MediaTimeSegment[];
-  StartTicks: number;
+  previewSegments: MediaTimeSegment[];
-  EndTicks: number;
 }
 
-interface MediaSegmentsResponse {
+// Legacy endpoints (intro-skipper / chapter-credits plugins on pre-10.11 servers)
-  Items: MediaSegmentDto[];
-}
-
-// Legacy API types (for fallback)
 interface IntroTimestamps {
-  EpisodeId: string;
-  HideSkipPromptAt: number;
-  IntroEnd: number;
   IntroStart: number;
-  ShowSkipPromptAt: number;
+  IntroEnd: number;
   Valid: boolean;
 }
 
 interface CreditTimestamps {
-  Introduction: {
+  Credits: { Start: number; End: number; Valid: boolean };
-    Start: number;
-    End: number;
-    Valid: boolean;
-  };
-  Credits: {
-    Start: number;
-    End: number;
-    Valid: boolean;
-  };
 }
 
-const TICKS_PER_SECOND = 10000000;
+const TICKS_PER_SECOND = 10_000_000;
+const ticksToSeconds = (ticks: number): number => ticks / TICKS_PER_SECOND;
+
+const emptyBuckets = (): SegmentBuckets => ({
+  introSegments: [],
+  creditSegments: [],
+  recapSegments: [],
+  commercialSegments: [],
+  previewSegments: [],
+});
 
 export const useSegments = (
   itemId: string,
@@ -48,7 +42,6 @@ export const useSegments = (
   downloadedFiles: DownloadedItem[] | undefined,
   api: Api | null,
 ) => {
-  // Memoize the lookup so the array is only traversed when dependencies change
   const downloadedItem = React.useMemo(
     () => downloadedFiles?.find((d) => d.item.Id === itemId),
     [downloadedFiles, itemId],
@@ -65,141 +58,110 @@ export const useSegments = (
       }
       return fetchAndParseSegments(itemId, api);
     },
-    enabled: isOffline ? !!downloadedItem : !!api,
+    enabled: !!itemId && (isOffline ? !!downloadedItem : !!api),
   });
 };
 
-export const getSegmentsForItem = (
+export const getSegmentsForItem = (item: DownloadedItem): SegmentBuckets => ({
-  item: DownloadedItem,
+  introSegments: item.introSegments || [],
-): {
+  creditSegments: item.creditSegments || [],
-  introSegments: MediaTimeSegment[];
+  recapSegments: item.recapSegments || [],
-  creditSegments: MediaTimeSegment[];
+  commercialSegments: item.commercialSegments || [],
-} => {
+  previewSegments: item.previewSegments || [],
-  return {
+});
-    introSegments: item.introSegments || [],
-    creditSegments: item.creditSegments || [],
-  };
-};
 
-/**
+/** Jellyfin 10.11+ unified MediaSegments API. Returns null so the caller can fall back. */
- * Converts Jellyfin ticks to seconds
- */
-const ticksToSeconds = (ticks: number): number => ticks / TICKS_PER_SECOND;
-
-/**
- * Fetches segments using the new Jellyfin 10.11+ MediaSegments API
- */
 const fetchMediaSegments = async (
   itemId: string,
   api: Api,
-): Promise<{
+): Promise<SegmentBuckets | null> => {
-  introSegments: MediaTimeSegment[];
-  creditSegments: MediaTimeSegment[];
-} | null> => {
   try {
-    const response = await api.axiosInstance.get<MediaSegmentsResponse>(
+    const response = await getMediaSegmentsApi(api).getItemSegments({
-      `${api.basePath}/MediaSegments/${itemId}`,
+      itemId,
-      {
+      includeSegmentTypes: [
-        headers: getAuthHeaders(api),
+        MediaSegmentType.Intro,
-        params: {
+        MediaSegmentType.Outro,
-          includeSegmentTypes: ["Intro", "Outro"],
+        MediaSegmentType.Recap,
-        },
+        MediaSegmentType.Commercial,
-      },
+        MediaSegmentType.Preview,
-    );
+      ],
+    });
 
-    const introSegments: MediaTimeSegment[] = [];
+    const buckets = emptyBuckets();
-    const creditSegments: MediaTimeSegment[] = [];
+    for (const segment of response.data.Items ?? []) {
-
+      if (segment.StartTicks == null || segment.EndTicks == null) continue;
-    response.data.Items.forEach((segment) => {
       const timeSegment: MediaTimeSegment = {
         startTime: ticksToSeconds(segment.StartTicks),
         endTime: ticksToSeconds(segment.EndTicks),
-        text: segment.Type,
+        text: segment.Type ?? "",
       };
 
       switch (segment.Type) {
-        case "Intro":
+        case MediaSegmentType.Intro:
-          introSegments.push(timeSegment);
+          buckets.introSegments.push(timeSegment);
           break;
-        case "Outro":
+        case MediaSegmentType.Outro:
-          creditSegments.push(timeSegment);
+          buckets.creditSegments.push(timeSegment);
           break;
-        // Optionally handle other types like Recap, Commercial, Preview
+        case MediaSegmentType.Recap:
-        default:
+          buckets.recapSegments.push(timeSegment);
+          break;
+        case MediaSegmentType.Commercial:
+          buckets.commercialSegments.push(timeSegment);
+          break;
+        case MediaSegmentType.Preview:
+          buckets.previewSegments.push(timeSegment);
           break;
       }
-    });
+    }
 
-    return { introSegments, creditSegments };
+    return buckets;
-  } catch (_error) {
+  } catch {
-    // Return null to indicate we should try legacy endpoints
     return null;
   }
 };
 
-/**
+/** Pre-10.11 fallback: third-party intro-skipper / chapter-credits plugin endpoints. */
- * Fetches segments using legacy pre-10.11 endpoints
- */
 const fetchLegacySegments = async (
   itemId: string,
   api: Api,
-): Promise<{
+): Promise<SegmentBuckets> => {
-  introSegments: MediaTimeSegment[];
+  const buckets = emptyBuckets();
-  creditSegments: MediaTimeSegment[];
-}> => {
-  const introSegments: MediaTimeSegment[] = [];
-  const creditSegments: MediaTimeSegment[] = [];
 
-  try {
+  const [introRes, creditRes] = await Promise.allSettled([
-    const [introRes, creditRes] = await Promise.allSettled([
+    api.axiosInstance.get<IntroTimestamps>(
-      api.axiosInstance.get<IntroTimestamps>(
+      `${api.basePath}/Episode/${itemId}/IntroTimestamps`,
-        `${api.basePath}/Episode/${itemId}/IntroTimestamps`,
+      { headers: getAuthHeaders(api) },
-        { headers: getAuthHeaders(api) },
+    ),
-      ),
+    api.axiosInstance.get<CreditTimestamps>(
-      api.axiosInstance.get<CreditTimestamps>(
+      `${api.basePath}/Episode/${itemId}/Timestamps`,
-        `${api.basePath}/Episode/${itemId}/Timestamps`,
+      { headers: getAuthHeaders(api) },
-        { headers: getAuthHeaders(api) },
+    ),
-      ),
+  ]);
-    ]);
 
-    if (introRes.status === "fulfilled" && introRes.value.data.Valid) {
+  if (introRes.status === "fulfilled" && introRes.value.data.Valid) {
-      introSegments.push({
+    buckets.introSegments.push({
-        startTime: introRes.value.data.IntroStart,
+      startTime: introRes.value.data.IntroStart,
-        endTime: introRes.value.data.IntroEnd,
+      endTime: introRes.value.data.IntroEnd,
-        text: "Intro",
+      text: "Intro",
-      });
+    });
-    }
-
-    if (
-      creditRes.status === "fulfilled" &&
-      creditRes.value.data.Credits.Valid
-    ) {
-      creditSegments.push({
-        startTime: creditRes.value.data.Credits.Start,
-        endTime: creditRes.value.data.Credits.End,
-        text: "Credits",
-      });
-    }
-  } catch (error) {
-    console.error("Failed to fetch legacy segments", error);
   }
 
-  return { introSegments, creditSegments };
+  if (creditRes.status === "fulfilled" && creditRes.value.data.Credits.Valid) {
+    buckets.creditSegments.push({
+      startTime: creditRes.value.data.Credits.Start,
+      endTime: creditRes.value.data.Credits.End,
+      text: "Outro",
+    });
+  }
+
+  return buckets;
 };
 
 export const fetchAndParseSegments = async (
   itemId: string,
   api: Api,
-): Promise<{
+): Promise<SegmentBuckets> => {
-  introSegments: MediaTimeSegment[];
-  creditSegments: MediaTimeSegment[];
-}> => {
-  // Try new API first (Jellyfin 10.11+)
   const newSegments = await fetchMediaSegments(itemId, api);
-  if (newSegments) {
+  return newSegments ?? fetchLegacySegments(itemId, api);
-    return newSegments;
-  }
-
-  // Fallback to legacy endpoints
-  return fetchLegacySegments(itemId, api);
 };