chore(deps): Update dependency @react-navigation/material-top-tabs to v7.4.13

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

@@ -28,7 +28,6 @@ import {
 } from "@/components/video-player/controls/utils/playback-speed-settings";
 import useRouter from "@/hooks/useAppRouter";
 import { useHaptic } from "@/hooks/useHaptic";
-import { useIntroPlayback } from "@/hooks/useIntroPlayback";
 import { useOrientation } from "@/hooks/useOrientation";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
 import usePlaybackSpeed from "@/hooks/usePlaybackSpeed";
@@ -56,7 +55,7 @@ import {
 } from "@/utils/jellyfin/subtitleUtils";
 import { writeToLog } from "@/utils/log";
 import { generateDeviceProfile } from "@/utils/profiles/native";
-import { msToTicks, ticksToMs, ticksToSeconds } from "@/utils/time";
+import { msToTicks, ticksToSeconds } from "@/utils/time";
 
 export default function page() {
   const videoRef = useRef<MpvPlayerViewRef>(null);
@@ -88,8 +87,6 @@ export default function page() {
   const progress = useSharedValue(0);
   const isSeeking = useSharedValue(false);
   const cacheProgress = useSharedValue(0);
-  // Track whether we've already triggered completion for the current intro
-  const introCompletionTriggered = useSharedValue(false);
   const VolumeManager = Platform.isTV
     ? null
     : require("react-native-volume-manager");
@@ -152,14 +149,6 @@ export default function page() {
     isError: false,
   });
 
-  // Intro playback hook - manages intro video playback before main content
-  const { intros, currentIntro, isPlayingIntro, skipAllIntros } =
-    useIntroPlayback({
-      api,
-      itemId: item?.Id || null,
-      userId: user?.Id,
-    });
-
   // Resolve audio index: use URL param if provided, otherwise use stored index for offline playback
   const audioIndex = useMemo(() => {
     if (audioIndexFromUrl !== undefined) {
@@ -258,9 +247,6 @@ export default function page() {
     isError: false,
   });
 
-  // Intro stream state - separate from main content stream
-  const [introStream, setIntroStream] = useState<Stream | null>(null);
-
   useEffect(() => {
     const fetchStreamData = async () => {
       setStreamStatus({ isLoading: true, isError: false });
@@ -341,57 +327,6 @@ export default function page() {
     downloadedItem,
   ]);
 
-  // Fetch intro stream when current intro changes
-  useEffect(() => {
-    const fetchIntroStreamData = async () => {
-      // Don't fetch intro stream if offline or no current intro
-      if (offline || !currentIntro?.Id || !api || !user?.Id) {
-        setIntroStream(null);
-        return;
-      }
-
-      try {
-        const res = await getStreamUrl({
-          api,
-          item: currentIntro,
-          startTimeTicks: 0, // Always start from beginning for intros
-          userId: user.Id,
-          audioStreamIndex: audioIndex,
-          maxStreamingBitrate: bitrateValue,
-          mediaSourceId: undefined,
-          subtitleStreamIndex: subtitleIndex,
-          deviceProfile: generateDeviceProfile(),
-        });
-        if (!res) return;
-        const { mediaSource, sessionId, url } = res;
-
-        if (!sessionId || !mediaSource || !url) {
-          console.error("Failed to get intro stream URL");
-          return;
-        }
-        setIntroStream({ mediaSource, sessionId, url });
-      } catch (error) {
-        console.error("Failed to fetch intro stream:", error);
-      }
-    };
-    fetchIntroStreamData();
-  }, [
-    currentIntro,
-    api,
-    user?.Id,
-    audioIndex,
-    bitrateValue,
-    subtitleIndex,
-    offline,
-  ]);
-
-  // Reset intro completion flag when a new intro starts playing
-  useEffect(() => {
-    if (isPlayingIntro) {
-      introCompletionTriggered.value = false;
-    }
-  }, [isPlayingIntro, currentIntro]);
-
   useEffect(() => {
     if (!stream || !api || offline) return;
     const reportPlaybackStart = async () => {
@@ -545,21 +480,6 @@ export default function page() {
         lastUrlUpdateTime.value = now;
       }
 
-      // Handle intro completion - check if intro has reached its end
-      if (isPlayingIntro && currentIntro) {
-        const introDuration = ticksToMs(currentIntro.RunTimeTicks || 0);
-        // Check if we're near the end of the intro (within 1000ms buffer)
-        // Use a larger buffer to ensure reliable detection even with short intros
-        // or if MPV doesn't fire progress callbacks frequently
-        if (currentTime >= introDuration - 1000) {
-          // Only trigger once per intro to avoid multiple calls
-          if (!introCompletionTriggered.value) {
-            introCompletionTriggered.value = true;
-            skipAllIntros();
-          }
-        }
-      }
-
       if (!item?.Id) return;
 
       playbackManager.reportPlaybackProgress(
@@ -576,9 +496,6 @@ export default function page() {
       isSeeking,
       isPlaybackStopped,
       isBuffering,
-      isPlayingIntro,
-      currentIntro,
-      skipAllIntros,
     ],
   );
 
@@ -589,11 +506,9 @@ export default function page() {
 
   /** Build video source config for MPV */
   const videoSource = useMemo<MpvVideoSource | undefined>(() => {
-    // Use intro stream if playing intro, otherwise use main content stream
-    const activeStream = isPlayingIntro ? introStream : stream;
-    if (!activeStream?.url) return undefined;
+    if (!stream?.url) return undefined;
 
-    const mediaSource = activeStream.mediaSource;
+    const mediaSource = stream.mediaSource;
     const isTranscoding = Boolean(mediaSource?.TranscodingUrl);
 
     // Get external subtitle URLs
@@ -629,17 +544,14 @@ export default function page() {
     );
 
     // Calculate start position directly here to avoid timing issues
-    // For intros, always start from 0
-    const startTicks = isPlayingIntro
-      ? 0
-      : playbackPositionFromUrl
-        ? Number.parseInt(playbackPositionFromUrl, 10)
-        : (item?.UserData?.PlaybackPositionTicks ?? 0);
+    const startTicks = playbackPositionFromUrl
+      ? Number.parseInt(playbackPositionFromUrl, 10)
+      : (item?.UserData?.PlaybackPositionTicks ?? 0);
     const startPos = ticksToSeconds(startTicks);
 
     // Build source config - headers only needed for online streaming
     const source: MpvVideoSource = {
-      url: activeStream.url,
+      url: stream.url,
       startPosition: startPos,
       autoplay: true,
       initialSubtitleId,
@@ -662,8 +574,6 @@ export default function page() {
   }, [
     stream?.url,
     stream?.mediaSource,
-    introStream?.url,
-    introStream?.mediaSource,
     item?.UserData?.PlaybackPositionTicks,
     playbackPositionFromUrl,
     api?.basePath,
@@ -671,7 +581,6 @@ export default function page() {
     subtitleIndex,
     audioIndex,
     offline,
-    isPlayingIntro,
   ]);
 
   const volumeUpCb = useCallback(async () => {
@@ -1084,9 +993,6 @@ export default function page() {
                 getTechnicalInfo={getTechnicalInfo}
                 playMethod={playMethod}
                 transcodeReasons={transcodeReasons}
-                isPlayingIntro={isPlayingIntro}
-                skipAllIntros={skipAllIntros}
-                intros={intros}
               />
             )}
           </View>

bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "streamyfin",
@@ -13,7 +14,7 @@
         "@gorhom/bottom-sheet": "5.2.8",
         "@jellyfin/sdk": "^0.13.0",
         "@react-native-community/netinfo": "^11.4.1",
-        "@react-navigation/material-top-tabs": "7.4.9",
+        "@react-navigation/material-top-tabs": "7.4.13",
         "@react-navigation/native": "^7.0.14",
         "@shopify/flash-list": "2.0.2",
         "@tanstack/query-sync-storage-persister": "^5.90.18",
@@ -565,9 +566,9 @@
 
     "@react-navigation/core": ["@react-navigation/core@7.13.0", "", { "dependencies": { "@react-navigation/routers": "^7.5.1", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "query-string": "^7.1.3", "react-is": "^19.1.0", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "react": ">= 18.2.0" } }, "sha512-Fc/SO23HnlGnkou/z8JQUzwEMvhxuUhr4rdPTIZp/c8q1atq3k632Nfh8fEiGtk+MP1wtIvXdN2a5hBIWpLq3g=="],
 
-    "@react-navigation/elements": ["@react-navigation/elements@2.9.2", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "@react-native-masked-view/masked-view": ">= 0.2.0", "@react-navigation/native": "^7.1.25", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0" }, "optionalPeers": ["@react-native-masked-view/masked-view"] }, "sha512-J1GltOAGowNLznEphV/kr4zs0U7mUBO1wVA2CqpkN8ePBsoxrAmsd+T5sEYUCXN9KgTDFvc6IfcDqrGSQngd/g=="],
+    "@react-navigation/elements": ["@react-navigation/elements@2.9.5", "", { "dependencies": { "color": "^4.2.3", "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "@react-native-masked-view/masked-view": ">= 0.2.0", "@react-navigation/native": "^7.1.28", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0" }, "optionalPeers": ["@react-native-masked-view/masked-view"] }, "sha512-iHZU8rRN1014Upz73AqNVXDvSMZDh5/ktQ1CMe21rdgnOY79RWtHHBp9qOS3VtqlUVYGkuX5GEw5mDt4tKdl0g=="],
 
-    "@react-navigation/material-top-tabs": ["@react-navigation/material-top-tabs@7.4.9", "", { "dependencies": { "@react-navigation/elements": "^2.9.2", "color": "^4.2.3", "react-native-tab-view": "^4.2.0" }, "peerDependencies": { "@react-navigation/native": "^7.1.25", "react": ">= 18.2.0", "react-native": "*", "react-native-pager-view": ">= 6.0.0", "react-native-safe-area-context": ">= 4.0.0" } }, "sha512-oYpdTfa2D1Tn0HJER9dRCR260agKGgYe+ydSHt3RIsJ9sLg8hU7ntKYWo1FnEC/Nsv1/N1u/tRst7ZpQRjjl4A=="],
+    "@react-navigation/material-top-tabs": ["@react-navigation/material-top-tabs@7.4.13", "", { "dependencies": { "@react-navigation/elements": "^2.9.5", "color": "^4.2.3", "react-native-tab-view": "^4.2.2" }, "peerDependencies": { "@react-navigation/native": "^7.1.28", "react": ">= 18.2.0", "react-native": "*", "react-native-pager-view": ">= 6.0.0", "react-native-safe-area-context": ">= 4.0.0" } }, "sha512-evQPmk8bDdY4yksV2Onko+g5z9BwuBdjZEtypuEeshXXTcj+G4Vw6zDIHaeY8jg1JMEFp1I4fPaAeEzSms5tBw=="],
 
     "@react-navigation/native": ["@react-navigation/native@7.1.19", "", { "dependencies": { "@react-navigation/core": "^7.13.0", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*" } }, "sha512-fM7q8di4Q8sp2WUhiUWOe7bEDRyRhbzsKQOd5N2k+lHeCx3UncsRYuw4Q/KN0EovM3wWKqMMmhy/YWuEO04kgw=="],
 
@@ -1691,7 +1692,7 @@
 
     "react-native-svg": ["react-native-svg@15.12.1", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-vCuZJDf8a5aNC2dlMovEv4Z0jjEUET53lm/iILFnFewa15b4atjVxU6Wirm6O9y6dEsdjDZVD7Q3QM4T1wlI8g=="],
 
-    "react-native-tab-view": ["react-native-tab-view@4.2.0", "", { "dependencies": { "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*", "react-native-pager-view": ">= 6.0.0" } }, "sha512-TUbh7Yr0tE/99t1pJQLbQ+4/Px67xkT7/r3AhfV+93Q3WoUira0Lx7yuKUP2C118doqxub8NCLERwcqsHr29nQ=="],
+    "react-native-tab-view": ["react-native-tab-view@4.2.2", "", { "dependencies": { "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", "react-native": "*", "react-native-pager-view": ">= 6.0.0" } }, "sha512-NXtrG6OchvbGjsvbySJGVocXxo4Y2vA17ph4rAaWtA2jh+AasD8OyikKBRg2SmllEfeQ+GEhcKe8kulHv8BhTg=="],
 
     "react-native-text-ticker": ["react-native-text-ticker@1.15.0", "", {}, "sha512-d/uK+PIOhsYMy1r8h825iq/nADiHsabz3WMbRJSnkpQYn+K9aykUAXRRhu8ZbTAzk4CgnUWajJEFxS5ZDygsdg=="],
 

components/video-player/controls/BottomControls.tsx

@@ -57,11 +57,6 @@ interface BottomControlsProps {
     minutes: number;
     seconds: number;
   };
-
-  // Intro playback props
-  isPlayingIntro?: boolean;
-  skipAllIntros?: () => void;
-  intros?: BaseItemDto[];
 }
 
 export const BottomControls: FC<BottomControlsProps> = ({
@@ -92,9 +87,6 @@ export const BottomControls: FC<BottomControlsProps> = ({
   trickPlayUrl,
   trickplayInfo,
   time,
-  isPlayingIntro = false,
-  skipAllIntros,
-  intros = [],
 }) => {
   const { settings } = useSettings();
   const insets = useSafeAreaInsets();
@@ -141,14 +133,6 @@ export const BottomControls: FC<BottomControlsProps> = ({
           )}
         </View>
         <View className='flex flex-row space-x-2 shrink-0'>
-          {/* Skip Intro button - shows when playing intro videos */}
-          {isPlayingIntro && intros.length > 0 && skipAllIntros && (
-            <SkipButton
-              showButton={true}
-              onPress={skipAllIntros}
-              buttonText='Skip Intro'
-            />
-          )}
           <SkipButton
             showButton={showSkipButton}
             onPress={skipIntro}

components/video-player/controls/Controls.tsx

@@ -72,10 +72,6 @@ interface Props {
   getTechnicalInfo?: () => Promise<TechnicalInfo>;
   playMethod?: "DirectPlay" | "DirectStream" | "Transcode";
   transcodeReasons?: string[];
-  // Intro playback props
-  isPlayingIntro?: boolean;
-  skipAllIntros?: () => void;
-  intros?: BaseItemDto[];
 }
 
 export const Controls: FC<Props> = ({
@@ -105,9 +101,6 @@ export const Controls: FC<Props> = ({
   getTechnicalInfo,
   playMethod,
   transcodeReasons,
-  isPlayingIntro = false,
-  skipAllIntros,
-  intros = [],
 }) => {
   const offline = useOfflineMode();
   const { settings, updateSettings } = useSettings();
@@ -561,9 +554,6 @@ export const Controls: FC<Props> = ({
               trickPlayUrl={trickPlayUrl}
               trickplayInfo={trickplayInfo}
               time={isSliding || showRemoteBubble ? time : remoteTime}
-              isPlayingIntro={isPlayingIntro}
-              skipAllIntros={skipAllIntros}
-              intros={intros}
             />
           </Animated.View>
         </>

hooks/useIntroPlayback.ts

@@ -1,46 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useEffect, useState } from "react";
-import { getIntros } from "@/utils/intros";
-
-interface UseIntroPlaybackProps {
-  api: Api | null;
-  itemId: string | null;
-  userId?: string;
-}
-
-export function useIntroPlayback({
-  api,
-  itemId,
-  userId,
-}: UseIntroPlaybackProps) {
-  const [intros, setIntros] = useState<BaseItemDto[]>([]);
-  const [isPlayingIntro, setIsPlayingIntro] = useState(false);
-
-  useEffect(() => {
-    async function fetchIntros() {
-      if (!api || !itemId) return;
-
-      const introItems = await getIntros(api, itemId, userId);
-      setIntros(introItems);
-      // Set isPlayingIntro to true when intros are available
-      setIsPlayingIntro(introItems.length > 0);
-    }
-
-    fetchIntros();
-  }, [api, itemId, userId]);
-
-  // Only play the first intro if intros are available.. might be nice to configure this at some point with tags or something 🤷‍♂️
-  const currentIntro = intros.length > 0 ? intros[0] : null;
-
-  const skipAllIntros = () => {
-    setIsPlayingIntro(false);
-  };
-
-  return {
-    intros,
-    currentIntro,
-    isPlayingIntro,
-    skipAllIntros,
-  };
-}

package.json

@@ -34,7 +34,7 @@
     "@gorhom/bottom-sheet": "5.2.8",
     "@jellyfin/sdk": "^0.13.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-navigation/material-top-tabs": "7.4.9",
+    "@react-navigation/material-top-tabs": "7.4.13",
     "@react-navigation/native": "^7.0.14",
     "@shopify/flash-list": "2.0.2",
     "@tanstack/query-sync-storage-persister": "^5.90.18",

utils/intros.ts

@@ -1,28 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
-
-/**
- * Fetches intro items for a given media item using the Jellyfin SDK
- * @param api - The Jellyfin API instance
- * @param itemId - The ID of the media item
- * @param userId - Optional user ID
- * @returns Promise<BaseItemDto[]> - Array of intro items
- */
-export async function getIntros(
-  api: Api,
-  itemId: string,
-  userId?: string,
-): Promise<BaseItemDto[]> {
-  try {
-    const response = await getUserLibraryApi(api).getIntros({
-      itemId,
-      userId,
-    });
-
-    return response.data.Items || [];
-  } catch (error) {
-    console.error("Error fetching intros:", error);
-    return [];
-  }
-}