wip

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: '❌ bug'
+labels: ''
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: '✨ enhancement'
+labels: ''
 assignees: ''
 
 ---

.gitignore

@@ -21,7 +21,6 @@ build-*
 *.mp4
 build-*
 Streamyfin.app
-package-lock.json
 
 /ios
 /android
@@ -30,4 +29,3 @@ pc-api-7079014811501811218-719-3b9f15aeccf8.json
 credentials.json
 *.apk
 *.ipa
-.continuerc.json

README.md

@@ -1,19 +1,18 @@
 # 📺 Streamyfin
 
-<a href="https://www.buymeacoffee.com/fredrikbur3" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
-
 Welcome to Streamyfin, a simple and user-friendly Jellyfin client built with Expo. If you're looking for an alternative to other Jellyfin clients, we hope you'll find Streamyfin to be a useful addition to your media streaming toolbox.
 
-<div style="display: flex; flex-direction: row; gap: 8px">
-  <img width=150 src="./assets/images/screenshots/screenshot1.png" />
-  <img width=150 src="./assets/images/screenshots/screenshot3.png" />
-  <img width=150 src="./assets/images/screenshots/screenshot2.png" />
-  
+<div style="display: flex; flex-direction: row; gap: 5px">
+  <img width=100 src="./assets/images/screenshots/1.jpg" />
+  <img width=100 src="./assets/images/screenshots/3.jpg" />
+  <img width=100 src="./assets/images/screenshots/4.jpg" />
+  <img width=100 src="./assets/images/screenshots/5.jpg" />
+  <img width=100 src="./assets/images/screenshots/7.jpg" />
 </div>
 
 ## 🌟 Features
-- 🚀 **Skp intro / credits support**
-- 🖼️ **Trickplay images**: The new golden standard for chapter previews when seeking.
+
+- 📱 **Native video player**: Playback with the platform native video player. With support for subtitles, playback speed control, and more.
 - 📺 **Picture in Picture** (iPhone only): Watch movies in PiP mode on your iPhone.
 - 🔊 **Background audio**: Stream music in the background, even when locking the phone.
 - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
@@ -25,35 +24,20 @@ Streamyfin includes some exciting experimental features like media downloading a
 
 ### Downloading
 
-Downloading works by using ffmpeg to convert an HLS stream into a video file on the device. This means that you can download and view any file you can stream! The file is converted by Jellyfin on the server in real time as it is downloaded. This means a **bit longer download times** but supports any file that your server can transcode.
-
-### Chromecast
-
-Chromecast support is still in development, and we're working on improving it. Currently, it supports casting videos and audio, but we're working on adding support for subtitles and other features.
-
-## Plugins
-
-In Streamyfin we have built-in support for a few plugins. These plugins are not required to use Streamyfin, but they add some extra functionality.
+Downloading works by using ffmpeg to convert a HLS stream into a video file on the device. This means that you can download and view any file you can stream! The file is converted by Jellyfin on the server in real time as it is downloaded. This means a **bit longer download times** but supports any file that your server can transcode.
 
 ### Collection rows
 
 Jellyfin collections can be shown as rows or carousel on the home screen.
-The following tags can be added to a collection to provide this functionality.
+The following tags can be added to an collection to provide this functionality. 
 
-Available tags:
+Avaiable tags:
+- sf_promoted: Wil make the collection an row on home
+- sf_carousel: Wil make the collection an carousel on home.
 
-- sf_promoted: will make the collection a row at home
-- sf_carousel: will make the collection a carousel on home.
-
-A plugin exists to create collections based on external sources like mdblist. This make the automatic process of managing collections such as trending, most watched, etc.
+A plugin exists to create collections based on external sources like mdblist. This makes managing collections like trending, most watched etc an automatic process.
 See [Collection Import Plugin](https://github.com/lostb1t/jellyfin-plugin-collection-import) for more info.
 
-### Jellysearch
-
-[Jellysearch](https://gitlab.com/DomiStyle/jellysearch) now works with Streamyfin! 🚀
-
-> A fast full-text search proxy for Jellyfin. Integrates seamlessly with most Jellyfin clients.
-
 ## Roadmap for V1
 
 Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) to see what we're working on next. We are always open for feedback and suggestions, so please let us know if you have any ideas or feature requests.
@@ -88,12 +72,6 @@ We welcome any help to make Streamyfin better. If you'd like to contribute, plea
 
 ### Development info
 
-1. Use node `20`
-2. Install dependencies `bun i`
-3. Create an expo dev build by running `npx expo run:ios` or `npx expo run:android`.
-
-## Extended chromecast controls
-
 Add this to AppDelegate.mm:
 
 ```
@@ -142,6 +120,10 @@ If you have questions or need support, feel free to reach out:
 - GitHub Issues: Report bugs or request features here.
 - Email: [fredrik.burmester@gmail.com](mailto:fredrik.burmester@gmail.com)
 
+## Support
+
+<a href="https://www.buymeacoffee.com/fredrikbur3" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+
 ## 📝 Credits
 
 Streamyfin is developed by Fredrik Burmester and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.16.0",
+    "version": "0.7.0",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
@@ -19,21 +19,18 @@
       "infoPlist": {
         "NSCameraUsageDescription": "The app needs access to your camera to scan barcodes.",
         "NSMicrophoneUsageDescription": "The app needs access to your microphone.",
-        "UIBackgroundModes": ["audio", "fetch"],
+        "UIBackgroundModes": ["audio"],
         "NSLocalNetworkUsageDescription": "The app needs access to your local network to connect to your Jellyfin server.",
         "NSAppTransportSecurity": {
           "NSAllowsArbitraryLoads": true
         }
       },
-      "config": {
-        "usesNonExemptEncryption": false
-      },
       "supportsTablet": true,
       "bundleIdentifier": "com.fredrikburmester.streamyfin"
     },
     "android": {
       "jsEngine": "hermes",
-      "versionCode": 42,
+      "versionCode": 19,
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/icon.png"
       },
@@ -43,6 +40,11 @@
         "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"
       ]
     },
+    "web": {
+      "bundler": "metro",
+      "output": "static",
+      "favicon": "./assets/images/favicon.png"
+    },
     "plugins": [
       "expo-router",
       "expo-font",
@@ -66,25 +68,13 @@
           }
         }
       ],
-      [
-        "./plugins/withAndroidMainActivityAttributes",
-        {
-          "com.reactnative.googlecast.RNGCExpandedControllerActivity": true
-        }
-      ],
-      ["./plugins/withExpandedController.js"],
       [
         "expo-build-properties",
         {
           "ios": {
-            "deploymentTarget": "15.6"
+            "deploymentTarget": "14.0"
           },
           "android": {
-            "android": {
-              "compileSdkVersion": 34,
-              "targetSdkVersion": 34,
-              "buildToolsVersion": "34.0.0"
-            },
             "minSdkVersion": 24,
             "usesCleartextTraffic": true,
             "packagingOptions": {

app/(auth)/(tabs)/(home)/downloads.tsx

@@ -1,123 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ActiveDownloads } from "@/components/downloads/ActiveDownloads";
-import { MovieCard } from "@/components/downloads/MovieCard";
-import { SeriesCard } from "@/components/downloads/SeriesCard";
-import { useDownload } from "@/providers/DownloadProvider";
-import { queueAtom } from "@/utils/atoms/queue";
-import { useSettings } from "@/utils/atoms/settings";
-import { Ionicons } from "@expo/vector-icons";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { router } from "expo-router";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-const downloads: React.FC = () => {
-  const [queue, setQueue] = useAtom(queueAtom);
-  const { removeProcess, downloadedFiles } = useDownload();
-
-  const [settings] = useSettings();
-
-  const movies = useMemo(
-    () => downloadedFiles?.filter((f) => f.Type === "Movie") || [],
-    [downloadedFiles]
-  );
-
-  const groupedBySeries = useMemo(() => {
-    const episodes = downloadedFiles?.filter((f) => f.Type === "Episode");
-    const series: { [key: string]: BaseItemDto[] } = {};
-    episodes?.forEach((e) => {
-      if (!series[e.SeriesName!]) series[e.SeriesName!] = [];
-      series[e.SeriesName!].push(e);
-    });
-    return Object.values(series);
-  }, [downloadedFiles]);
-
-  const insets = useSafeAreaInsets();
-
-  return (
-    <ScrollView
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 100,
-      }}
-    >
-      <View className="py-4">
-        <View className="mb-4 flex flex-col space-y-4 px-4">
-          {settings?.downloadMethod === "remux" && (
-            <View className="bg-neutral-900 p-4 rounded-2xl">
-              <Text className="text-lg font-bold">Queue</Text>
-              <Text className="text-xs opacity-70 text-red-600">
-                Queue and downloads will be lost on app restart
-              </Text>
-              <View className="flex flex-col space-y-2 mt-2">
-                {queue.map((q) => (
-                  <TouchableOpacity
-                    onPress={() =>
-                      router.push(`/(auth)/items/page?id=${q.item.Id}`)
-                    }
-                    className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
-                  >
-                    <View>
-                      <Text className="font-semibold">{q.item.Name}</Text>
-                      <Text className="text-xs opacity-50">{q.item.Type}</Text>
-                    </View>
-                    <TouchableOpacity
-                      onPress={() => {
-                        removeProcess(q.id);
-                        setQueue((prev) => {
-                          if (!prev) return [];
-                          return [...prev.filter((i) => i.id !== q.id)];
-                        });
-                      }}
-                    >
-                      <Ionicons name="close" size={24} color="red" />
-                    </TouchableOpacity>
-                  </TouchableOpacity>
-                ))}
-              </View>
-
-              {queue.length === 0 && (
-                <Text className="opacity-50">No items in queue</Text>
-              )}
-            </View>
-          )}
-
-          <ActiveDownloads />
-        </View>
-
-        {movies.length > 0 && (
-          <View className="mb-4">
-            <View className="flex flex-row items-center justify-between mb-2 px-4">
-              <Text className="text-lg font-bold">Movies</Text>
-              <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
-                <Text className="text-xs font-bold">{movies?.length}</Text>
-              </View>
-            </View>
-            <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-              <View className="px-4 flex flex-row">
-                {movies?.map((item: BaseItemDto) => (
-                  <View className="mb-2 last:mb-0" key={item.Id}>
-                    <MovieCard item={item} />
-                  </View>
-                ))}
-              </View>
-            </ScrollView>
-          </View>
-        )}
-        {groupedBySeries?.map((items: BaseItemDto[], index: number) => (
-          <SeriesCard items={items} key={items[0].SeriesId} />
-        ))}
-        {downloadedFiles?.length === 0 && (
-          <View className="flex px-4">
-            <Text className="opacity-50">No downloaded items</Text>
-          </View>
-        )}
-      </View>
-    </ScrollView>
-  );
-};
-
-export default downloads;

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

@@ -1,449 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
-import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
-import { Loader } from "@/components/Loader";
-import { MediaListSection } from "@/components/medialists/MediaListSection";
-import { TAB_HEIGHT } from "@/constants/Values";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { Ionicons } from "@expo/vector-icons";
-import { Api } from "@jellyfin/sdk";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  getItemsApi,
-  getSuggestionsApi,
-  getTvShowsApi,
-  getUserLibraryApi,
-  getUserViewsApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import NetInfo from "@react-native-community/netinfo";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useRouter } from "expo-router";
-import { useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import {
-  ActivityIndicator,
-  Platform,
-  RefreshControl,
-  ScrollView,
-  View,
-} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-type BaseSection = {
-  title: string;
-  queryKey: (string | undefined)[];
-};
-
-type ScrollingCollectionListSection = BaseSection & {
-  type: "ScrollingCollectionList";
-  queryFn: () => Promise<BaseItemDto[]>;
-  orientation?: "horizontal" | "vertical";
-};
-
-type MediaListSection = BaseSection & {
-  type: "MediaListSection";
-  queryFn: () => Promise<BaseItemDto>;
-};
-
-type Section = ScrollingCollectionListSection | MediaListSection;
-
-export default function index() {
-  const queryClient = useQueryClient();
-  const router = useRouter();
-
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const [loading, setLoading] = useState(false);
-  const [settings, _] = useSettings();
-
-  const [isConnected, setIsConnected] = useState<boolean | null>(null);
-  const [loadingRetry, setLoadingRetry] = useState(false);
-
-  const checkConnection = useCallback(async () => {
-    setLoadingRetry(true);
-    const state = await NetInfo.fetch();
-    setIsConnected(state.isConnected);
-    setLoadingRetry(false);
-  }, []);
-
-  useEffect(() => {
-    const unsubscribe = NetInfo.addEventListener((state) => {
-      if (state.isConnected == false || state.isInternetReachable === false)
-        setIsConnected(false);
-      else setIsConnected(true);
-    });
-
-    NetInfo.fetch().then((state) => {
-      setIsConnected(state.isConnected);
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, []);
-
-  const {
-    data: userViews,
-    isError: e1,
-    isLoading: l1,
-  } = useQuery({
-    queryKey: ["userViews", user?.Id],
-    queryFn: async () => {
-      if (!api || !user?.Id) {
-        return null;
-      }
-
-      const response = await getUserViewsApi(api).getUserViews({
-        userId: user.Id,
-      });
-
-      return response.data.Items || null;
-    },
-    enabled: !!api && !!user?.Id,
-    staleTime: 60 * 1000,
-  });
-
-  const {
-    data: mediaListCollections,
-    isError: e2,
-    isLoading: l2,
-  } = useQuery({
-    queryKey: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
-    queryFn: async () => {
-      if (!api || !user?.Id) return [];
-
-      const response = await getItemsApi(api).getItems({
-        userId: user.Id,
-        tags: ["sf_promoted"],
-        recursive: true,
-        fields: ["Tags"],
-        includeItemTypes: ["BoxSet"],
-      });
-
-      return response.data.Items || [];
-    },
-    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
-    staleTime: 60 * 1000,
-  });
-
-  const movieCollectionId = useMemo(() => {
-    return userViews?.find((c) => c.CollectionType === "movies")?.Id;
-  }, [userViews]);
-
-  const tvShowCollectionId = useMemo(() => {
-    return userViews?.find((c) => c.CollectionType === "tvshows")?.Id;
-  }, [userViews]);
-
-  const refetch = useCallback(async () => {
-    setLoading(true);
-    await queryClient.invalidateQueries();
-    // await queryClient.invalidateQueries({ queryKey: ["userViews"] });
-    // await queryClient.invalidateQueries({ queryKey: ["resumeItems"] });
-    // await queryClient.invalidateQueries({ queryKey: ["continueWatching"] });
-    // await queryClient.invalidateQueries({ queryKey: ["nextUp-all"] });
-    // await queryClient.invalidateQueries({
-    //   queryKey: ["recentlyAddedInMovies"],
-    // });
-    // await queryClient.invalidateQueries({
-    //   queryKey: ["recentlyAddedInTVShows"],
-    // });
-    // await queryClient.invalidateQueries({ queryKey: ["suggestions"] });
-    // await queryClient.invalidateQueries({
-    //   queryKey: ["sf_promoted"],
-    // });
-    // await queryClient.invalidateQueries({
-    //   queryKey: ["sf_carousel"],
-    // });
-    setLoading(false);
-  }, [queryClient, user?.Id]);
-
-  const sections = useMemo(() => {
-    if (!api || !user?.Id) return [];
-
-    const ss: Section[] = [
-      // {
-      //   title: "Continue Watching",
-      //   queryKey: ["resumeItems", user.Id],
-      //   queryFn: async () =>
-      //     (
-      //       await getItemsApi(api).getResumeItems({
-      //         userId: user.Id,
-      //         enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-      //       })
-      //     ).data.Items || [],
-      //   type: "ScrollingCollectionList",
-      //   orientation: "horizontal",
-      // },
-      // {
-      //   title: "Next Up",
-      //   queryKey: ["nextUp-all", user?.Id],
-      //   queryFn: async () =>
-      //     (
-      //       await getTvShowsApi(api).getNextUp({
-      //         userId: user?.Id,
-      //         fields: ["MediaSourceCount"],
-      //         limit: 20,
-      //         enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-      //       })
-      //     ).data.Items || [],
-      //   type: "ScrollingCollectionList",
-      //   orientation: "horizontal",
-      // },
-      {
-        title: "Recently Added in Movies",
-        queryKey: ["recentlyAddedInMovies", user?.Id, movieCollectionId],
-        queryFn: async () =>
-          (
-            await getUserLibraryApi(api).getLatestMedia({
-              userId: user?.Id,
-              limit: 50,
-              fields: ["PrimaryImageAspectRatio", "Path"],
-              imageTypeLimit: 1,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              includeItemTypes: ["Movie"],
-              parentId: movieCollectionId,
-            })
-          ).data || [],
-        type: "ScrollingCollectionList",
-      },
-      {
-        title: "Recently Added in TV-Shows",
-        queryKey: ["recentlyAddedInTVShows", user?.Id, tvShowCollectionId],
-        queryFn: async () =>
-          (
-            await getUserLibraryApi(api).getLatestMedia({
-              userId: user?.Id,
-              limit: 50,
-              fields: ["PrimaryImageAspectRatio", "Path"],
-              imageTypeLimit: 1,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              includeItemTypes: ["Series"],
-              parentId: tvShowCollectionId,
-            })
-          ).data || [],
-        type: "ScrollingCollectionList",
-      },
-      ...(mediaListCollections?.map(
-        (ml) =>
-          ({
-            title: ml.Name || "",
-            queryKey: ["mediaList", ml.Id],
-            queryFn: async () => ml,
-            type: "MediaListSection",
-          } as MediaListSection)
-      ) || []),
-      {
-        title: "Suggested Movies",
-        queryKey: ["suggestedMovies", user?.Id],
-        queryFn: async () =>
-          (
-            await getSuggestionsApi(api).getSuggestions({
-              userId: user?.Id,
-              limit: 10,
-              mediaType: ["Video"],
-              type: ["Movie"],
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "vertical",
-      },
-      {
-        title: "Suggested Episodes",
-        queryKey: ["suggestedEpisodes", user?.Id],
-        queryFn: async () => {
-          try {
-            const suggestions = await getSuggestions(api, user.Id);
-            const nextUpPromises = suggestions.map((series) =>
-              getNextUp(api, user.Id, series.Id)
-            );
-            const nextUpResults = await Promise.all(nextUpPromises);
-
-            return nextUpResults.filter((item) => item !== null) || [];
-          } catch (error) {
-            console.error("Error fetching data:", error);
-            return [];
-          }
-        },
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-    ];
-    return ss;
-  }, [
-    api,
-    user?.Id,
-    movieCollectionId,
-    tvShowCollectionId,
-    mediaListCollections,
-  ]);
-
-  if (isConnected === false) {
-    return (
-      <View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
-        <Text className="text-3xl font-bold mb-2">No Internet</Text>
-        <Text className="text-center opacity-70">
-          No worries, you can still watch{"\n"}downloaded content.
-        </Text>
-        <View className="mt-4">
-          <Button
-            color="purple"
-            onPress={() => router.push("/(auth)/downloads")}
-            justify="center"
-            iconRight={
-              <Ionicons name="arrow-forward" size={20} color="white" />
-            }
-          >
-            Go to downloads
-          </Button>
-          <Button
-            color="black"
-            onPress={() => {
-              checkConnection();
-            }}
-            justify="center"
-            className="mt-2"
-            iconRight={
-              loadingRetry ? null : (
-                <Ionicons name="refresh" size={20} color="white" />
-              )
-            }
-          >
-            {loadingRetry ? (
-              <ActivityIndicator size={"small"} color={"white"} />
-            ) : (
-              "Retry"
-            )}
-          </Button>
-        </View>
-      </View>
-    );
-  }
-
-  const insets = useSafeAreaInsets();
-
-  if (e1 || e2 || !api)
-    return (
-      <View className="flex flex-col items-center justify-center h-full -mt-6">
-        <Text className="text-3xl font-bold mb-2">Oops!</Text>
-        <Text className="text-center opacity-70">
-          Something went wrong.{"\n"}Please log out and in again.
-        </Text>
-      </View>
-    );
-
-  if (l1 || l2)
-    return (
-      <View className="justify-center items-center h-full">
-        <Loader />
-      </View>
-    );
-
-  return (
-    <ScrollView
-      nestedScrollEnabled
-      contentInsetAdjustmentBehavior="automatic"
-      refreshControl={
-        <RefreshControl refreshing={loading} onRefresh={refetch} />
-      }
-      key={"home"}
-      contentContainerStyle={{
-        flexDirection: "column",
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingTop: 8,
-        paddingBottom: 8,
-        rowGap: 8,
-      }}
-      style={{
-        marginBottom: TAB_HEIGHT,
-      }}
-    >
-      <LargeMovieCarousel />
-
-      <ScrollingCollectionList
-        key="continueWatching"
-        title={"Continue Watching"}
-        queryKey={["continueWatching", user?.Id]}
-        queryFn={async () =>
-          (
-            await getItemsApi(api).getResumeItems({
-              userId: user?.Id,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-            })
-          ).data.Items || []
-        }
-        orientation={"horizontal"}
-      />
-
-      <ScrollingCollectionList
-        key="nextUp"
-        title={"Next Up"}
-        queryKey={["nextUp-all", user?.Id]}
-        queryFn={async () =>
-          (
-            await getTvShowsApi(api).getNextUp({
-              userId: user?.Id,
-              fields: ["MediaSourceCount"],
-              limit: 20,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-            })
-          ).data.Items || []
-        }
-        orientation={"horizontal"}
-      />
-
-      {sections.map((section, index) => {
-        if (section.type === "ScrollingCollectionList") {
-          return (
-            <ScrollingCollectionList
-              key={index}
-              title={section.title}
-              queryKey={section.queryKey}
-              queryFn={section.queryFn}
-              orientation={section.orientation}
-            />
-          );
-        } else if (section.type === "MediaListSection") {
-          return (
-            <MediaListSection
-              key={index}
-              queryKey={section.queryKey}
-              queryFn={section.queryFn}
-            />
-          );
-        }
-        return null;
-      })}
-    </ScrollView>
-  );
-}
-
-// Function to get suggestions
-async function getSuggestions(api: Api, userId: string | undefined) {
-  if (!userId) return [];
-  const response = await getSuggestionsApi(api).getSuggestions({
-    userId,
-    limit: 10,
-    mediaType: ["Unknown"],
-    type: ["Series"],
-  });
-  return response.data.Items ?? [];
-}
-
-// Function to get the next up TV show for a series
-async function getNextUp(
-  api: Api,
-  userId: string | undefined,
-  seriesId: string | undefined
-) {
-  if (!userId || !seriesId) return null;
-  const response = await getTvShowsApi(api).getNextUp({
-    userId,
-    seriesId,
-    limit: 1,
-  });
-  return response.data.Items?.[0] ?? null;
-}

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

@@ -1,157 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { ListItem } from "@/components/ListItem";
-import { SettingToggles } from "@/components/settings/SettingToggles";
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom, useJellyfin, userAtom } from "@/providers/JellyfinProvider";
-import { clearLogs, readFromLog } from "@/utils/log";
-import { getQuickConnectApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import * as Haptics from "expo-haptics";
-import { useAtom } from "jotai";
-import { Alert, ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { toast } from "sonner-native";
-
-export default function settings() {
-  const { logout } = useJellyfin();
-  const { deleteAllFiles } = useDownload();
-
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const { data: logs } = useQuery({
-    queryKey: ["logs"],
-    queryFn: async () => readFromLog(),
-    refetchInterval: 1000,
-  });
-
-  const insets = useSafeAreaInsets();
-
-  const openQuickConnectAuthCodeInput = () => {
-    Alert.prompt(
-      "Quick connect",
-      "Enter the quick connect code",
-      async (text) => {
-        if (text) {
-          try {
-            const res = await getQuickConnectApi(api!).authorizeQuickConnect({
-              code: text,
-              userId: user?.Id,
-            });
-            if (res.status === 200) {
-              Haptics.notificationAsync(
-                Haptics.NotificationFeedbackType.Success
-              );
-              Alert.alert("Success", "Quick connect authorized");
-            } else {
-              Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error);
-              Alert.alert("Error", "Invalid code");
-            }
-          } catch (e) {
-            Haptics.notificationAsync(Haptics.NotificationFeedbackType.Error);
-            Alert.alert("Error", "Invalid code");
-          }
-        }
-      }
-    );
-  };
-
-  return (
-    <ScrollView
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 100,
-      }}
-    >
-      <View className="p-4 flex flex-col gap-y-4">
-        {/* <Button
-          onPress={() => {
-            registerBackgroundFetchAsync();
-          }}
-        >
-          registerBackgroundFetchAsync
-        </Button> */}
-        <View>
-          <Text className="font-bold text-lg mb-2">Information</Text>
-
-          <View className="flex flex-col rounded-xl overflow-hidden border-neutral-800 divide-y-2 divide-solid divide-neutral-800 ">
-            <ListItem title="User" subTitle={user?.Name} />
-            <ListItem title="Server" subTitle={api?.basePath} />
-            <ListItem title="Token" subTitle={api?.accessToken} />
-          </View>
-        </View>
-
-        <View>
-          <Text className="font-bold text-lg mb-2">Quick connect</Text>
-          <Button onPress={openQuickConnectAuthCodeInput} color="black">
-            Authorize
-          </Button>
-        </View>
-
-        <SettingToggles />
-
-        <View>
-          <Text className="font-bold text-lg mb-2">Account and storage</Text>
-          <View className="flex flex-col space-y-2">
-            <Button color="black" onPress={logout}>
-              Log out
-            </Button>
-            <Button
-              color="red"
-              onPress={async () => {
-                try {
-                  await deleteAllFiles();
-                  Haptics.notificationAsync(
-                    Haptics.NotificationFeedbackType.Success
-                  );
-                } catch (e) {
-                  Haptics.notificationAsync(
-                    Haptics.NotificationFeedbackType.Error
-                  );
-                  toast.error("Error deleting files");
-                }
-              }}
-            >
-              Delete all downloaded files
-            </Button>
-            <Button
-              color="red"
-              onPress={async () => {
-                await clearLogs();
-                Haptics.notificationAsync(
-                  Haptics.NotificationFeedbackType.Success
-                );
-              }}
-            >
-              Delete all logs
-            </Button>
-          </View>
-        </View>
-        <View>
-          <Text className="font-bold text-lg mb-2">Logs</Text>
-          <View className="flex flex-col space-y-2">
-            {logs?.map((log, index) => (
-              <View key={index} className="bg-neutral-900 rounded-xl p-3">
-                <Text
-                  className={`
-                  mb-1
-              ${log.level === "INFO" && "text-blue-500"}
-              ${log.level === "ERROR" && "text-red-500"}
-                `}
-                >
-                  {log.level}
-                </Text>
-                <Text className="text-xs">{log.message}</Text>
-              </View>
-            ))}
-            {logs?.length === 0 && (
-              <Text className="opacity-50">No logs available</Text>
-            )}
-          </View>
-        </View>
-      </View>
-    </ScrollView>
-  );
-}

app/(auth)/(tabs)/(home,libraries,search)/actors/[actorId].tsx

@@ -1,140 +0,0 @@
-import { ItemCardText } from "@/components/ItemCardText";
-import { Loader } from "@/components/Loader";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { InfiniteHorizontalScroll } from "@/components/common/InfiniteHorrizontalScroll";
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
-import MoviePoster from "@/components/posters/MoviePoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models";
-import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
-import { useAtom } from "jotai";
-import { useCallback, useMemo } from "react";
-import { View } from "react-native";
-
-const page: React.FC = () => {
-  const local = useLocalSearchParams();
-  const { actorId } = local as { actorId: string };
-
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const { data: item, isLoading: l1 } = useQuery({
-    queryKey: ["item", actorId],
-    queryFn: async () =>
-      await getUserItemData({
-        api,
-        userId: user?.Id,
-        itemId: actorId,
-      }),
-    enabled: !!actorId && !!api,
-    staleTime: 60,
-  });
-
-  const fetchItems = useCallback(
-    async ({
-      pageParam,
-    }: {
-      pageParam: number;
-    }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !user?.Id) return null;
-
-      const response = await getItemsApi(api).getItems({
-        userId: user.Id,
-        personIds: [actorId],
-        startIndex: pageParam,
-        limit: 8,
-        sortOrder: ["Descending", "Descending", "Ascending"],
-        includeItemTypes: ["Movie", "Series"],
-        recursive: true,
-        fields: [
-          "ParentId",
-          "PrimaryImageAspectRatio",
-          "ParentId",
-          "PrimaryImageAspectRatio",
-        ],
-        sortBy: ["PremiereDate", "ProductionYear", "SortName"],
-        collapseBoxSetItems: false,
-      });
-
-      return response.data;
-    },
-    [api, user?.Id, actorId]
-  );
-
-  const backdropUrl = useMemo(
-    () =>
-      getBackdropUrl({
-        api,
-        item,
-        quality: 90,
-        width: 1000,
-      }),
-    [item]
-  );
-
-  if (l1)
-    return (
-      <View className="justify-center items-center h-full">
-        <Loader />
-      </View>
-    );
-
-  if (!item?.Id || !backdropUrl) return null;
-
-  return (
-    <ParallaxScrollView
-      headerImage={
-        <Image
-          source={{
-            uri: backdropUrl,
-          }}
-          style={{
-            width: "100%",
-            height: "100%",
-          }}
-        />
-      }
-    >
-      <View className="flex flex-col space-y-4 my-4">
-        <View className="px-4 mb-4">
-          <MoviesTitleHeader item={item} className="mb-4" />
-          <OverviewText text={item.Overview} />
-        </View>
-
-        <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
-          Appeared In
-        </Text>
-        <InfiniteHorizontalScroll
-          height={247}
-          renderItem={(i, idx) => (
-            <TouchableItemRouter
-              key={idx}
-              item={i}
-              className={`flex flex-col
-              ${"w-28"}
-            `}
-            >
-              <View>
-                <MoviePoster item={i} />
-                <ItemCardText item={i} />
-              </View>
-            </TouchableItemRouter>
-          )}
-          queryFn={fetchItems}
-          queryKey={["actor", "movies", actorId]}
-        />
-        <View className="h-12"></View>
-      </View>
-    </ParallaxScrollView>
-  );
-};
-
-export default page;

app/(auth)/(tabs)/(home,libraries,search)/collections/[collectionId].tsx

@@ -1,412 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
-import { ItemCardText } from "@/components/ItemCardText";
-import { ItemPoster } from "@/components/posters/ItemPoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  genreFilterAtom,
-  sortByAtom,
-  SortByOption,
-  sortOptions,
-  sortOrderAtom,
-  SortOrderOption,
-  sortOrderOptions,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
-import {
-  BaseItemDto,
-  BaseItemDtoQueryResult,
-  ItemSortBy,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  getFilterApi,
-  getItemsApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { FlashList } from "@shopify/flash-list";
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { useLocalSearchParams, useNavigation } from "expo-router";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { FlatList, View } from "react-native";
-
-const page: React.FC = () => {
-  const searchParams = useLocalSearchParams();
-  const { collectionId } = searchParams as { collectionId: string };
-
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const navigation = useNavigation();
-  const [orientation, setOrientation] = useState(
-    ScreenOrientation.Orientation.PORTRAIT_UP
-  );
-
-  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
-  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
-  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
-  const [sortBy, setSortBy] = useAtom(sortByAtom);
-  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);
-
-  const { data: collection } = useQuery({
-    queryKey: ["collection", collectionId],
-    queryFn: async () => {
-      if (!api) return null;
-      const response = await getUserLibraryApi(api).getItem({
-        itemId: collectionId,
-        userId: user?.Id,
-      });
-      const data = response.data;
-      return data;
-    },
-    enabled: !!api && !!user?.Id && !!collectionId,
-    staleTime: 60 * 1000,
-  });
-
-  useEffect(() => {
-    navigation.setOptions({ title: collection?.Name || "" });
-    setSortOrder([SortOrderOption.Ascending]);
-
-    if (!collection) return;
-
-    // Convert the DisplayOrder to SortByOption
-    const displayOrder = collection.DisplayOrder as ItemSortBy;
-    const sortByOption = displayOrder
-      ? SortByOption[displayOrder as keyof typeof SortByOption] ||
-        SortByOption.PremiereDate
-      : SortByOption.PremiereDate;
-
-    setSortBy([sortByOption]);
-  }, [navigation, collection]);
-
-  const fetchItems = useCallback(
-    async ({
-      pageParam,
-    }: {
-      pageParam: number;
-    }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !collection) return null;
-
-      const response = await getItemsApi(api).getItems({
-        userId: user?.Id,
-        parentId: collectionId,
-        limit: 18,
-        startIndex: pageParam,
-        // Set one ordering at a time. As collections do not work with correctly with multiple.
-        sortBy: [sortBy[0]],
-        sortOrder: [sortOrder[0]],
-        fields: [
-          "ItemCounts",
-          "PrimaryImageAspectRatio",
-          "CanDelete",
-          "MediaSourceCount",
-        ],
-        genres: selectedGenres,
-        tags: selectedTags,
-        years: selectedYears.map((year) => parseInt(year)),
-      });
-
-      return response.data || null;
-    },
-    [
-      api,
-      user?.Id,
-      collection,
-      selectedGenres,
-      selectedYears,
-      selectedTags,
-      sortBy,
-      sortOrder,
-    ]
-  );
-
-  const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
-    queryKey: [
-      "collection-items",
-      collection,
-      selectedGenres,
-      selectedYears,
-      selectedTags,
-      sortBy,
-      sortOrder,
-    ],
-    queryFn: fetchItems,
-    getNextPageParam: (lastPage, pages) => {
-      if (
-        !lastPage?.Items ||
-        !lastPage?.TotalRecordCount ||
-        lastPage?.TotalRecordCount === 0
-      )
-        return undefined;
-
-      const totalItems = lastPage.TotalRecordCount;
-      const accumulatedItems = pages.reduce(
-        (acc, curr) => acc + (curr?.Items?.length || 0),
-        0
-      );
-
-      if (accumulatedItems < totalItems) {
-        return lastPage?.Items?.length * pages.length;
-      } else {
-        return undefined;
-      }
-    },
-    initialPageParam: 0,
-    enabled: !!api && !!user?.Id && !!collection,
-  });
-
-  const flatData = useMemo(() => {
-    return (
-      (data?.pages.flatMap((p) => p?.Items).filter(Boolean) as BaseItemDto[]) ||
-      []
-    );
-  }, [data]);
-
-  const renderItem = useCallback(
-    ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <TouchableItemRouter
-        key={item.Id}
-        style={{
-          width: "100%",
-          marginBottom:
-            orientation === ScreenOrientation.Orientation.PORTRAIT_UP ? 4 : 16,
-        }}
-        item={item}
-      >
-        <View
-          style={{
-            alignSelf:
-              index % 3 === 0
-                ? "flex-end"
-                : (index + 1) % 3 === 0
-                ? "flex-start"
-                : "center",
-            width: "89%",
-          }}
-        >
-          <ItemPoster item={item} />
-          {/* <MoviePoster item={item} /> */}
-          <ItemCardText item={item} />
-        </View>
-      </TouchableItemRouter>
-    ),
-    [orientation]
-  );
-
-  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
-
-  const ListHeaderComponent = useCallback(
-    () => (
-      <View className="">
-        <FlatList
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={{
-            display: "flex",
-            paddingHorizontal: 15,
-            paddingVertical: 16,
-            flexDirection: "row",
-          }}
-          extraData={[
-            selectedGenres,
-            selectedYears,
-            selectedTags,
-            sortBy,
-            sortOrder,
-          ]}
-          data={[
-            {
-              key: "reset",
-              component: <ResetFiltersButton />,
-            },
-            {
-              key: "genre",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={collectionId}
-                  queryKey="genreFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: collectionId,
-                    });
-                    return response.data.Genres || [];
-                  }}
-                  set={setSelectedGenres}
-                  values={selectedGenres}
-                  title="Genres"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "year",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={collectionId}
-                  queryKey="yearFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: collectionId,
-                    });
-                    return response.data.Years || [];
-                  }}
-                  set={setSelectedYears}
-                  values={selectedYears}
-                  title="Years"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) => item.includes(search)}
-                />
-              ),
-            },
-            {
-              key: "tags",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={collectionId}
-                  queryKey="tagsFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: collectionId,
-                    });
-                    return response.data.Tags || [];
-                  }}
-                  set={setSelectedTags}
-                  values={selectedTags}
-                  title="Tags"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "sortBy",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={collectionId}
-                  queryKey="sortBy"
-                  queryFn={async () => sortOptions.map((s) => s.key)}
-                  set={setSortBy}
-                  values={sortBy}
-                  title="Sort By"
-                  renderItemLabel={(item) =>
-                    sortOptions.find((i) => i.key === item)?.value || ""
-                  }
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "sortOrder",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={collectionId}
-                  queryKey="sortOrder"
-                  queryFn={async () => sortOrderOptions.map((s) => s.key)}
-                  set={setSortOrder}
-                  values={sortOrder}
-                  title="Sort Order"
-                  renderItemLabel={(item) =>
-                    sortOrderOptions.find((i) => i.key === item)?.value || ""
-                  }
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-          ]}
-          renderItem={({ item }) => item.component}
-          keyExtractor={(item) => item.key}
-        />
-      </View>
-    ),
-    [
-      collectionId,
-      api,
-      user?.Id,
-      selectedGenres,
-      setSelectedGenres,
-      selectedYears,
-      setSelectedYears,
-      selectedTags,
-      setSelectedTags,
-      sortBy,
-      setSortBy,
-      sortOrder,
-      setSortOrder,
-      isFetching,
-    ]
-  );
-
-  if (!collection) return null;
-
-  return (
-    <FlashList
-      ListEmptyComponent={
-        <View className="flex flex-col items-center justify-center h-full">
-          <Text className="font-bold text-xl text-neutral-500">No results</Text>
-        </View>
-      }
-      extraData={[
-        selectedGenres,
-        selectedYears,
-        selectedTags,
-        sortBy,
-        sortOrder,
-      ]}
-      contentInsetAdjustmentBehavior="automatic"
-      data={flatData}
-      renderItem={renderItem}
-      keyExtractor={keyExtractor}
-      estimatedItemSize={255}
-      numColumns={
-        orientation === ScreenOrientation.Orientation.PORTRAIT_UP ? 3 : 5
-      }
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage();
-        }
-      }}
-      onEndReachedThreshold={0.5}
-      ListHeaderComponent={ListHeaderComponent}
-      contentContainerStyle={{ paddingBottom: 24 }}
-      ItemSeparatorComponent={() => (
-        <View
-          style={{
-            width: 10,
-            height: 10,
-          }}
-        ></View>
-      )}
-    />
-  );
-};
-
-export default page;

app/(auth)/(tabs)/(home,libraries,search)/items/page.tsx

@@ -1,16 +0,0 @@
-import { ItemContent } from "@/components/ItemContent";
-import { Stack, useLocalSearchParams } from "expo-router";
-import React from "react";
-
-const Page: React.FC = () => {
-  const { id } = useLocalSearchParams() as { id: string };
-
-  return (
-    <>
-      <Stack.Screen options={{ autoHideHomeIndicator: true }} />
-      <ItemContent id={id} />
-    </>
-  );
-};
-
-export default Page;

app/(auth)/(tabs)/(libraries)/[libraryId].tsx

@@ -1,468 +0,0 @@
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import {
-  useFocusEffect,
-  useLocalSearchParams,
-  useNavigation,
-} from "expo-router";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useLayoutEffect, useMemo } from "react";
-import { FlatList, useWindowDimensions, View } from "react-native";
-
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
-import { ItemCardText } from "@/components/ItemCardText";
-import { Loader } from "@/components/Loader";
-import { ItemPoster } from "@/components/posters/ItemPoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  genreFilterAtom,
-  getSortByPreference,
-  getSortOrderPreference,
-  sortByAtom,
-  SortByOption,
-  sortByPreferenceAtom,
-  sortOptions,
-  sortOrderAtom,
-  SortOrderOption,
-  sortOrderOptions,
-  sortOrderPreferenceAtom,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
-import { orientationAtom } from "@/utils/atoms/orientation";
-import {
-  BaseItemDto,
-  BaseItemDtoQueryResult,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  getFilterApi,
-  getItemsApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { FlashList } from "@shopify/flash-list";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-const MemoizedTouchableItemRouter = React.memo(TouchableItemRouter);
-
-const Page = () => {
-  const searchParams = useLocalSearchParams();
-  const { libraryId } = searchParams as { libraryId: string };
-
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const { width: screenWidth } = useWindowDimensions();
-
-  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
-  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
-  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
-  const [sortBy, _setSortBy] = useAtom(sortByAtom);
-  const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
-  const [orientation] = useAtom(orientationAtom);
-  const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
-  const [sortOrderPreference, setOderByPreference] = useAtom(
-    sortOrderPreferenceAtom
-  );
-
-  useEffect(() => {
-    const sop = getSortOrderPreference(libraryId, sortOrderPreference);
-    if (sop) {
-      _setSortOrder([sop]);
-    } else {
-      _setSortOrder([SortOrderOption.Ascending]);
-    }
-    const obp = getSortByPreference(libraryId, sortByPreference);
-    if (obp) {
-      _setSortBy([obp]);
-    } else {
-      _setSortBy([SortByOption.SortName]);
-    }
-  }, []);
-
-  const setSortBy = useCallback(
-    (sortBy: SortByOption[]) => {
-      const sop = getSortByPreference(libraryId, sortByPreference);
-      if (sortBy[0] !== sop) {
-        setSortByPreference({ ...sortByPreference, [libraryId]: sortBy[0] });
-      }
-      _setSortBy(sortBy);
-    },
-    [libraryId, sortByPreference]
-  );
-
-  const setSortOrder = useCallback(
-    (sortOrder: SortOrderOption[]) => {
-      const sop = getSortOrderPreference(libraryId, sortOrderPreference);
-      if (sortOrder[0] !== sop) {
-        setOderByPreference({
-          ...sortOrderPreference,
-          [libraryId]: sortOrder[0],
-        });
-      }
-      _setSortOrder(sortOrder);
-    },
-    [libraryId, sortOrderPreference]
-  );
-
-  const getNumberOfColumns = useCallback(() => {
-    if (orientation === ScreenOrientation.Orientation.PORTRAIT_UP) return 3;
-    if (screenWidth < 600) return 5;
-    if (screenWidth < 960) return 6;
-    if (screenWidth < 1280) return 7;
-    return 6;
-  }, [screenWidth, orientation]);
-
-  const { data: library, isLoading: isLibraryLoading } = useQuery({
-    queryKey: ["library", libraryId],
-    queryFn: async () => {
-      if (!api) return null;
-      const response = await getUserLibraryApi(api).getItem({
-        itemId: libraryId,
-        userId: user?.Id,
-      });
-      return response.data;
-    },
-    enabled: !!api && !!user?.Id && !!libraryId,
-    staleTime: 60 * 1000,
-  });
-
-  const navigation = useNavigation();
-  useEffect(() => {
-    navigation.setOptions({
-      title: library?.Name || "",
-    });
-  }, [library]);
-
-  const fetchItems = useCallback(
-    async ({
-      pageParam,
-    }: {
-      pageParam: number;
-    }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !library) return null;
-
-      const response = await getItemsApi(api).getItems({
-        userId: user?.Id,
-        parentId: libraryId,
-        limit: 36,
-        startIndex: pageParam,
-        sortBy: [sortBy[0], "SortName", "ProductionYear"],
-        sortOrder: [sortOrder[0]],
-        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
-        recursive: false,
-        imageTypeLimit: 1,
-        fields: ["PrimaryImageAspectRatio", "SortName"],
-        genres: selectedGenres,
-        tags: selectedTags,
-        years: selectedYears.map((year) => parseInt(year)),
-      });
-
-      return response.data || null;
-    },
-    [
-      api,
-      user?.Id,
-      libraryId,
-      library,
-      selectedGenres,
-      selectedYears,
-      selectedTags,
-      sortBy,
-      sortOrder,
-    ]
-  );
-
-  const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
-    useInfiniteQuery({
-      queryKey: [
-        "library-items",
-        libraryId,
-        selectedGenres,
-        selectedYears,
-        selectedTags,
-        sortBy,
-        sortOrder,
-      ],
-      queryFn: fetchItems,
-      getNextPageParam: (lastPage, pages) => {
-        if (
-          !lastPage?.Items ||
-          !lastPage?.TotalRecordCount ||
-          lastPage?.TotalRecordCount === 0
-        )
-          return undefined;
-
-        const totalItems = lastPage.TotalRecordCount;
-        const accumulatedItems = pages.reduce(
-          (acc, curr) => acc + (curr?.Items?.length || 0),
-          0
-        );
-
-        if (accumulatedItems < totalItems) {
-          return lastPage?.Items?.length * pages.length;
-        } else {
-          return undefined;
-        }
-      },
-      initialPageParam: 0,
-      enabled: !!api && !!user?.Id && !!library,
-    });
-
-  const flatData = useMemo(() => {
-    return (
-      (data?.pages.flatMap((p) => p?.Items).filter(Boolean) as BaseItemDto[]) ||
-      []
-    );
-  }, [data]);
-
-  const renderItem = useCallback(
-    ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <MemoizedTouchableItemRouter
-        key={item.Id}
-        style={{
-          width: "100%",
-          marginBottom: 4,
-        }}
-        item={item}
-      >
-        <View
-          style={{
-            alignSelf:
-              orientation === ScreenOrientation.Orientation.PORTRAIT_UP
-                ? index % 3 === 0
-                  ? "flex-end"
-                  : (index + 1) % 3 === 0
-                  ? "flex-start"
-                  : "center"
-                : "center",
-            width: "89%",
-          }}
-        >
-          {/* <MoviePoster item={item} /> */}
-          <ItemPoster item={item} />
-          <ItemCardText item={item} />
-        </View>
-      </MemoizedTouchableItemRouter>
-    ),
-    [orientation]
-  );
-
-  const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
-
-  const ListHeaderComponent = useCallback(
-    () => (
-      <View className="">
-        <FlatList
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={{
-            display: "flex",
-            paddingHorizontal: 15,
-            paddingVertical: 16,
-            flexDirection: "row",
-          }}
-          data={[
-            {
-              key: "reset",
-              component: <ResetFiltersButton />,
-            },
-            {
-              key: "genre",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={libraryId}
-                  queryKey="genreFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: libraryId,
-                    });
-                    return response.data.Genres || [];
-                  }}
-                  set={setSelectedGenres}
-                  values={selectedGenres}
-                  title="Genres"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "year",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={libraryId}
-                  queryKey="yearFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: libraryId,
-                    });
-                    return response.data.Years || [];
-                  }}
-                  set={setSelectedYears}
-                  values={selectedYears}
-                  title="Years"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) => item.includes(search)}
-                />
-              ),
-            },
-            {
-              key: "tags",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={libraryId}
-                  queryKey="tagsFilter"
-                  queryFn={async () => {
-                    if (!api) return null;
-                    const response = await getFilterApi(
-                      api
-                    ).getQueryFiltersLegacy({
-                      userId: user?.Id,
-                      parentId: libraryId,
-                    });
-                    return response.data.Tags || [];
-                  }}
-                  set={setSelectedTags}
-                  values={selectedTags}
-                  title="Tags"
-                  renderItemLabel={(item) => item.toString()}
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "sortBy",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={libraryId}
-                  queryKey="sortBy"
-                  queryFn={async () => sortOptions.map((s) => s.key)}
-                  set={setSortBy}
-                  values={sortBy}
-                  title="Sort By"
-                  renderItemLabel={(item) =>
-                    sortOptions.find((i) => i.key === item)?.value || ""
-                  }
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-            {
-              key: "sortOrder",
-              component: (
-                <FilterButton
-                  className="mr-1"
-                  collectionId={libraryId}
-                  queryKey="sortOrder"
-                  queryFn={async () => sortOrderOptions.map((s) => s.key)}
-                  set={setSortOrder}
-                  values={sortOrder}
-                  title="Sort Order"
-                  renderItemLabel={(item) =>
-                    sortOrderOptions.find((i) => i.key === item)?.value || ""
-                  }
-                  searchFilter={(item, search) =>
-                    item.toLowerCase().includes(search.toLowerCase())
-                  }
-                />
-              ),
-            },
-          ]}
-          renderItem={({ item }) => item.component}
-          keyExtractor={(item) => item.key}
-        />
-      </View>
-    ),
-    [
-      libraryId,
-      api,
-      user?.Id,
-      selectedGenres,
-      setSelectedGenres,
-      selectedYears,
-      setSelectedYears,
-      selectedTags,
-      setSelectedTags,
-      sortBy,
-      setSortBy,
-      sortOrder,
-      setSortOrder,
-      isFetching,
-    ]
-  );
-
-  const insets = useSafeAreaInsets();
-
-  if (isLoading || isLibraryLoading)
-    return (
-      <View className="w-full h-full flex items-center justify-center">
-        <Loader />
-      </View>
-    );
-
-  if (flatData.length === 0)
-    return (
-      <View className="h-full w-full flex justify-center items-center">
-        <Text className="text-lg text-neutral-500">No items found</Text>
-      </View>
-    );
-
-  return (
-    <FlashList
-      ListEmptyComponent={
-        <View className="flex flex-col items-center justify-center h-full">
-          <Text className="font-bold text-xl text-neutral-500">No results</Text>
-        </View>
-      }
-      contentInsetAdjustmentBehavior="automatic"
-      data={flatData}
-      renderItem={renderItem}
-      extraData={orientation}
-      keyExtractor={keyExtractor}
-      estimatedItemSize={244}
-      numColumns={getNumberOfColumns()}
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage();
-        }
-      }}
-      onEndReachedThreshold={1}
-      ListHeaderComponent={ListHeaderComponent}
-      contentContainerStyle={{
-        paddingBottom: 24,
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-      ItemSeparatorComponent={() => (
-        <View
-          style={{
-            width: 10,
-            height: 10,
-          }}
-        ></View>
-      )}
-    />
-  );
-};
-
-export default React.memo(Page);

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

@@ -1,210 +0,0 @@
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { useSettings } from "@/utils/atoms/settings";
-import { Ionicons } from "@expo/vector-icons";
-import { Stack } from "expo-router";
-import { Platform } from "react-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
-
-export default function IndexLayout() {
-  const [settings, updateSettings] = useSettings();
-
-  if (!settings?.libraryOptions) return null;
-
-  return (
-    <Stack>
-      <Stack.Screen
-        name="index"
-        options={{
-          headerShown: true,
-          headerLargeTitle: true,
-          headerTitle: "Library",
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-          headerRight: () => (
-            <DropdownMenu.Root>
-              <DropdownMenu.Trigger>
-                <Ionicons
-                  name="ellipsis-horizontal-outline"
-                  size={24}
-                  color="white"
-                />
-              </DropdownMenu.Trigger>
-              <DropdownMenu.Content
-                align={"end"}
-                alignOffset={-10}
-                avoidCollisions={false}
-                collisionPadding={0}
-                loop={false}
-                side={"bottom"}
-                sideOffset={10}
-              >
-                <DropdownMenu.Label>Display</DropdownMenu.Label>
-                <DropdownMenu.Group key="display-group">
-                  <DropdownMenu.Sub>
-                    <DropdownMenu.SubTrigger key="image-style-trigger">
-                      Display
-                    </DropdownMenu.SubTrigger>
-                    <DropdownMenu.SubContent
-                      alignOffset={-10}
-                      avoidCollisions={true}
-                      collisionPadding={0}
-                      loop={true}
-                      sideOffset={10}
-                    >
-                      <DropdownMenu.CheckboxItem
-                        key="display-option-1"
-                        value={settings.libraryOptions.display === "row"}
-                        onValueChange={() =>
-                          updateSettings({
-                            libraryOptions: {
-                              ...settings.libraryOptions,
-                              display: "row",
-                            },
-                          })
-                        }
-                      >
-                        <DropdownMenu.ItemIndicator />
-                        <DropdownMenu.ItemTitle key="display-title-1">
-                          Row
-                        </DropdownMenu.ItemTitle>
-                      </DropdownMenu.CheckboxItem>
-                      <DropdownMenu.CheckboxItem
-                        key="display-option-2"
-                        value={settings.libraryOptions.display === "list"}
-                        onValueChange={() =>
-                          updateSettings({
-                            libraryOptions: {
-                              ...settings.libraryOptions,
-                              display: "list",
-                            },
-                          })
-                        }
-                      >
-                        <DropdownMenu.ItemIndicator />
-                        <DropdownMenu.ItemTitle key="display-title-2">
-                          List
-                        </DropdownMenu.ItemTitle>
-                      </DropdownMenu.CheckboxItem>
-                    </DropdownMenu.SubContent>
-                  </DropdownMenu.Sub>
-                  <DropdownMenu.Sub>
-                    <DropdownMenu.SubTrigger key="image-style-trigger">
-                      Image style
-                    </DropdownMenu.SubTrigger>
-                    <DropdownMenu.SubContent
-                      alignOffset={-10}
-                      avoidCollisions={true}
-                      collisionPadding={0}
-                      loop={true}
-                      sideOffset={10}
-                    >
-                      <DropdownMenu.CheckboxItem
-                        key="poster-option"
-                        value={settings.libraryOptions.imageStyle === "poster"}
-                        onValueChange={() =>
-                          updateSettings({
-                            libraryOptions: {
-                              ...settings.libraryOptions,
-                              imageStyle: "poster",
-                            },
-                          })
-                        }
-                      >
-                        <DropdownMenu.ItemIndicator />
-                        <DropdownMenu.ItemTitle key="poster-title">
-                          Poster
-                        </DropdownMenu.ItemTitle>
-                      </DropdownMenu.CheckboxItem>
-                      <DropdownMenu.CheckboxItem
-                        key="cover-option"
-                        value={settings.libraryOptions.imageStyle === "cover"}
-                        onValueChange={() =>
-                          updateSettings({
-                            libraryOptions: {
-                              ...settings.libraryOptions,
-                              imageStyle: "cover",
-                            },
-                          })
-                        }
-                      >
-                        <DropdownMenu.ItemIndicator />
-                        <DropdownMenu.ItemTitle key="cover-title">
-                          Cover
-                        </DropdownMenu.ItemTitle>
-                      </DropdownMenu.CheckboxItem>
-                    </DropdownMenu.SubContent>
-                  </DropdownMenu.Sub>
-                </DropdownMenu.Group>
-                <DropdownMenu.Group key="show-titles-group">
-                  <DropdownMenu.CheckboxItem
-                    disabled={settings.libraryOptions.imageStyle === "poster"}
-                    key="show-titles-option"
-                    value={settings.libraryOptions.showTitles}
-                    onValueChange={(newValue) => {
-                      if (settings.libraryOptions.imageStyle === "poster")
-                        return;
-                      updateSettings({
-                        libraryOptions: {
-                          ...settings.libraryOptions,
-                          showTitles: newValue === "on" ? true : false,
-                        },
-                      });
-                    }}
-                  >
-                    <DropdownMenu.ItemIndicator />
-                    <DropdownMenu.ItemTitle key="show-titles-title">
-                      Show titles
-                    </DropdownMenu.ItemTitle>
-                  </DropdownMenu.CheckboxItem>
-                  <DropdownMenu.CheckboxItem
-                    key="show-stats-option"
-                    value={settings.libraryOptions.showStats}
-                    onValueChange={(newValue) => {
-                      updateSettings({
-                        libraryOptions: {
-                          ...settings.libraryOptions,
-                          showStats: newValue === "on" ? true : false,
-                        },
-                      });
-                    }}
-                  >
-                    <DropdownMenu.ItemIndicator />
-                    <DropdownMenu.ItemTitle key="show-stats-title">
-                      Show stats
-                    </DropdownMenu.ItemTitle>
-                  </DropdownMenu.CheckboxItem>
-                </DropdownMenu.Group>
-
-                <DropdownMenu.Separator />
-              </DropdownMenu.Content>
-            </DropdownMenu.Root>
-          ),
-        }}
-      />
-      <Stack.Screen
-        name="[libraryId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
-      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
-        <Stack.Screen key={name} name={name} options={options} />
-      ))}
-      <Stack.Screen
-        name="collections/[collectionId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
-    </Stack>
-  );
-}

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

@@ -1,102 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { LibraryItemCard } from "@/components/library/LibraryItemCard";
-import { Loader } from "@/components/Loader";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import {
-  getUserLibraryApi,
-  getUserViewsApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { FlashList } from "@shopify/flash-list";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useAtom } from "jotai";
-import { useEffect } from "react";
-import { StyleSheet, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-export default function index() {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const queryClient = useQueryClient();
-  const [settings] = useSettings();
-
-  const { data, isLoading: isLoading } = useQuery({
-    queryKey: ["user-views", user?.Id],
-    queryFn: async () => {
-      if (!api || !user?.Id) {
-        return null;
-      }
-
-      const response = await getUserViewsApi(api).getUserViews({
-        userId: user.Id,
-      });
-
-      return response.data.Items || null;
-    },
-    enabled: !!api && !!user?.Id,
-    staleTime: 60 * 1000 * 60,
-  });
-
-  useEffect(() => {
-    for (const item of data || []) {
-      queryClient.prefetchQuery({
-        queryKey: ["library", item.Id],
-        queryFn: async () => {
-          if (!item.Id || !user?.Id || !api) return null;
-          const response = await getUserLibraryApi(api).getItem({
-            itemId: item.Id,
-            userId: user?.Id,
-          });
-          return response.data;
-        },
-        staleTime: 60 * 1000,
-      });
-    }
-  }, [data]);
-
-  const insets = useSafeAreaInsets();
-
-  if (isLoading)
-    return (
-      <View className="justify-center items-center h-full">
-        <Loader />
-      </View>
-    );
-
-  if (!data)
-    return (
-      <View className="h-full w-full flex justify-center items-center">
-        <Text className="text-lg text-neutral-500">No libraries found</Text>
-      </View>
-    );
-
-  return (
-    <FlashList
-      extraData={settings}
-      contentInsetAdjustmentBehavior="automatic"
-      contentContainerStyle={{
-        paddingTop: 17,
-        paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17,
-        paddingBottom: 150,
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-      data={data}
-      renderItem={({ item }) => <LibraryItemCard library={item} />}
-      keyExtractor={(item) => item.Id || ""}
-      ItemSeparatorComponent={() =>
-        settings?.libraryOptions?.display === "row" ? (
-          <View
-            style={{
-              height: StyleSheet.hairlineWidth,
-            }}
-            className="bg-neutral-800 mx-2 my-4"
-          ></View>
-        ) : (
-          <View className="h-4" />
-        )
-      }
-      estimatedItemSize={200}
-    />
-  );
-}

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

@@ -1,10 +1,13 @@
+import { router, Tabs } from "expo-router";
+import React, { useEffect } from "react";
+import * as NavigationBar from "expo-navigation-bar";
 import { TabBarIcon } from "@/components/navigation/TabBarIcon";
 import { Colors } from "@/constants/Colors";
+import { Platform, TouchableOpacity, View } from "react-native";
+import { Feather } from "@expo/vector-icons";
+import { Chromecast } from "@/components/Chromecast";
 import { BlurView } from "expo-blur";
-import * as NavigationBar from "expo-navigation-bar";
-import { Tabs } from "expo-router";
-import React, { useEffect } from "react";
-import { Platform, StyleSheet } from "react-native";
+import { StyleSheet } from "react-native";
 
 export default function TabLayout() {
   useEffect(() => {
@@ -47,7 +50,7 @@ export default function TabLayout() {
     >
       <Tabs.Screen redirect name="index" />
       <Tabs.Screen
-        name="(home)"
+        name="home"
         options={{
           headerShown: false,
           title: "Home",
@@ -60,7 +63,7 @@ export default function TabLayout() {
         }}
       />
       <Tabs.Screen
-        name="(search)"
+        name="search"
         options={{
           headerShown: false,
           title: "Search",
@@ -70,7 +73,7 @@ export default function TabLayout() {
         }}
       />
       <Tabs.Screen
-        name="(libraries)"
+        name="libraries"
         options={{
           headerShown: false,
           title: "Library",

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

@@ -1,9 +1,8 @@
 import { Chromecast } from "@/components/Chromecast";
-import { HeaderBackButton } from "@/components/common/HeaderBackButton";
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { Feather } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
-import { Platform, TouchableOpacity, View } from "react-native";
+import { Platform, View } from "react-native";
+import { TouchableOpacity } from "react-native";
 
 export default function IndexLayout() {
   const router = useRouter();
@@ -26,7 +25,6 @@ export default function IndexLayout() {
               onPress={() => {
                 router.push("/(auth)/downloads");
               }}
-              className="p-2"
             >
               <Feather name="download" color={"white"} size={22} />
             </TouchableOpacity>
@@ -38,39 +36,15 @@ export default function IndexLayout() {
                 onPress={() => {
                   router.push("/(auth)/settings");
                 }}
-                className="p-2 "
               >
-                <Feather name="settings" color={"white"} size={22} />
+                <View className="h-10 aspect-square flex items-center justify-center rounded">
+                  <Feather name="settings" color={"white"} size={22} />
+                </View>
               </TouchableOpacity>
             </View>
           ),
         }}
       />
-      <Stack.Screen
-        name="downloads"
-        options={{
-          title: "Downloads",
-        }}
-      />
-      <Stack.Screen
-        name="settings"
-        options={{
-          title: "Settings",
-        }}
-      />
-      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
-        <Stack.Screen key={name} name={name} options={options} />
-      ))}
-      <Stack.Screen
-        name="collections/[collectionId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
     </Stack>
   );
 }

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

@@ -0,0 +1,298 @@
+import { Button } from "@/components/Button";
+import { Text } from "@/components/common/Text";
+import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
+import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
+import { Loader } from "@/components/Loader";
+import { MediaListSection } from "@/components/medialists/MediaListSection";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { Ionicons } from "@expo/vector-icons";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import {
+  getItemsApi,
+  getSuggestionsApi,
+  getTvShowsApi,
+  getUserLibraryApi,
+  getUserViewsApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import NetInfo from "@react-native-community/netinfo";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useRouter } from "expo-router";
+import { useAtom } from "jotai";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { RefreshControl, ScrollView, View } from "react-native";
+
+export default function index() {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const [loading, setLoading] = useState(false);
+  const [settings, _] = useSettings();
+
+  const [isConnected, setIsConnected] = useState<boolean | null>(null);
+
+  useEffect(() => {
+    const unsubscribe = NetInfo.addEventListener((state) => {
+      if (state.isConnected == false || state.isInternetReachable === false)
+        setIsConnected(false);
+      else setIsConnected(true);
+    });
+
+    NetInfo.fetch().then((state) => {
+      setIsConnected(state.isConnected);
+    });
+
+    return () => {
+      unsubscribe();
+    };
+  }, []);
+
+  const { data, isLoading, isError } = useQuery<BaseItemDto[]>({
+    queryKey: ["resumeItems", user?.Id],
+    queryFn: async () =>
+      (api &&
+        (
+          await getItemsApi(api).getResumeItems({
+            userId: user?.Id,
+          })
+        ).data.Items) ||
+      [],
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000,
+  });
+
+  const { data: _nextUpData, isLoading: isLoadingNextUp } = useQuery({
+    queryKey: ["nextUp-all", user?.Id],
+    queryFn: async () =>
+      (api &&
+        (
+          await getTvShowsApi(api).getNextUp({
+            userId: user?.Id,
+            fields: ["MediaSourceCount"],
+          })
+        ).data.Items) ||
+      [],
+    enabled: !!api && !!user?.Id,
+    staleTime: 0,
+  });
+
+  const nextUpData = useMemo(() => {
+    return _nextUpData?.filter((i) => !data?.find((d) => d.Id === i.Id));
+  }, [_nextUpData]);
+
+  const { data: collections } = useQuery({
+    queryKey: ["collectinos", user?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id) {
+        return null;
+      }
+
+      const response = await getUserViewsApi(api).getUserViews({
+        userId: user.Id,
+      });
+
+      return response.data.Items || null;
+    },
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000,
+  });
+
+  const movieCollectionId = useMemo(() => {
+    return collections?.find((c) => c.CollectionType === "movies")?.Id;
+  }, [collections]);
+
+  const tvShowCollectionId = useMemo(() => {
+    return collections?.find((c) => c.CollectionType === "tvshows")?.Id;
+  }, [collections]);
+
+  const {
+    data: recentlyAddedInMovies,
+    isLoading: isLoadingRecentlyAddedMovies,
+  } = useQuery<BaseItemDto[]>({
+    queryKey: ["recentlyAddedInMovies", user?.Id, movieCollectionId],
+    queryFn: async () =>
+      (api &&
+        (
+          await getUserLibraryApi(api).getLatestMedia({
+            userId: user?.Id,
+            limit: 50,
+            fields: ["PrimaryImageAspectRatio", "Path"],
+            imageTypeLimit: 1,
+            enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+            parentId: movieCollectionId,
+          })
+        ).data) ||
+      [],
+    enabled: !!api && !!user?.Id && !!movieCollectionId,
+    staleTime: 60 * 1000,
+  });
+
+  const {
+    data: recentlyAddedInTVShows,
+    isLoading: isLoadingRecentlyAddedTVShows,
+  } = useQuery<BaseItemDto[]>({
+    queryKey: ["recentlyAddedInTVShows", user?.Id, tvShowCollectionId],
+    queryFn: async () =>
+      (api &&
+        (
+          await getUserLibraryApi(api).getLatestMedia({
+            userId: user?.Id,
+            limit: 50,
+            fields: ["PrimaryImageAspectRatio", "Path"],
+            imageTypeLimit: 1,
+            enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+            parentId: tvShowCollectionId,
+          })
+        ).data) ||
+      [],
+    enabled: !!api && !!user?.Id && !!tvShowCollectionId,
+    staleTime: 60 * 1000,
+  });
+
+  const { data: suggestions, isLoading: isLoadingSuggestions } = useQuery<
+    BaseItemDto[]
+  >({
+    queryKey: ["suggestions", user?.Id],
+    queryFn: async () =>
+      (api &&
+        (
+          await getSuggestionsApi(api).getSuggestions({
+            userId: user?.Id,
+            limit: 5,
+            mediaType: ["Video"],
+          })
+        ).data.Items) ||
+      [],
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000,
+  });
+
+  const { data: mediaListCollections } = useQuery({
+    queryKey: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
+    queryFn: async () => {
+      if (!api || !user?.Id) return [];
+
+      const response = await getItemsApi(api).getItems({
+        userId: user.Id,
+        tags: ["sf_promoted"],
+        recursive: true,
+        fields: ["Tags"],
+        includeItemTypes: ["BoxSet"],
+      });
+
+      return response.data.Items || [];
+    },
+    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
+    staleTime: 0,
+  });
+
+  const refetch = useCallback(async () => {
+    setLoading(true);
+    await queryClient.refetchQueries({ queryKey: ["resumeItems"] });
+    await queryClient.refetchQueries({ queryKey: ["nextUp-all"] });
+    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInMovies"] });
+    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInTVShows"] });
+    await queryClient.refetchQueries({ queryKey: ["suggestions"] });
+    await queryClient.refetchQueries({
+      queryKey: ["sf_promoted"],
+    });
+    await queryClient.refetchQueries({
+      queryKey: ["sf_carousel"],
+    });
+    setLoading(false);
+  }, [queryClient, user?.Id]);
+
+  if (isConnected === false) {
+    return (
+      <View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
+        <Text className="text-3xl font-bold mb-2">No Internet</Text>
+        <Text className="text-center opacity-70">
+          No worries, you can still watch{"\n"}downloaded content.
+        </Text>
+        <View className="mt-4">
+          <Button
+            color="purple"
+            onPress={() => router.push("/(auth)/downloads")}
+            justify="center"
+            iconRight={
+              <Ionicons name="arrow-forward" size={20} color="white" />
+            }
+          >
+            Go to downloads
+          </Button>
+        </View>
+      </View>
+    );
+  }
+
+  if (isError)
+    return (
+      <View className="flex flex-col items-center justify-center h-full -mt-6">
+        <Text className="text-3xl font-bold mb-2">Oops!</Text>
+        <Text className="text-center opacity-70">
+          Something went wrong.{"\n"}Please log out and in again.
+        </Text>
+      </View>
+    );
+
+  if (isLoading)
+    return (
+      <View className="justify-center items-center h-full">
+        <Loader />
+      </View>
+    );
+
+  return (
+    <ScrollView
+      nestedScrollEnabled
+      contentInsetAdjustmentBehavior="automatic"
+      refreshControl={
+        <RefreshControl refreshing={loading} onRefresh={refetch} />
+      }
+    >
+      <View className="flex flex-col pt-4 pb-24 gap-y-4">
+        <LargeMovieCarousel />
+
+        <ScrollingCollectionList
+          title="Continue Watching"
+          data={data}
+          loading={isLoading}
+          orientation="horizontal"
+        />
+
+        <ScrollingCollectionList
+          title="Next Up"
+          data={nextUpData}
+          loading={isLoadingNextUp}
+          orientation="horizontal"
+        />
+
+        {mediaListCollections?.map((ml) => (
+          <MediaListSection key={ml.Id} collection={ml} />
+        ))}
+
+        <ScrollingCollectionList
+          title="Recently Added in Movies"
+          data={recentlyAddedInMovies}
+          loading={isLoadingRecentlyAddedMovies}
+        />
+
+        <ScrollingCollectionList
+          title="Recently Added in TV-Shows"
+          data={recentlyAddedInTVShows}
+          loading={isLoadingRecentlyAddedTVShows}
+        />
+
+        <ScrollingCollectionList
+          title="Suggestions"
+          data={suggestions}
+          loading={isLoadingSuggestions}
+          orientation="horizontal"
+        />
+      </View>
+    </ScrollView>
+  );
+}

app/(auth)/(tabs)/libraries/[libraryId].tsx

@@ -0,0 +1,344 @@
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { FilterButton } from "@/components/filters/FilterButton";
+import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  currentCollectionIdAtom,
+  genreFilterAtom,
+  sortByAtom,
+  sortByOptions,
+  sortOrderAtom,
+  sortOrderOptions,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";
+import {
+  BaseItemDtoQueryResult,
+  BaseItemKind,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import {
+  getFilterApi,
+  getItemsApi,
+  getUserLibraryApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useLocalSearchParams } from "expo-router";
+import { useAtom } from "jotai";
+import React, { useCallback, useEffect, useMemo } from "react";
+import { NativeScrollEvent, ScrollView, View } from "react-native";
+
+const isCloseToBottom = ({
+  layoutMeasurement,
+  contentOffset,
+  contentSize,
+}: NativeScrollEvent) => {
+  const paddingToBottom = 200;
+  return (
+    layoutMeasurement.height + contentOffset.y >=
+    contentSize.height - paddingToBottom
+  );
+};
+
+const page: React.FC = () => {
+  const searchParams = useLocalSearchParams();
+  const { libraryId } = searchParams as { libraryId: string };
+
+  const [, setCurrentCollectionId] = useAtom(currentCollectionIdAtom);
+
+  useEffect(() => {
+    setCurrentCollectionId(libraryId);
+  }, [libraryId]);
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
+  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
+  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
+  const [sortBy, setSortBy] = useAtom(sortByAtom);
+  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);
+
+  const { data: library } = useQuery({
+    queryKey: ["library", libraryId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getUserLibraryApi(api).getItem({
+        itemId: libraryId,
+        userId: user?.Id,
+      });
+      const data = response.data;
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!libraryId,
+    staleTime: 0,
+  });
+
+  const fetchItems = useCallback(
+    async ({
+      pageParam,
+    }: {
+      pageParam: number;
+    }): Promise<BaseItemDtoQueryResult | null> => {
+      if (!api || !library) return null;
+
+      const includeItemTypes: BaseItemKind[] = [];
+
+      switch (library?.CollectionType) {
+        case "movies":
+          includeItemTypes.push("Movie");
+          break;
+        case "boxsets":
+          includeItemTypes.push("BoxSet");
+          break;
+        case "tvshows":
+          includeItemTypes.push("Series");
+          break;
+        case "music":
+          includeItemTypes.push("MusicAlbum");
+          break;
+        default:
+          break;
+      }
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: libraryId,
+        limit: 66,
+        startIndex: pageParam,
+        sortBy: [sortBy[0].key, "SortName", "ProductionYear"],
+        sortOrder: [sortOrder[0].key],
+        includeItemTypes,
+        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
+        recursive: true,
+        imageTypeLimit: 1,
+        fields: ["PrimaryImageAspectRatio", "SortName"],
+        genres: selectedGenres,
+        tags: selectedTags,
+        years: selectedYears.map((year) => parseInt(year)),
+      });
+
+      return response.data || null;
+    },
+    [
+      api,
+      user?.Id,
+      libraryId,
+      library,
+      selectedGenres,
+      selectedYears,
+      selectedTags,
+      sortBy,
+      sortOrder,
+    ]
+  );
+
+  const { data, isFetching, fetchNextPage } = useInfiniteQuery({
+    queryKey: [
+      "library-items",
+      library,
+      selectedGenres,
+      selectedYears,
+      selectedTags,
+      sortBy,
+      sortOrder,
+    ],
+    queryFn: fetchItems,
+    getNextPageParam: (lastPage, pages) => {
+      if (
+        !lastPage?.Items ||
+        !lastPage?.TotalRecordCount ||
+        lastPage?.TotalRecordCount === 0
+      )
+        return undefined;
+
+      const totalItems = lastPage.TotalRecordCount;
+      const accumulatedItems = pages.reduce(
+        (acc, curr) => acc + (curr?.Items?.length || 0),
+        0
+      );
+
+      if (accumulatedItems < totalItems) {
+        return lastPage?.Items?.length * pages.length;
+      } else {
+        return undefined;
+      }
+    },
+    initialPageParam: 0,
+    enabled: !!api && !!user?.Id && !!library,
+  });
+
+  const type = useMemo(() => {
+    return data?.pages.flatMap((page) => page?.Items)[0]?.Type || null;
+  }, [data]);
+
+  const flatData = useMemo(() => {
+    return data?.pages.flatMap((p) => p?.Items) || [];
+  }, [data]);
+
+  if (!library || !library.CollectionType) return null;
+
+  return (
+    <ScrollView
+      contentInsetAdjustmentBehavior="automatic"
+      onScroll={({ nativeEvent }) => {
+        if (isCloseToBottom(nativeEvent)) {
+          fetchNextPage();
+        }
+      }}
+      scrollEventThrottle={400}
+    >
+      <View className="mt-4 mb-24">
+        <View className="mb-4">
+          <ScrollView horizontal showsHorizontalScrollIndicator={false}>
+            <View className="flex flex-row space-x-1 px-3">
+              <ResetFiltersButton />
+              <FilterButton
+                collectionId={libraryId}
+                queryKey="genreFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: libraryId,
+                  });
+                  return response.data.Genres || [];
+                }}
+                set={(value) => setSelectedGenres(value, libraryId)}
+                values={selectedGenres}
+                title="Genres"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                collectionId={libraryId}
+                queryKey="tagsFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: libraryId,
+                  });
+                  return response.data.Tags || [];
+                }}
+                set={(value) => setSelectedTags(value, libraryId)}
+                values={selectedTags}
+                title="Tags"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                collectionId={libraryId}
+                queryKey="yearFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: libraryId,
+                  });
+                  return (
+                    response.data.Years?.sort((a, b) => b - a).map((y) =>
+                      y.toString()
+                    ) || []
+                  );
+                }}
+                set={(value) => setSelectedYears(value, libraryId)}
+                values={selectedYears}
+                title="Years"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                icon="sort"
+                collectionId={libraryId}
+                queryKey="sortByFilter"
+                queryFn={async () => {
+                  return sortByOptions;
+                }}
+                set={(value) => setSortBy(value, libraryId)}
+                values={sortBy}
+                title="Sort by"
+                renderItemLabel={(item) => item.value}
+                searchFilter={(item, search) =>
+                  item.value.toLowerCase().includes(search.toLowerCase()) ||
+                  item.value.toLowerCase().includes(search.toLowerCase())
+                }
+                showSearch={false}
+              />
+              <FilterButton
+                icon="sort"
+                showSearch={false}
+                collectionId={libraryId}
+                queryKey="orderByFilter"
+                queryFn={async () => {
+                  return sortOrderOptions;
+                }}
+                set={(value) => setSortOrder(value, libraryId)}
+                values={sortOrder}
+                title="Order by"
+                renderItemLabel={(item) => item.value}
+                searchFilter={(item, search) =>
+                  item.value.toLowerCase().includes(search.toLowerCase()) ||
+                  item.value.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+            </View>
+          </ScrollView>
+          {!type && isFetching && (
+            <Loader
+              style={{
+                marginTop: 300,
+              }}
+            />
+          )}
+        </View>
+        <View className="flex flex-row flex-wrap px-4 justify-between after:content-['']">
+          {flatData.map(
+            (item, index) =>
+              item && (
+                <TouchableItemRouter
+                  key={`${item.Id}-${index}`}
+                  style={{
+                    width: "32%",
+                    marginBottom: 4,
+                  }}
+                  item={item}
+                  className={`
+                    `}
+                >
+                  <MoviePoster item={item} />
+                  <ItemCardText item={item} />
+                </TouchableItemRouter>
+              )
+          )}
+          {flatData.length % 3 !== 0 && (
+            <View
+              style={{
+                width: "33%",
+              }}
+            ></View>
+          )}
+        </View>
+      </View>
+    </ScrollView>
+  );
+};
+
+export default page;

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

@@ -1,8 +1,7 @@
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { Stack } from "expo-router";
+import { Stack, useRouter } from "expo-router";
 import { Platform } from "react-native";
 
-export default function SearchLayout() {
+export default function IndexLayout() {
   return (
     <Stack>
       <Stack.Screen
@@ -10,17 +9,14 @@ export default function SearchLayout() {
         options={{
           headerShown: true,
           headerLargeTitle: true,
-          headerTitle: "Search",
+          headerTitle: "Library",
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios" ? true : false,
           headerShadowVisible: false,
         }}
       />
-      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
-        <Stack.Screen key={name} name={name} options={options} />
-      ))}
       <Stack.Screen
-        name="collections/[collectionId]"
+        name="[libraryId]"
         options={{
           title: "",
           headerShown: true,

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

@@ -0,0 +1,111 @@
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { currentCollectionIdAtom } from "@/utils/atoms/filters";
+import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
+import { FlashList } from "@shopify/flash-list";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useRouter } from "expo-router";
+import { useAtom } from "jotai";
+import { useMemo } from "react";
+import { TouchableOpacity, View } from "react-native";
+
+export default function index() {
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data, isLoading: isLoading } = useQuery({
+    queryKey: ["user-views", user?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id) {
+        return null;
+      }
+
+      const response = await getUserViewsApi(api).getUserViews({
+        userId: user.Id,
+      });
+
+      return response.data.Items || null;
+    },
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000,
+  });
+
+  if (isLoading)
+    return (
+      <View className="justify-center items-center h-full">
+        <Loader />
+      </View>
+    );
+
+  return (
+    <FlashList
+      contentInsetAdjustmentBehavior="automatic"
+      contentContainerStyle={{
+        paddingTop: 17,
+        paddingHorizontal: 17,
+        paddingBottom: 150,
+      }}
+      data={data}
+      renderItem={({ item }) => <LibraryItemCard library={item} />}
+      keyExtractor={(item) => item.Id || ""}
+      ItemSeparatorComponent={() => <View className="h-4" />}
+      estimatedItemSize={200}
+    />
+  );
+}
+
+interface Props {
+  library: BaseItemDto;
+}
+
+const LibraryItemCard: React.FC<Props> = ({ library }) => {
+  const router = useRouter();
+
+  const [api] = useAtom(apiAtom);
+
+  const [currentCollection, setCurrentCollection] = useAtom(
+    currentCollectionIdAtom
+  );
+
+  const url = useMemo(
+    () =>
+      getPrimaryImageUrl({
+        api,
+        item: library,
+      }),
+    [library]
+  );
+
+  if (!url) return null;
+
+  return (
+    <TouchableOpacity
+      onPress={() => {
+        if (!library.Id) return;
+        setCurrentCollection(library.Id);
+        router.push(`/libraries/${library.Id}`);
+      }}
+    >
+      <View className="flex justify-center rounded-xl w-full relative border border-neutral-900 h-20 ">
+        <Image
+          source={{ uri: url }}
+          style={{
+            width: "100%",
+            height: "100%",
+            borderRadius: 8,
+            position: "absolute",
+            top: 0,
+            left: 0,
+          }}
+        />
+        <Text className="font-bold text-xl text-start px-4">
+          {library.Name}
+        </Text>
+      </View>
+    </TouchableOpacity>
+  );
+};

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

@@ -0,0 +1,20 @@
+import { Stack } from "expo-router";
+import { Platform } from "react-native";
+
+export default function SearchLayout() {
+  return (
+    <Stack>
+      <Stack.Screen
+        name="index"
+        options={{
+          headerShown: true,
+          headerLargeTitle: true,
+          headerTitle: "Search",
+          headerBlurEffect: "prominent",
+          headerTransparent: Platform.OS === "ios" ? true : false,
+          headerShadowVisible: false,
+        }}
+      />
+    </Stack>
+  );
+}

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

@@ -1,3 +1,4 @@
+import { Button } from "@/components/Button";
 import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
@@ -8,10 +9,11 @@ import { Loader } from "@/components/Loader";
 import AlbumCover from "@/components/posters/AlbumCover";
 import MoviePoster from "@/components/posters/MoviePoster";
 import SeriesPoster from "@/components/posters/SeriesPoster";
-import { TAB_HEIGHT } from "@/constants/Values";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import { Ionicons } from "@expo/vector-icons";
+import { Api } from "@jellyfin/sdk";
 import {
   BaseItemDto,
   BaseItemKind,
@@ -19,7 +21,13 @@ import {
 import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
-import { Href, router, useLocalSearchParams, useNavigation } from "expo-router";
+import {
+  Href,
+  router,
+  useLocalSearchParams,
+  useNavigation,
+  usePathname,
+} from "expo-router";
 import { useAtom } from "jotai";
 import React, {
   useCallback,
@@ -29,7 +37,6 @@ import React, {
   useState,
 } from "react";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
 
 const exampleSearches = [
@@ -43,7 +50,6 @@ const exampleSearches = [
 
 export default function search() {
   const params = useLocalSearchParams();
-  const insets = useSafeAreaInsets();
 
   const { q, prev } = params as { q: string; prev: Href<string> };
 
@@ -151,26 +157,6 @@ export default function search() {
     enabled: debouncedSearch.length > 0,
   });
 
-  const { data: collections, isFetching: l7 } = useQuery({
-    queryKey: ["search", "collections", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["BoxSet"],
-      }),
-    enabled: debouncedSearch.length > 0,
-  });
-
-  const { data: actors, isFetching: l8 } = useQuery({
-    queryKey: ["search", "actors", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["Person"],
-      }),
-    enabled: debouncedSearch.length > 0,
-  });
-
   const { data: artists, isFetching: l4 } = useQuery({
     queryKey: ["search", "artists", debouncedSearch],
     queryFn: () =>
@@ -208,31 +194,21 @@ export default function search() {
       songs?.length ||
       movies?.length ||
       episodes?.length ||
-      series?.length ||
-      collections?.length ||
-      actors?.length
+      series?.length
     );
-  }, [artists, episodes, albums, songs, movies, series, collections, actors]);
+  }, [artists, episodes, albums, songs, movies, series]);
 
   const loading = useMemo(() => {
-    return l1 || l2 || l3 || l4 || l5 || l6 || l7 || l8;
-  }, [l1, l2, l3, l4, l5, l6, l7, l8]);
+    return l1 || l2 || l3 || l4 || l5 || l6;
+  }, [l1, l2, l3, l4, l5, l6]);
 
   return (
     <>
       <ScrollView
         keyboardDismissMode="on-drag"
         contentInsetAdjustmentBehavior="automatic"
-        contentContainerStyle={{
-          paddingLeft: insets.left,
-          paddingRight: insets.right,
-          paddingBottom: 16,
-        }}
-        style={{
-          marginBottom: TAB_HEIGHT,
-        }}
       >
-        <View className="flex flex-col pt-2">
+        <View className="flex flex-col pt-4 pb-32">
           {Platform.OS === "android" && (
             <View className="mb-4 px-4">
               <Input
@@ -255,125 +231,125 @@ export default function search() {
           <SearchItemWrapper
             header="Movies"
             ids={movies?.map((m) => m.Id!)}
-            renderItem={(item) => (
-              <TouchableItemRouter
-                key={item.Id}
-                className="flex flex-col w-28 mr-2"
-                item={item}
-              >
-                <MoviePoster item={item} key={item.Id} />
-                <Text numberOfLines={2} className="mt-2">
-                  {item.Name}
-                </Text>
-                <Text className="opacity-50 text-xs">
-                  {item.ProductionYear}
-                </Text>
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                    onPress={() => router.push(`/items/${item.Id}`)}
+                  >
+                    <MoviePoster item={item} key={item.Id} />
+                    <Text numberOfLines={2} className="mt-2">
+                      {item.Name}
+                    </Text>
+                    <Text className="opacity-50 text-xs">
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={series?.map((m) => m.Id!)}
             header="Series"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                key={item.Id}
-                item={item}
-                className="flex flex-col w-28"
-              >
-                <SeriesPoster item={item} key={item.Id} />
-                <Text numberOfLines={2} className="mt-2">
-                  {item.Name}
-                </Text>
-                <Text className="opacity-50 text-xs">
-                  {item.ProductionYear}
-                </Text>
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
+                    key={item.Id}
+                    onPress={() => router.push(`/series/${item.Id}`)}
+                    className="flex flex-col w-28"
+                  >
+                    <SeriesPoster item={item} key={item.Id} />
+                    <Text numberOfLines={2} className="mt-2">
+                      {item.Name}
+                    </Text>
+                    <Text className="opacity-50 text-xs">
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={episodes?.map((m) => m.Id!)}
             header="Episodes"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                item={item}
-                key={item.Id}
-                className="flex flex-col w-44"
-              >
-                <ContinueWatchingPoster item={item} />
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
-            )}
-          />
-          <SearchItemWrapper
-            ids={collections?.map((m) => m.Id!)}
-            header="Collections"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                key={item.Id}
-                item={item}
-                className="flex flex-col w-28"
-              >
-                <MoviePoster item={item} key={item.Id} />
-                <Text numberOfLines={2} className="mt-2">
-                  {item.Name}
-                </Text>
-              </TouchableItemRouter>
-            )}
-          />
-          <SearchItemWrapper
-            ids={actors?.map((m) => m.Id!)}
-            header="Actors"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                item={item}
-                key={item.Id}
-                className="flex flex-col w-28"
-              >
-                <MoviePoster item={item} />
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
+                    key={item.Id}
+                    onPress={() => router.push(`/items/${item.Id}`)}
+                    className="flex flex-col w-44"
+                  >
+                    <ContinueWatchingPoster item={item} />
+                    <ItemCardText item={item} />
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={artists?.map((m) => m.Id!)}
             header="Artists"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                item={item}
-                key={item.Id}
-                className="flex flex-col w-28"
-              >
-                <AlbumCover id={item.Id} />
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={albums?.map((m) => m.Id!)}
             header="Albums"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                item={item}
-                key={item.Id}
-                className="flex flex-col w-28"
-              >
-                <AlbumCover id={item.Id} />
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={songs?.map((m) => m.Id!)}
             header="Songs"
-            renderItem={(item) => (
-              <TouchableItemRouter
-                item={item}
-                key={item.Id}
-                className="flex flex-col w-28"
-              >
-                <AlbumCover id={item.AlbumId} />
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.AlbumId} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
             )}
           />
           {loading ? (
@@ -410,7 +386,7 @@ export default function search() {
 
 type Props = {
   ids?: string[] | null;
-  renderItem: (item: BaseItemDto) => React.ReactNode;
+  renderItem: (data: BaseItemDto[]) => React.ReactNode;
   header?: string;
 };
 
@@ -448,14 +424,8 @@ const SearchItemWrapper: React.FC<Props> = ({ ids, renderItem, header }) => {
 
   return (
     <>
-      <Text className="font-bold text-lg px-4 mb-2">{header}</Text>
-      <ScrollView
-        horizontal
-        className="px-4 mb-2"
-        showsHorizontalScrollIndicator={false}
-      >
-        {data.map((item) => renderItem(item))}
-      </ScrollView>
+      <Text className="font-bold text-2xl px-4 my-2">{header}</Text>
+      {renderItem(data)}
     </>
   );
 };

app/(auth)/albums/[albumId].tsx

@@ -1,9 +1,6 @@
 import { Chromecast } from "@/components/Chromecast";
-import { ItemImage } from "@/components/common/ItemImage";
 import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { SongsList } from "@/components/music/SongsList";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
 import ArtistPoster from "@/components/posters/ArtistPoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
@@ -13,7 +10,6 @@ import { router, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import { useEffect, useState } from "react";
 import { ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 export default function page() {
   const searchParams = useLocalSearchParams();
@@ -91,31 +87,35 @@ export default function page() {
     enabled: !!api && !!user?.Id,
   });
 
-  const insets = useSafeAreaInsets();
-
   if (!album) return null;
 
   return (
-    <ParallaxScrollView
-      headerHeight={400}
-      headerImage={
-        <ItemImage
-          variant={"Primary"}
-          item={album}
-          style={{
-            width: "100%",
-            height: "100%",
-          }}
-        />
-      }
-    >
-      <View className="px-4 mb-8">
-        <Text className="font-bold text-2xl mb-2">{album?.Name}</Text>
-        <Text className="text-neutral-500">
-          {songs?.TotalRecordCount} songs
-        </Text>
-      </View>
-      <View className="px-4">
+    <ScrollView>
+      <View className="px-4 pb-24">
+        <View className="flex flex-row space-x-4 items-start mb-4">
+          <View className="w-24">
+            <ArtistPoster item={album} />
+          </View>
+          <View className="flex flex-col shrink">
+            <Text className="font-bold text-3xl">{album?.Name}</Text>
+            <Text className="">{album?.ProductionYear}</Text>
+
+            <View className="flex flex-row space-x-2 mt-1">
+              {album.AlbumArtists?.map((a) => (
+                <TouchableOpacity
+                  key={a.Id}
+                  onPress={() => {
+                    router.push(`/artists/${a.Id}/page`);
+                  }}
+                >
+                  <Text className="font-bold text-purple-600">
+                    {album?.AlbumArtist}
+                  </Text>
+                </TouchableOpacity>
+              ))}
+            </View>
+          </View>
+        </View>
         <SongsList
           albumId={albumId}
           songs={songs?.Items}
@@ -123,6 +123,6 @@ export default function page() {
           artistId={artistId}
         />
       </View>
-    </ParallaxScrollView>
+    </ScrollView>
   );
 }

app/(auth)/artists/[artistId]/page.tsx

@@ -8,10 +8,6 @@ import { router, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import { useEffect, useState } from "react";
 import { FlatList, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ItemImage } from "@/components/common/ItemImage";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 
 export default function page() {
   const searchParams = useLocalSearchParams();
@@ -86,45 +82,50 @@ export default function page() {
     enabled: !!api && !!user?.Id,
   });
 
-  const insets = useSafeAreaInsets();
+  useEffect(() => {
+    navigation.setOptions({
+      title: albums?.Items?.[0].AlbumArtist,
+    });
+  }, [albums]);
 
   if (!artist || !albums) return null;
 
   return (
-    <ParallaxScrollView
-      headerHeight={400}
-      headerImage={
-        <ItemImage
-          variant={"Primary"}
-          item={artist}
-          style={{
-            width: "100%",
-            height: "100%",
-          }}
-        />
+    <FlatList
+      contentContainerStyle={{
+        padding: 16,
+        paddingBottom: 140,
+      }}
+      ListHeaderComponent={
+        <View className="mb-2">
+          <View className="w-32 mb-4">
+            <ArtistPoster item={artist} />
+          </View>
+          <Text className="font-bold text-2xl mb-4">Albums</Text>
+        </View>
       }
-    >
-      <View className="px-4 mb-8">
-        <Text className="font-bold text-2xl mb-2">{artist?.Name}</Text>
-        <Text className="text-neutral-500">
-          {albums.TotalRecordCount} albums
-        </Text>
-      </View>
-      <View className="flex flex-row flex-wrap justify-between px-4">
-        {albums.Items.map((item, idx) => (
-          <TouchableItemRouter
-            item={item}
-            style={{ width: "30%", marginBottom: 20 }}
-            key={idx}
-          >
-            <View className="flex flex-col gap-y-2">
-              <ArtistPoster item={item} />
-              <Text numberOfLines={2}>{item.Name}</Text>
-              <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
-            </View>
-          </TouchableItemRouter>
-        ))}
-      </View>
-    </ParallaxScrollView>
+      nestedScrollEnabled
+      data={albums.Items}
+      numColumns={3}
+      columnWrapperStyle={{
+        justifyContent: "space-between",
+      }}
+      renderItem={({ item, index }) => (
+        <TouchableOpacity
+          style={{ width: "30%" }}
+          key={index}
+          onPress={() => {
+            router.push(`/albums/${item.Id}`);
+          }}
+        >
+          <View className="flex flex-col gap-y-2">
+            <ArtistPoster item={item} />
+            <Text>{item.Name}</Text>
+            <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
+          </View>
+        </TouchableOpacity>
+      )}
+      keyExtractor={(item) => item.Id || ""}
+    />
   );
 }

app/(auth)/artists/page.tsx

@@ -1,5 +1,4 @@
 import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import ArtistPoster from "@/components/posters/ArtistPoster";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -91,13 +90,15 @@ export default function page() {
         justifyContent: "space-between",
       }}
       renderItem={({ item, index }) => (
-        <TouchableItemRouter
+        <TouchableOpacity
           style={{
             maxWidth: "30%",
             width: "100%",
           }}
           key={index}
-          item={item}
+          onPress={() => {
+            router.push(`/artists/${item.Id}/page`);
+          }}
         >
           <View className="flex flex-col gap-y-2">
             {collection?.CollectionType === "movies" && (
@@ -109,7 +110,7 @@ export default function page() {
             <Text>{item.Name}</Text>
             <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
           </View>
-        </TouchableItemRouter>
+        </TouchableOpacity>
       )}
       keyExtractor={(item) => item.Id || ""}
     />

app/(auth)/collections/[collectionId].tsx

@@ -0,0 +1,353 @@
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { FilterButton } from "@/components/filters/FilterButton";
+import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  currentCollectionIdAtom,
+  genreFilterAtom,
+  sortByAtom,
+  sortByOptions,
+  sortOrderAtom,
+  sortOrderOptions,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";
+import {
+  BaseItemDtoQueryResult,
+  BaseItemKind,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import {
+  getFilterApi,
+  getItemsApi,
+  getUserLibraryApi,
+} from "@jellyfin/sdk/lib/utils/api";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { Stack, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import React, { useCallback, useEffect, useMemo } from "react";
+import { NativeScrollEvent, ScrollView, View } from "react-native";
+
+const isCloseToBottom = ({
+  layoutMeasurement,
+  contentOffset,
+  contentSize,
+}: NativeScrollEvent) => {
+  const paddingToBottom = 200;
+  return (
+    layoutMeasurement.height + contentOffset.y >=
+    contentSize.height - paddingToBottom
+  );
+};
+
+const page: React.FC = () => {
+  const searchParams = useLocalSearchParams();
+  const { collectionId } = searchParams as { collectionId: string };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+  const navigation = useNavigation();
+
+  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
+  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
+  const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
+  const [sortBy, setSortBy] = useAtom(sortByAtom);
+  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);
+  const [currentCollection, setCurrentCollection] = useAtom(
+    currentCollectionIdAtom
+  );
+
+  useEffect(() => {
+    setSortBy(
+      [
+        {
+          key: "PremiereDate",
+          value: "Premiere Date",
+        },
+      ],
+      collectionId
+    );
+    setSortOrder(
+      [
+        {
+          key: "Ascending",
+          value: "Ascending",
+        },
+      ],
+      collectionId
+    );
+  }, []);
+
+  const { data: collection } = useQuery({
+    queryKey: ["collection", collectionId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getUserLibraryApi(api).getItem({
+        itemId: collectionId,
+        userId: user?.Id,
+      });
+      const data = response.data;
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!collectionId,
+    staleTime: 0,
+  });
+
+  useEffect(() => {
+    navigation.setOptions({ title: collection?.Name || "" });
+  }, [navigation, collection]);
+
+  const fetchItems = useCallback(
+    async ({
+      pageParam,
+    }: {
+      pageParam: number;
+    }): Promise<BaseItemDtoQueryResult | null> => {
+      if (!api || !collection) return null;
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: collectionId,
+        limit: 18,
+        startIndex: pageParam,
+        sortBy: [sortBy[0].key, "SortName", "ProductionYear"],
+        sortOrder: [sortOrder[0].key],
+        fields: [
+          "ItemCounts",
+          "PrimaryImageAspectRatio",
+          "CanDelete",
+          "MediaSourceCount",
+        ],
+        genres: selectedGenres,
+        tags: selectedTags,
+        years: selectedYears.map((year) => parseInt(year)),
+      });
+
+      return response.data || null;
+    },
+    [
+      api,
+      user?.Id,
+      collection,
+      selectedGenres,
+      selectedYears,
+      selectedTags,
+      sortBy,
+      sortOrder,
+    ]
+  );
+
+  const { data, isFetching, fetchNextPage } = useInfiniteQuery({
+    queryKey: [
+      "collection-items",
+      collection,
+      selectedGenres,
+      selectedYears,
+      selectedTags,
+      sortBy,
+      sortOrder,
+    ],
+    queryFn: fetchItems,
+    getNextPageParam: (lastPage, pages) => {
+      if (
+        !lastPage?.Items ||
+        !lastPage?.TotalRecordCount ||
+        lastPage?.TotalRecordCount === 0
+      )
+        return undefined;
+
+      const totalItems = lastPage.TotalRecordCount;
+      const accumulatedItems = pages.reduce(
+        (acc, curr) => acc + (curr?.Items?.length || 0),
+        0
+      );
+
+      if (accumulatedItems < totalItems) {
+        return lastPage?.Items?.length * pages.length;
+      } else {
+        return undefined;
+      }
+    },
+    initialPageParam: 0,
+    enabled: !!api && !!user?.Id && !!collection,
+  });
+
+  useEffect(() => {
+    console.log("Data: ", data);
+  }, [data]);
+
+  const type = useMemo(() => {
+    return data?.pages.flatMap((page) => page?.Items)[0]?.Type || null;
+  }, [data]);
+
+  const flatData = useMemo(() => {
+    return data?.pages.flatMap((p) => p?.Items) || [];
+  }, [data]);
+
+  if (!collection) return null;
+
+  return (
+    <ScrollView
+      contentInsetAdjustmentBehavior="automatic"
+      onScroll={({ nativeEvent }) => {
+        if (isCloseToBottom(nativeEvent)) {
+          fetchNextPage();
+        }
+      }}
+      scrollEventThrottle={400}
+    >
+      <View className="mt-4 mb-24">
+        <View className="mb-4">
+          <ScrollView horizontal showsHorizontalScrollIndicator={false}>
+            <View className="flex flex-row space-x-1 px-3">
+              <ResetFiltersButton />
+              <FilterButton
+                collectionId={collectionId}
+                queryKey="genreFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: collectionId,
+                  });
+                  return response.data.Genres || [];
+                }}
+                set={(value) => setSelectedGenres(value, collectionId)}
+                values={selectedGenres}
+                title="Genres"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                collectionId={collectionId}
+                queryKey="tagsFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: collectionId,
+                  });
+                  return response.data.Tags || [];
+                }}
+                set={(value) => setSelectedTags(value, collectionId)}
+                values={selectedTags}
+                title="Tags"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                collectionId={collectionId}
+                queryKey="yearFilter"
+                queryFn={async () => {
+                  if (!api) return null;
+                  const response = await getFilterApi(
+                    api
+                  ).getQueryFiltersLegacy({
+                    userId: user?.Id,
+                    includeItemTypes: type ? [type] : [],
+                    parentId: collectionId,
+                  });
+                  return (
+                    response.data.Years?.sort((a, b) => b - a).map((y) =>
+                      y.toString()
+                    ) || []
+                  );
+                }}
+                set={(value) => setSelectedYears(value, collectionId)}
+                values={selectedYears}
+                title="Years"
+                renderItemLabel={(item) => item.toString()}
+                searchFilter={(item, search) =>
+                  item.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+              <FilterButton
+                icon="sort"
+                collectionId={collectionId}
+                queryKey="sortByFilter"
+                queryFn={async () => {
+                  return sortByOptions;
+                }}
+                set={(value) => setSortBy(value, collectionId)}
+                values={sortBy}
+                title="Sort by"
+                renderItemLabel={(item) => item.value}
+                searchFilter={(item, search) =>
+                  item.value.toLowerCase().includes(search.toLowerCase()) ||
+                  item.value.toLowerCase().includes(search.toLowerCase())
+                }
+                showSearch={false}
+              />
+              <FilterButton
+                icon="sort"
+                showSearch={false}
+                collectionId={collectionId}
+                queryKey="orderByFilter"
+                queryFn={async () => {
+                  return sortOrderOptions;
+                }}
+                set={(value) => setSortOrder(value, collectionId)}
+                values={sortOrder}
+                title="Order by"
+                renderItemLabel={(item) => item.value}
+                searchFilter={(item, search) =>
+                  item.value.toLowerCase().includes(search.toLowerCase()) ||
+                  item.value.toLowerCase().includes(search.toLowerCase())
+                }
+              />
+            </View>
+          </ScrollView>
+          {!type && isFetching && (
+            <Loader
+              style={{
+                marginTop: 300,
+              }}
+            />
+          )}
+        </View>
+        <View className="flex flex-row flex-wrap px-4 justify-between after:content-['']">
+          {flatData.map(
+            (item, index) =>
+              item && (
+                <TouchableItemRouter
+                  key={`${item.Id}`}
+                  style={{
+                    width: "32%",
+                    marginBottom: 4,
+                  }}
+                  item={item}
+                  className={`
+                    `}
+                >
+                  <MoviePoster item={item} />
+                  <ItemCardText item={item} />
+                </TouchableItemRouter>
+              )
+          )}
+          {flatData.length % 3 !== 0 && (
+            <View
+              style={{
+                width: "33%",
+              }}
+            ></View>
+          )}
+        </View>
+      </View>
+    </ScrollView>
+  );
+};
+
+export default page;

app/(auth)/downloads.tsx

@@ -0,0 +1,179 @@
+import { Text } from "@/components/common/Text";
+import { MovieCard } from "@/components/downloads/MovieCard";
+import { SeriesCard } from "@/components/downloads/SeriesCard";
+import { Loader } from "@/components/Loader";
+import { runningProcesses } from "@/utils/atoms/downloads";
+import { queueAtom } from "@/utils/atoms/queue";
+import { Ionicons } from "@expo/vector-icons";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { useQuery } from "@tanstack/react-query";
+import { router } from "expo-router";
+import { FFmpegKit } from "ffmpeg-kit-react-native";
+import { useAtom } from "jotai";
+import { useMemo } from "react";
+import { ScrollView, TouchableOpacity, View } from "react-native";
+
+const downloads: React.FC = () => {
+  const [process, setProcess] = useAtom(runningProcesses);
+  const [queue, setQueue] = useAtom(queueAtom);
+
+  const { data: downloadedFiles, isLoading } = useQuery({
+    queryKey: ["downloaded_files", process?.item.Id],
+    queryFn: async () =>
+      JSON.parse(
+        (await AsyncStorage.getItem("downloaded_files")) || "[]"
+      ) as BaseItemDto[],
+    staleTime: 0,
+  });
+
+  const movies = useMemo(
+    () => downloadedFiles?.filter((f) => f.Type === "Movie") || [],
+    [downloadedFiles]
+  );
+
+  const groupedBySeries = useMemo(() => {
+    const episodes = downloadedFiles?.filter((f) => f.Type === "Episode");
+    const series: { [key: string]: BaseItemDto[] } = {};
+    episodes?.forEach((e) => {
+      if (!series[e.SeriesName!]) series[e.SeriesName!] = [];
+      series[e.SeriesName!].push(e);
+    });
+    return Object.values(series);
+  }, [downloadedFiles]);
+
+  const eta = useMemo(() => {
+    const length = process?.item?.RunTimeTicks || 0;
+
+    if (!process?.speed || !process?.progress) return "";
+
+    const timeLeft =
+      (length - length * (process.progress / 100)) / process.speed;
+
+    return formatNumber(timeLeft / 10000);
+  }, [process]);
+
+  if (isLoading) {
+    return (
+      <View className="h-full flex flex-col items-center justify-center -mt-6">
+        <Loader />
+      </View>
+    );
+  }
+
+  return (
+    <ScrollView>
+      <View className="px-4 py-4">
+        <View className="mb-4 flex flex-col space-y-4">
+          <View>
+            <Text className="text-2xl font-bold mb-2">Queue</Text>
+            <View className="flex flex-col space-y-2">
+              {queue.map((q) => (
+                <TouchableOpacity
+                  onPress={() => router.push(`/(auth)/items/${q.item.Id}`)}
+                  className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
+                >
+                  <View>
+                    <Text className="font-semibold">{q.item.Name}</Text>
+                    <Text className="text-xs opacity-50">{q.item.Type}</Text>
+                  </View>
+                  <TouchableOpacity
+                    onPress={() => {
+                      setQueue((prev) => prev.filter((i) => i.id !== q.id));
+                    }}
+                  >
+                    <Ionicons name="close" size={24} color="red" />
+                  </TouchableOpacity>
+                </TouchableOpacity>
+              ))}
+            </View>
+
+            {queue.length === 0 && (
+              <Text className="opacity-50">No items in queue</Text>
+            )}
+          </View>
+
+          <View>
+            <Text className="text-2xl font-bold mb-2">Active download</Text>
+            {process?.item ? (
+              <TouchableOpacity
+                onPress={() => router.push(`/(auth)/items/${process.item.Id}`)}
+                className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
+              >
+                <View>
+                  <Text className="font-semibold">{process.item.Name}</Text>
+                  <Text className="text-xs opacity-50">
+                    {process.item.Type}
+                  </Text>
+                  <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
+                    <Text className="text-xs">
+                      {process.progress.toFixed(0)}%
+                    </Text>
+                    <Text className="text-xs">
+                      {process.speed?.toFixed(2)}x
+                    </Text>
+                    <View>
+                      <Text className="text-xs">ETA {eta}</Text>
+                    </View>
+                  </View>
+                </View>
+                <TouchableOpacity
+                  onPress={() => {
+                    FFmpegKit.cancel();
+                    setProcess(null);
+                  }}
+                >
+                  <Ionicons name="close" size={24} color="red" />
+                </TouchableOpacity>
+                <View
+                  className={`
+                  absolute bottom-0 left-0 h-1 bg-purple-600
+                `}
+                  style={{
+                    width: process.progress
+                      ? `${Math.max(5, process.progress)}%`
+                      : "5%",
+                  }}
+                ></View>
+              </TouchableOpacity>
+            ) : (
+              <Text className="opacity-50">No active downloads</Text>
+            )}
+          </View>
+        </View>
+        {movies.length > 0 && (
+          <View className="mb-4">
+            <View className="flex flex-row items-center justify-between mb-2">
+              <Text className="text-2xl font-bold">Movies</Text>
+              <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
+                <Text className="text-xs font-bold">{movies?.length}</Text>
+              </View>
+            </View>
+            {movies?.map((item: BaseItemDto) => (
+              <View className="mb-2 last:mb-0" key={item.Id}>
+                <MovieCard item={item} />
+              </View>
+            ))}
+          </View>
+        )}
+        {groupedBySeries?.map((items: BaseItemDto[], index: number) => (
+          <SeriesCard items={items} key={items[0].SeriesId} />
+        ))}
+      </View>
+    </ScrollView>
+  );
+};
+
+export default downloads;
+
+/*
+ * Format a number (Date.getTime) to a human readable string ex. 2m 34s
+ * @param {number} num - The number to format
+ *
+ * @returns {string} - The formatted string
+ */
+const formatNumber = (num: number) => {
+  const minutes = Math.floor(num / 60000);
+  const seconds = ((num % 60000) / 1000).toFixed(0);
+  return `${minutes}m ${seconds}s`;
+};

app/(auth)/items/[id].tsx

@@ -0,0 +1,303 @@
+import { AudioTrackSelector } from "@/components/AudioTrackSelector";
+import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
+import { DownloadItem } from "@/components/DownloadItem";
+import { Loader } from "@/components/Loader";
+import { OverviewText } from "@/components/OverviewText";
+import { PlayButton } from "@/components/PlayButton";
+import { PlayedStatus } from "@/components/PlayedStatus";
+import { Ratings } from "@/components/Ratings";
+import { SimilarItems } from "@/components/SimilarItems";
+import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
+import { Text } from "@/components/common/Text";
+import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
+import { CastAndCrew } from "@/components/series/CastAndCrew";
+import { CurrentSeries } from "@/components/series/CurrentSeries";
+import { NextEpisodeButton } from "@/components/series/NextEpisodeButton";
+import { SeriesTitleHeader } from "@/components/series/SeriesTitleHeader";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  currentlyPlayingItemAtom,
+  fullScreenAtom,
+  playingAtom,
+  showCurrentlyPlayingBarAtom,
+} from "@/utils/atoms/playState";
+import { useSettings } from "@/utils/atoms/settings";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import { chromecastProfile } from "@/utils/profiles/chromecast";
+import ios from "@/utils/profiles/ios";
+import native from "@/utils/profiles/native";
+import old from "@/utils/profiles/old";
+import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useLocalSearchParams } from "expo-router";
+import { useAtom } from "jotai";
+import { useCallback, useMemo, useState } from "react";
+import { View } from "react-native";
+import CastContext, {
+  PlayServicesState,
+  useCastDevice,
+  useRemoteMediaClient,
+} from "react-native-google-cast";
+import { ParallaxScrollView } from "../../../components/ParallaxPage";
+
+const page: React.FC = () => {
+  const local = useLocalSearchParams();
+  const { id } = local as { id: string };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const [settings] = useSettings();
+
+  const castDevice = useCastDevice();
+
+  const [, setCurrentlyPlying] = useAtom(currentlyPlayingItemAtom);
+  const [, setShowCurrentlyPlayingBar] = useAtom(showCurrentlyPlayingBarAtom);
+  const [, setPlaying] = useAtom(playingAtom);
+  const [, setFullscreen] = useAtom(fullScreenAtom);
+
+  const client = useRemoteMediaClient();
+  const chromecastReady = useMemo(() => !!castDevice?.deviceId, [castDevice]);
+  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
+  const [selectedSubtitleStream, setSelectedSubtitleStream] =
+    useState<number>(0);
+  const [maxBitrate, setMaxBitrate] = useState<Bitrate>({
+    key: "Max",
+    value: undefined,
+  });
+
+  const { data: item, isLoading: l1 } = useQuery({
+    queryKey: ["item", id],
+    queryFn: async () =>
+      await getUserItemData({
+        api,
+        userId: user?.Id,
+        itemId: id,
+      }),
+    enabled: !!id && !!api,
+    staleTime: 60,
+  });
+
+  const { data: sessionData } = useQuery({
+    queryKey: ["sessionData", item?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id || !item?.Id) return null;
+      const playbackData = await getMediaInfoApi(api!).getPlaybackInfo({
+        itemId: item?.Id,
+        userId: user?.Id,
+      });
+
+      return playbackData.data;
+    },
+    enabled: !!item?.Id && !!api && !!user?.Id,
+    staleTime: 0,
+  });
+
+  const { data: playbackUrl } = useQuery({
+    queryKey: [
+      "playbackUrl",
+      item?.Id,
+      maxBitrate,
+      castDevice,
+      selectedAudioStream,
+      selectedSubtitleStream,
+      settings,
+    ],
+    queryFn: async () => {
+      if (!api || !user?.Id || !sessionData) return null;
+
+      let deviceProfile: any = ios;
+
+      if (castDevice?.deviceId) {
+        deviceProfile = chromecastProfile;
+      } else if (settings?.deviceProfile === "Native") {
+        deviceProfile = native;
+      } else if (settings?.deviceProfile === "Old") {
+        deviceProfile = old;
+      }
+
+      const url = await getStreamUrl({
+        api,
+        userId: user.Id,
+        item,
+        startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
+        maxStreamingBitrate: maxBitrate.value,
+        sessionData,
+        deviceProfile,
+        audioStreamIndex: selectedAudioStream,
+        subtitleStreamIndex: selectedSubtitleStream,
+        forceDirectPlay: settings?.forceDirectPlay,
+      });
+
+      console.log("Transcode URL: ", url);
+
+      return url;
+    },
+    enabled: !!sessionData && !!api && !!user?.Id && !!item?.Id,
+    staleTime: 0,
+  });
+
+  const onPressPlay = useCallback(
+    async (type: "device" | "cast" = "device") => {
+      if (!playbackUrl || !item) return;
+
+      if (type === "cast" && client) {
+        await CastContext.getPlayServicesState().then((state) => {
+          if (state && state !== PlayServicesState.SUCCESS)
+            CastContext.showPlayServicesErrorDialog(state);
+          else {
+            client.loadMedia({
+              mediaInfo: {
+                contentUrl: playbackUrl,
+                contentType: "video/mp4",
+                metadata: {
+                  type: item.Type === "Episode" ? "tvShow" : "movie",
+                  title: item.Name || "",
+                  subtitle: item.Overview || "",
+                },
+              },
+              startTime: 0,
+            });
+          }
+        });
+      } else {
+        setCurrentlyPlying({
+          item,
+          playbackUrl,
+        });
+        setPlaying(true);
+        setShowCurrentlyPlayingBar(true);
+
+        if (settings?.openFullScreenVideoPlayerByDefault === true) {
+          setTimeout(() => {
+            setFullscreen(true);
+          }, 100);
+        }
+      }
+    },
+    [playbackUrl, item, settings]
+  );
+
+  const backdropUrl = useMemo(
+    () =>
+      getBackdropUrl({
+        api,
+        item,
+        quality: 90,
+        width: 1000,
+      }),
+    [item]
+  );
+
+  const logoUrl = useMemo(
+    () => (item?.Type === "Movie" ? getLogoImageUrlById({ api, item }) : null),
+    [item]
+  );
+
+  if (l1)
+    return (
+      <View className="justify-center items-center h-full">
+        <Loader />
+      </View>
+    );
+
+  if (!item?.Id || !backdropUrl) return null;
+
+  return (
+    <ParallaxScrollView
+      headerImage={
+        <Image
+          source={{
+            uri: backdropUrl,
+          }}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+      logo={
+        <>
+          {logoUrl ? (
+            <Image
+              source={{
+                uri: logoUrl,
+              }}
+              style={{
+                height: 130,
+                width: "100%",
+                resizeMode: "contain",
+              }}
+            />
+          ) : null}
+        </>
+      }
+    >
+      <View className="flex flex-col px-4 pt-4">
+        <View className="flex flex-col">
+          {item.Type === "Episode" ? (
+            <SeriesTitleHeader item={item} />
+          ) : (
+            <>
+              <MoviesTitleHeader item={item} />
+            </>
+          )}
+          <Text className="text-center opacity-50">{item?.ProductionYear}</Text>
+          <Ratings item={item} />
+        </View>
+
+        <View className="flex flex-row justify-between items-center mb-2">
+          {playbackUrl ? (
+            <DownloadItem item={item} playbackUrl={playbackUrl} />
+          ) : (
+            <View className="h-12 aspect-square flex items-center justify-center"></View>
+          )}
+          <PlayedStatus item={item} />
+        </View>
+
+        <OverviewText text={item.Overview} />
+      </View>
+      <View className="flex flex-col p-4 w-full">
+        <View className="flex flex-row items-center space-x-2 w-full">
+          <BitrateSelector
+            onChange={(val) => setMaxBitrate(val)}
+            selected={maxBitrate}
+          />
+          <AudioTrackSelector
+            item={item}
+            onChange={setSelectedAudioStream}
+            selected={selectedAudioStream}
+          />
+          <SubtitleTrackSelector
+            item={item}
+            onChange={setSelectedSubtitleStream}
+            selected={selectedSubtitleStream}
+          />
+        </View>
+        <View className="flex flex-row items-center justify-between w-full">
+          <NextEpisodeButton item={item} type="previous" className="mr-2" />
+          <PlayButton item={item} url={playbackUrl} className="grow" />
+          <NextEpisodeButton item={item} className="ml-2" />
+        </View>
+      </View>
+
+      <CastAndCrew item={item} />
+
+      {item.Type === "Episode" && (
+        <View className="mb-4">
+          <CurrentSeries item={item} />
+        </View>
+      )}
+
+      <SimilarItems itemId={item.Id} />
+
+      <View className="h-12"></View>
+    </ParallaxScrollView>
+  );
+};
+
+export default page;

app/(auth)/play-music.tsx

@@ -1,14 +0,0 @@
-import { FullScreenMusicPlayer } from "@/components/FullScreenMusicPlayer";
-import { StatusBar } from "expo-status-bar";
-import { View, ViewProps } from "react-native";
-
-interface Props extends ViewProps {}
-
-export default function page() {
-  return (
-    <View className="">
-      <StatusBar hidden={false} />
-      <FullScreenMusicPlayer />
-    </View>
-  );
-}

app/(auth)/play.tsx

@@ -1,48 +0,0 @@
-import { FullScreenVideoPlayer } from "@/components/FullScreenVideoPlayer";
-import { useSettings } from "@/utils/atoms/settings";
-import * as NavigationBar from "expo-navigation-bar";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { StatusBar } from "expo-status-bar";
-import { useEffect } from "react";
-import { Platform, View, ViewProps } from "react-native";
-
-interface Props extends ViewProps {}
-
-export default function page() {
-  const [settings] = useSettings();
-
-  useEffect(() => {
-    if (settings?.autoRotate) {
-      // Don't need to do anything
-    } else if (settings?.defaultVideoOrientation) {
-      ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
-    }
-
-    if (Platform.OS === "android") {
-      NavigationBar.setVisibilityAsync("hidden");
-      NavigationBar.setBehaviorAsync("overlay-swipe");
-    }
-
-    return () => {
-      if (settings?.autoRotate) {
-        ScreenOrientation.unlockAsync();
-      } else {
-        ScreenOrientation.lockAsync(
-          ScreenOrientation.OrientationLock.PORTRAIT_UP
-        );
-      }
-
-      if (Platform.OS === "android") {
-        NavigationBar.setVisibilityAsync("visible");
-        NavigationBar.setBehaviorAsync("inset-swipe");
-      }
-    };
-  }, [settings]);
-
-  return (
-    <View className="">
-      <StatusBar hidden />
-      <FullScreenVideoPlayer />
-    </View>
-  );
-}

app/(auth)/series/[id].tsx

@@ -10,7 +10,6 @@ import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
-import React from "react";
 import { useEffect, useMemo } from "react";
 import { View } from "react-native";
 
@@ -44,7 +43,7 @@ const page: React.FC = () => {
         quality: 90,
         width: 1000,
       }),
-    [item]
+    [item],
   );
 
   const logoUrl = useMemo(
@@ -53,14 +52,13 @@ const page: React.FC = () => {
         api,
         item,
       }),
-    [item]
+    [item],
   );
 
   if (!item || !backdropUrl) return null;
 
   return (
     <ParallaxScrollView
-      headerHeight={400}
       headerImage={
         <Image
           source={{
@@ -89,7 +87,7 @@ const page: React.FC = () => {
         </>
       }
     >
-      <View className="flex flex-col pt-4">
+      <View className="flex flex-col pt-4 pb-24">
         <View className="px-4 py-4">
           <Text className="text-3xl font-bold">{item?.Name}</Text>
           <Text className="">{item?.Overview}</Text>
@@ -97,7 +95,7 @@ const page: React.FC = () => {
         <View className="mb-4">
           <NextUp seriesId={seriesId} />
         </View>
-        <SeasonPicker item={item} initialSeasonIndex={Number(seasonIndex)} />
+        <SeasonPicker item={item} />
       </View>
     </ParallaxScrollView>
   );

app/(auth)/settings.tsx

@@ -0,0 +1,90 @@
+import { Button } from "@/components/Button";
+import { Text } from "@/components/common/Text";
+import { ListItem } from "@/components/ListItem";
+import { apiAtom, useJellyfin, userAtom } from "@/providers/JellyfinProvider";
+import { clearLogs, readFromLog } from "@/utils/log";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { ScrollView, View } from "react-native";
+import * as Haptics from "expo-haptics";
+import { useFiles } from "@/hooks/useFiles";
+import { SettingToggles } from "@/components/settings/SettingToggles";
+import { WebSocketsTest } from "@/components/settings/WebsocketsText";
+
+export default function settings() {
+  const { logout } = useJellyfin();
+  const { deleteAllFiles } = useFiles();
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data: logs } = useQuery({
+    queryKey: ["logs"],
+    queryFn: async () => readFromLog(),
+    refetchInterval: 1000,
+  });
+
+  return (
+    <ScrollView>
+      <View className="p-4 flex flex-col gap-y-4 pb-12">
+        <Text className="font-bold text-2xl">Information</Text>
+
+        <View className="flex flex-col rounded-xl mb-4 overflow-hidden border-neutral-800 divide-y-2 divide-solid divide-neutral-800 ">
+          <ListItem title="User" subTitle={user?.Name} />
+          <ListItem title="Server" subTitle={api?.basePath} />
+        </View>
+
+        <SettingToggles />
+
+        <View className="flex flex-col space-y-2">
+          <Button color="black" onPress={logout}>
+            Log out
+          </Button>
+          <Button
+            color="red"
+            onPress={async () => {
+              await deleteAllFiles();
+              Haptics.notificationAsync(
+                Haptics.NotificationFeedbackType.Success
+              );
+            }}
+          >
+            Delete all downloaded files
+          </Button>
+          <Button
+            color="red"
+            onPress={async () => {
+              await clearLogs();
+              Haptics.notificationAsync(
+                Haptics.NotificationFeedbackType.Success
+              );
+            }}
+          >
+            Delete all logs
+          </Button>
+        </View>
+
+        <Text className="font-bold text-2xl">Logs</Text>
+        <View className="flex flex-col space-y-2">
+          {logs?.map((log, index) => (
+            <View key={index} className="bg-neutral-900 rounded-xl p-3">
+              <Text
+                className={`
+                  mb-1
+              ${log.level === "INFO" && "text-blue-500"}
+              ${log.level === "ERROR" && "text-red-500"}
+                `}
+              >
+                {log.level}
+              </Text>
+              <Text className="text-xs">{log.message}</Text>
+            </View>
+          ))}
+          {logs?.length === 0 && (
+            <Text className="opacity-50">No logs available</Text>
+          )}
+        </View>
+      </View>
+    </ScrollView>
+  );
+}

app/(auth)/songs/[songId].tsx

@@ -0,0 +1,281 @@
+import { AudioTrackSelector } from "@/components/AudioTrackSelector";
+import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
+import { Chromecast } from "@/components/Chromecast";
+import { Text } from "@/components/common/Text";
+import {
+  currentlyPlayingItemAtom,
+  playingAtom,
+} from "@/components/CurrentlyPlayingBar";
+import { DownloadItem } from "@/components/DownloadItem";
+import { Loader } from "@/components/Loader";
+import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { PlayButton } from "@/components/PlayButton";
+import { NextEpisodeButton } from "@/components/series/NextEpisodeButton";
+import { SimilarItems } from "@/components/SimilarItems";
+import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import { chromecastProfile } from "@/utils/profiles/chromecast";
+import ios from "@/utils/profiles/ios";
+import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { ScrollView, View } from "react-native";
+import CastContext, {
+  PlayServicesState,
+  useCastDevice,
+  useRemoteMediaClient,
+} from "react-native-google-cast";
+
+const page: React.FC = () => {
+  const local = useLocalSearchParams();
+  const { songId: id } = local as { songId: string };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const [, setPlaying] = useAtom(playingAtom);
+
+  const castDevice = useCastDevice();
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => (
+        <View className="">
+          <Chromecast />
+        </View>
+      ),
+    });
+  });
+
+  const chromecastReady = useMemo(() => !!castDevice?.deviceId, [castDevice]);
+  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
+  const [selectedSubtitleStream, setSelectedSubtitleStream] =
+    useState<number>(0);
+  const [maxBitrate, setMaxBitrate] = useState<Bitrate>({
+    key: "Max",
+    value: undefined,
+  });
+
+  const { data: item, isLoading: l1 } = useQuery({
+    queryKey: ["item", id],
+    queryFn: async () =>
+      await getUserItemData({
+        api,
+        userId: user?.Id,
+        itemId: id,
+      }),
+    enabled: !!id && !!api,
+    staleTime: 60 * 1000,
+  });
+
+  const backdropUrl = useMemo(
+    () =>
+      getBackdropUrl({
+        api,
+        item,
+        quality: 90,
+        width: 1000,
+      }),
+    [item]
+  );
+
+  const logoUrl = useMemo(
+    () => (item?.Type === "Movie" ? getLogoImageUrlById({ api, item }) : null),
+    [item]
+  );
+
+  const { data: sessionData } = useQuery({
+    queryKey: ["sessionData", item?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id || !item?.Id) return null;
+      const playbackData = await getMediaInfoApi(api!).getPlaybackInfo({
+        itemId: item?.Id,
+        userId: user?.Id,
+      });
+
+      return playbackData.data;
+    },
+    enabled: !!item?.Id && !!api && !!user?.Id,
+    staleTime: 0,
+  });
+
+  const { data: playbackUrl } = useQuery({
+    queryKey: [
+      "playbackUrl",
+      item?.Id,
+      maxBitrate,
+      castDevice,
+      selectedAudioStream,
+      selectedSubtitleStream,
+    ],
+    queryFn: async () => {
+      if (!api || !user?.Id || !sessionData) return null;
+
+      const url = await getStreamUrl({
+        api,
+        userId: user.Id,
+        item,
+        startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
+        maxStreamingBitrate: maxBitrate.value,
+        sessionData,
+        deviceProfile: castDevice?.deviceId ? chromecastProfile : ios,
+        audioStreamIndex: selectedAudioStream,
+        subtitleStreamIndex: selectedSubtitleStream,
+      });
+
+      console.log("Transcode URL: ", url);
+
+      return url;
+    },
+    enabled: !!sessionData,
+    staleTime: 0,
+  });
+
+  const [, setCp] = useAtom(currentlyPlayingItemAtom);
+  const client = useRemoteMediaClient();
+
+  const onPressPlay = useCallback(
+    async (type: "device" | "cast" = "device") => {
+      if (!playbackUrl || !item) return;
+
+      if (type === "cast" && client) {
+        await CastContext.getPlayServicesState().then((state) => {
+          if (state && state !== PlayServicesState.SUCCESS)
+            CastContext.showPlayServicesErrorDialog(state);
+          else {
+            client.loadMedia({
+              mediaInfo: {
+                contentUrl: playbackUrl,
+                contentType: "video/mp4",
+                metadata: {
+                  type: item.Type === "Episode" ? "tvShow" : "movie",
+                  title: item.Name || "",
+                  subtitle: item.Overview || "",
+                },
+              },
+              startTime: 0,
+            });
+          }
+        });
+      } else {
+        setCp({
+          item,
+          playbackUrl,
+        });
+        setPlaying(true);
+      }
+    },
+    [playbackUrl, item]
+  );
+
+  if (l1)
+    return (
+      <View className="justify-center items-center h-full">
+        <Loader />
+      </View>
+    );
+
+  if (!item?.Id || !backdropUrl) return null;
+
+  return (
+    <ParallaxScrollView
+      headerImage={
+        <Image
+          source={{
+            uri: backdropUrl,
+          }}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+      logo={
+        <>
+          {logoUrl ? (
+            <Image
+              source={{
+                uri: logoUrl,
+              }}
+              style={{
+                height: 130,
+                width: "100%",
+                resizeMode: "contain",
+              }}
+            />
+          ) : null}
+        </>
+      }
+    >
+      <View className="flex flex-col px-4 pt-4">
+        <View className="flex flex-col">
+          <MoviesTitleHeader item={item} />
+          <Text className="text-center opacity-50">{item?.ProductionYear}</Text>
+        </View>
+
+        <View className="flex flex-row justify-between items-center w-full my-4">
+          {playbackUrl ? (
+            <DownloadItem item={item} playbackUrl={playbackUrl} />
+          ) : (
+            <View className="h-12 aspect-square flex items-center justify-center"></View>
+          )}
+        </View>
+      </View>
+      <View className="flex flex-col p-4 w-full">
+        <View className="flex flex-row items-center space-x-2 w-full">
+          <BitrateSelector
+            onChange={(val) => setMaxBitrate(val)}
+            selected={maxBitrate}
+          />
+          <AudioTrackSelector
+            item={item}
+            onChange={setSelectedAudioStream}
+            selected={selectedAudioStream}
+          />
+          <SubtitleTrackSelector
+            item={item}
+            onChange={setSelectedSubtitleStream}
+            selected={selectedSubtitleStream}
+          />
+        </View>
+        <View className="flex flex-row items-center justify-between w-full">
+          <NextEpisodeButton item={item} type="previous" className="mr-2" />
+          <PlayButton
+            item={item}
+            chromecastReady={chromecastReady}
+            onPress={onPressPlay}
+            className="grow"
+          />
+          <NextEpisodeButton item={item} className="ml-2" />
+        </View>
+      </View>
+      <ScrollView horizontal className="flex px-4 mb-4">
+        <View className="flex flex-row space-x-2 ">
+          <View className="flex flex-col">
+            <Text className="text-sm opacity-70">Audio</Text>
+          </View>
+          <View className="flex flex-col">
+            <Text className="text-sm opacity-70">
+              {item.MediaStreams?.find((i) => i.Type === "Audio")?.DisplayTitle}
+            </Text>
+          </View>
+        </View>
+      </ScrollView>
+
+      <SimilarItems itemId={item.Id} />
+
+      <View className="h-12"></View>
+    </ParallaxScrollView>
+  );
+};
+
+export default page;

app/_layout.tsx

@@ -1,215 +1,28 @@
-import { DownloadProvider } from "@/providers/DownloadProvider";
-import {
-  getOrSetDeviceId,
-  getTokenFromStoraage,
-  JellyfinProvider,
-} from "@/providers/JellyfinProvider";
+import { CurrentlyPlayingBar } from "@/components/CurrentlyPlayingBar";
+import { JellyfinProvider } from "@/providers/JellyfinProvider";
 import { JobQueueProvider } from "@/providers/JobQueueProvider";
 import { PlaybackProvider } from "@/providers/PlaybackProvider";
-import { orientationAtom } from "@/utils/atoms/orientation";
-import { Settings, useSettings } from "@/utils/atoms/settings";
-import { BACKGROUND_FETCH_TASK } from "@/utils/background-tasks";
-import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server";
+import { useSettings } from "@/utils/atoms/settings";
 import { ActionSheetProvider } from "@expo/react-native-action-sheet";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import {
-  checkForExistingDownloads,
-  completeHandler,
-  download,
-} from "@kesha-antonov/react-native-background-downloader";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import * as BackgroundFetch from "expo-background-fetch";
-import * as FileSystem from "expo-file-system";
 import { useFonts } from "expo-font";
 import { useKeepAwake } from "expo-keep-awake";
-import * as Linking from "expo-linking";
-import * as Notifications from "expo-notifications";
-import { router, Stack } from "expo-router";
+import { Stack } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import * as SplashScreen from "expo-splash-screen";
 import { StatusBar } from "expo-status-bar";
-import * as TaskManager from "expo-task-manager";
-import { Provider as JotaiProvider, useAtom } from "jotai";
+import { Provider as JotaiProvider } from "jotai";
 import { useEffect, useRef } from "react";
-import { AppState } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import "react-native-reanimated";
-import { Toaster } from "sonner-native";
 
+// Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
 
-Notifications.setNotificationHandler({
-  handleNotification: async () => ({
-    shouldShowAlert: true,
-    shouldPlaySound: true,
-    shouldSetBadge: false,
-  }),
-});
-
-function useNotificationObserver() {
-  useEffect(() => {
-    let isMounted = true;
-
-    function redirect(notification: Notifications.Notification) {
-      const url = notification.request.content.data?.url;
-      if (url) {
-        router.push(url);
-      }
-    }
-
-    Notifications.getLastNotificationResponseAsync().then((response) => {
-      if (!isMounted || !response?.notification) {
-        return;
-      }
-      redirect(response?.notification);
-    });
-
-    const subscription = Notifications.addNotificationResponseReceivedListener(
-      (response) => {
-        redirect(response.notification);
-      }
-    );
-
-    return () => {
-      isMounted = false;
-      subscription.remove();
-    };
-  }, []);
-}
-
-TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
-  console.log("TaskManager ~ trigger");
-
-  const now = Date.now();
-
-  const settingsData = await AsyncStorage.getItem("settings");
-
-  if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  const settings: Partial<Settings> = JSON.parse(settingsData);
-  const url = settings?.optimizedVersionsServerUrl;
-
-  if (!settings?.autoDownload || !url)
-    return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  const token = await getTokenFromStoraage();
-  const deviceId = await getOrSetDeviceId();
-  const baseDirectory = FileSystem.documentDirectory;
-
-  if (!token || !deviceId || !baseDirectory)
-    return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  console.log({
-    token,
-    url,
-    deviceId,
-  });
-
-  const jobs = await getAllJobsByDeviceId({
-    deviceId,
-    authHeader: token,
-    url,
-  });
-
-  console.log("TaskManager ~ Active jobs: ", jobs.length);
-
-  for (let job of jobs) {
-    if (job.status === "completed") {
-      const downloadUrl = url + "download/" + job.id;
-      console.log({
-        token,
-        deviceId,
-        baseDirectory,
-        url,
-        downloadUrl,
-      });
-
-      const tasks = await checkForExistingDownloads();
-
-      if (tasks.find((task) => task.id === job.id)) {
-        console.log("TaskManager ~ Download already in progress: ", job.id);
-        continue;
-      }
-
-      download({
-        id: job.id,
-        url: url + "download/" + job.id,
-        destination: `${baseDirectory}${job.item.Id}.mp4`,
-        headers: {
-          Authorization: token,
-        },
-      })
-        .begin(() => {
-          console.log("TaskManager ~ Download started: ", job.id);
-        })
-        .done(() => {
-          console.log("TaskManager ~ Download completed: ", job.id);
-          saveDownloadedItemInfo(job.item);
-          completeHandler(job.id);
-          cancelJobById({
-            authHeader: token,
-            id: job.id,
-            url: url,
-          });
-          Notifications.scheduleNotificationAsync({
-            content: {
-              title: job.item.Name,
-              body: "Download completed",
-              data: {
-                url: `/downloads`,
-              },
-            },
-            trigger: null,
-          });
-        })
-        .error((error) => {
-          console.log("TaskManager ~ Download error: ", job.id, error);
-          completeHandler(job.id);
-          Notifications.scheduleNotificationAsync({
-            content: {
-              title: job.item.Name,
-              body: "Download failed",
-              data: {
-                url: `/downloads`,
-              },
-            },
-            trigger: null,
-          });
-        });
-    }
-  }
-
-  console.log(`Auto download started: ${new Date(now).toISOString()}`);
-
-  // Be sure to return the successful result type!
-  return BackgroundFetch.BackgroundFetchResult.NewData;
-});
-
-const checkAndRequestPermissions = async () => {
-  try {
-    const hasAskedBefore = await AsyncStorage.getItem(
-      "hasAskedForNotificationPermission"
-    );
-
-    if (hasAskedBefore !== "true") {
-      const { status } = await Notifications.requestPermissionsAsync();
-
-      if (status === "granted") {
-        console.log("Notification permissions granted.");
-      } else {
-        console.log("Notification permissions denied.");
-      }
-
-      await AsyncStorage.setItem("hasAskedForNotificationPermission", "true");
-    } else {
-      console.log("Already asked for notification permissions before.");
-    }
-  } catch (error) {
-    console.error("Error checking/requesting notification permissions:", error);
-  }
+export const unstable_settings = {
+  initialRouteName: "/index",
 };
 
 export default function RootLayout() {
@@ -236,16 +49,14 @@ export default function RootLayout() {
 
 function Layout() {
   const [settings, updateSettings] = useSettings();
-  const [orientation, setOrientation] = useAtom(orientationAtom);
 
   useKeepAwake();
-  useNotificationObserver();
 
   const queryClientRef = useRef<QueryClient>(
     new QueryClient({
       defaultOptions: {
         queries: {
-          staleTime: 0,
+          staleTime: 60 * 1000,
           refetchOnMount: true,
           refetchOnReconnect: true,
           refetchOnWindowFocus: true,
@@ -255,10 +66,6 @@ function Layout() {
     })
   );
 
-  useEffect(() => {
-    checkAndRequestPermissions();
-  }, []);
-
   useEffect(() => {
     if (settings?.autoRotate === true)
       ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.DEFAULT);
@@ -268,135 +75,113 @@ function Layout() {
       );
   }, [settings]);
 
-  const appState = useRef(AppState.currentState);
-
-  useEffect(() => {
-    const subscription = AppState.addEventListener("change", (nextAppState) => {
-      if (
-        appState.current.match(/inactive|background/) &&
-        nextAppState === "active"
-      ) {
-        checkForExistingDownloads();
-      }
-    });
-
-    checkForExistingDownloads();
-
-    return () => {
-      subscription.remove();
-    };
-  }, []);
-
-  useEffect(() => {
-    const subscription = ScreenOrientation.addOrientationChangeListener(
-      (event) => {
-        setOrientation(event.orientationInfo.orientation);
-      }
-    );
-
-    ScreenOrientation.getOrientationAsync().then((initialOrientation) => {
-      setOrientation(initialOrientation);
-    });
-
-    return () => {
-      ScreenOrientation.removeOrientationChangeListener(subscription);
-    };
-  }, []);
-
-  const url = Linking.useURL();
-
-  if (url) {
-    const { hostname, path, queryParams } = Linking.parse(url);
-  }
-
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <QueryClientProvider client={queryClientRef.current}>
         <JobQueueProvider>
-          <DownloadProvider>
-            <ActionSheetProvider>
-              <BottomSheetModalProvider>
-                <JellyfinProvider>
-                  <PlaybackProvider>
-                    <StatusBar style="light" backgroundColor="#000" />
-                    <ThemeProvider value={DarkTheme}>
-                      <Stack
-                        initialRouteName="/home"
-                        screenOptions={{
-                          autoHideHomeIndicator: true,
+          <ActionSheetProvider>
+            <BottomSheetModalProvider>
+              <JellyfinProvider>
+                <PlaybackProvider>
+                  <StatusBar style="light" backgroundColor="#000" />
+                  <ThemeProvider value={DarkTheme}>
+                    <Stack initialRouteName="/home">
+                      <Stack.Screen
+                        name="(auth)/(tabs)"
+                        options={{
+                          headerShown: false,
+                          title: "",
                         }}
-                      >
-                        <Stack.Screen
-                          name="(auth)/(tabs)"
-                          options={{
-                            headerShown: false,
-                            title: "",
-                          }}
-                        />
-                        <Stack.Screen
-                          name="(auth)/play"
-                          options={{
-                            headerShown: false,
-                            title: "",
-                            animation: "fade",
-                          }}
-                        />
-                        <Stack.Screen
-                          name="(auth)/play-music"
-                          options={{
-                            headerShown: false,
-                            title: "",
-                            animation: "fade",
-                          }}
-                        />
-                        <Stack.Screen
-                          name="login"
-                          options={{ headerShown: false, title: "Login" }}
-                        />
-                        <Stack.Screen name="+not-found" />
-                      </Stack>
-                      <Toaster
-                        duration={4000}
-                        toastOptions={{
-                          style: {
-                            backgroundColor: "#262626",
-                            borderColor: "#363639",
-                            borderWidth: 1,
-                          },
-                          titleStyle: {
-                            color: "white",
-                          },
-                        }}
-                        closeButton
                       />
-                    </ThemeProvider>
-                  </PlaybackProvider>
-                </JellyfinProvider>
-              </BottomSheetModalProvider>
-            </ActionSheetProvider>
-          </DownloadProvider>
+                      <Stack.Screen
+                        name="(auth)/settings"
+                        options={{
+                          headerShown: true,
+                          title: "Settings",
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/downloads"
+                        options={{
+                          headerShown: true,
+                          title: "Downloads",
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/items/[id]"
+                        options={{
+                          title: "",
+                          headerShown: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/collections/[collectionId]"
+                        options={{
+                          title: "",
+                          headerShown: true,
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/artists/page"
+                        options={{
+                          title: "",
+                          headerShown: true,
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/artists/[artistId]/page"
+                        options={{
+                          title: "",
+                          headerShown: true,
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/albums/[albumId]"
+                        options={{
+                          title: "",
+                          headerShown: true,
+                          headerStyle: { backgroundColor: "black" },
+                          headerShadowVisible: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/songs/[songId]"
+                        options={{
+                          title: "",
+                          headerShown: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="(auth)/series/[id]"
+                        options={{
+                          title: "",
+                          headerShown: false,
+                        }}
+                      />
+                      <Stack.Screen
+                        name="login"
+                        options={{ headerShown: false, title: "Login" }}
+                      />
+                      <Stack.Screen name="+not-found" />
+                    </Stack>
+                    <CurrentlyPlayingBar />
+                  </ThemeProvider>
+                </PlaybackProvider>
+              </JellyfinProvider>
+            </BottomSheetModalProvider>
+          </ActionSheetProvider>
         </JobQueueProvider>
       </QueryClientProvider>
     </GestureHandlerRootView>
   );
 }
-
-async function saveDownloadedItemInfo(item: BaseItemDto) {
-  try {
-    const downloadedItems = await AsyncStorage.getItem("downloadedItems");
-    let items: BaseItemDto[] = downloadedItems
-      ? JSON.parse(downloadedItems)
-      : [];
-
-    const existingItemIndex = items.findIndex((i) => i.Id === item.Id);
-    if (existingItemIndex !== -1) {
-      items[existingItemIndex] = item;
-    } else {
-      items.push(item);
-    }
-
-    await AsyncStorage.setItem("downloadedItems", JSON.stringify(items));
-  } catch (error) {
-    console.error("Failed to save downloaded item information:", error);
-  }
-}

app/login.tsx

@@ -3,11 +3,9 @@ import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
 import { Ionicons } from "@expo/vector-icons";
-import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
-import { getSystemApi } from "@jellyfin/sdk/lib/utils/api";
-import { useLocalSearchParams } from "expo-router";
+import { AxiosError } from "axios";
 import { useAtom } from "jotai";
-import React, { useEffect, useState } from "react";
+import React, { useMemo, useState } from "react";
 import {
   Alert,
   KeyboardAvoidingView,
@@ -23,47 +21,19 @@ const CredentialsSchema = z.object({
 });
 
 const Login: React.FC = () => {
-  const { setServer, login, removeServer, initiateQuickConnect } =
-    useJellyfin();
+  const { setServer, login, removeServer } = useJellyfin();
   const [api] = useAtom(apiAtom);
-  const params = useLocalSearchParams();
 
-  const {
-    apiUrl: _apiUrl,
-    username: _username,
-    password: _password,
-  } = params as { apiUrl: string; username: string; password: string };
-
-  const [serverURL, setServerURL] = useState<string>(_apiUrl);
-  const [serverName, setServerName] = useState<string>("");
+  const [serverURL, setServerURL] = useState<string>("");
   const [error, setError] = useState<string>("");
   const [credentials, setCredentials] = useState<{
     username: string;
     password: string;
   }>({
-    username: _username,
-    password: _password,
+    username: "",
+    password: "",
   });
 
-  useEffect(() => {
-    (async () => {
-      // we might re-use the checkUrl function here to check the url as well
-      // however, I don't think it should be necessary for now
-      if (_apiUrl) {
-        setServer({
-          address: _apiUrl,
-        });
-
-        setTimeout(() => {
-          if (_username && _password) {
-            setCredentials({ username: _username, password: _password });
-            login(_username, _password);
-          }
-        }, 300);
-      }
-    })();
-  }, [_apiUrl, _username, _password]);
-
   const [loading, setLoading] = useState<boolean>(false);
 
   const handleLogin = async () => {
@@ -84,108 +54,12 @@ const Login: React.FC = () => {
     }
   };
 
-  const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
-
-  /**
-   * Checks the availability and validity of a Jellyfin server URL.
-   *
-   * This function attempts to connect to a Jellyfin server using the provided URL.
-   * It tries both HTTPS and HTTP protocols, with a timeout to handle long 404 responses.
-   *
-   * @param {string} url - The base URL of the Jellyfin server to check.
-   * @returns {Promise<string | undefined>} A Promise that resolves to:
-   *   - The full URL (including protocol) if a valid Jellyfin server is found.
-   *   - undefined if no valid server is found at the given URL.
-   *
-   * Side effects:
-   * - Sets loadingServerCheck state to true at the beginning and false at the end.
-   * - Logs errors and timeout information to the console.
-   */
-  async function checkUrl(url: string) {
-    url = url.endsWith("/") ? url.slice(0, -1) : url;
-    setLoadingServerCheck(true);
-
-    const protocols = ["https://", "http://"];
-    const timeout = 2000; // 2 seconds timeout for long 404 responses
-
-    try {
-      for (const protocol of protocols) {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-
-        try {
-          const response = await fetch(`${protocol}${url}/System/Info/Public`, {
-            mode: "cors",
-            signal: controller.signal,
-          });
-          clearTimeout(timeoutId);
-          if (response.ok) {
-            const data = (await response.json()) as PublicSystemInfo;
-            setServerName(data.ServerName || "");
-            return `${protocol}${url}`;
-          }
-        } catch (e) {
-          const error = e as Error;
-          if (error.name === "AbortError") {
-            console.log(`Request to ${protocol}${url} timed out`);
-          } else {
-            console.error(`Error checking ${protocol}${url}:`, error);
-          }
-        }
-      }
-      return undefined;
-    } finally {
-      setLoadingServerCheck(false);
-    }
-  }
-
-  /**
-   * Handles the connection attempt to a Jellyfin server.
-   *
-   * This function trims the input URL, checks its validity using the `checkUrl` function,
-   * and sets the server address if a valid connection is established.
-   *
-   * @param {string} url - The URL of the Jellyfin server to connect to.
-   *
-   * @returns {Promise<void>}
-   *
-   * Side effects:
-   * - Calls `checkUrl` to validate the server URL.
-   * - Shows an alert if the connection fails.
-   * - Sets the server address using `setServer` if the connection is successful.
-   *
-   */
-  const handleConnect = async (url: string) => {
-    url = url.trim();
-
-    const result = await checkUrl(
-      url.startsWith("http") ? new URL(url).host : url
-    );
-
-    if (result === undefined) {
-      Alert.alert(
-        "Connection failed",
-        "Could not connect to the server. Please check the URL and your network connection."
-      );
+  const handleConnect = (url: string) => {
+    if (!url.startsWith("http")) {
+      Alert.alert("Error", "URL needs to start with http or https.");
       return;
     }
-
-    setServer({ address: result });
-  };
-
-  const handleQuickConnect = async () => {
-    try {
-      const code = await initiateQuickConnect();
-      if (code) {
-        Alert.alert("Quick Connect", `Enter code ${code} to login`, [
-          {
-            text: "Got It",
-          },
-        ]);
-      }
-    } catch (error) {
-      Alert.alert("Error", "Failed to initiate Quick Connect");
-    }
+    setServer({ address: url.trim() });
   };
 
   if (api?.basePath) {
@@ -199,9 +73,7 @@ const Login: React.FC = () => {
             <View></View>
             <View>
               <View className="mb-4">
-                <Text className="text-3xl font-bold mb-1">
-                  {serverName || "Streamyfin"}
-                </Text>
+                <Text className="text-3xl font-bold mb-2">Streamyfin</Text>
                 <Text className="text-neutral-500 mb-2">
                   Server: {api.basePath}
                 </Text>
@@ -209,6 +81,7 @@ const Login: React.FC = () => {
                   color="black"
                   onPress={() => {
                     removeServer();
+                    setServerURL("");
                   }}
                   justify="between"
                   iconLeft={
@@ -225,6 +98,9 @@ const Login: React.FC = () => {
 
               <View className="flex flex-col space-y-2">
                 <Text className="text-2xl font-bold">Log in</Text>
+                <Text className="text-neutral-500">
+                  Log in to any user account
+                </Text>
                 <Input
                   placeholder="Username"
                   onChangeText={(text) =>
@@ -261,18 +137,13 @@ const Login: React.FC = () => {
               <Text className="text-red-600 mb-2">{error}</Text>
             </View>
 
-            <View className="mt-auto mb-2">
-              <Button
-                color="black"
-                onPress={handleQuickConnect}
-                className="mb-2"
-              >
-                Use Quick Connect
-              </Button>
-              <Button onPress={handleLogin} loading={loading}>
-                Log in
-              </Button>
-            </View>
+            <Button
+              onPress={handleLogin}
+              loading={loading}
+              className="mt-auto mb-2"
+            >
+              Log in
+            </Button>
           </View>
         </KeyboardAvoidingView>
       </SafeAreaView>
@@ -302,13 +173,11 @@ const Login: React.FC = () => {
               textContentType="URL"
               maxLength={500}
             />
+            <Text className="opacity-30">
+              Server URL requires http or https
+            </Text>
           </View>
-          <Button
-            loading={loadingServerCheck}
-            disabled={loadingServerCheck}
-            onPress={async () => await handleConnect(serverURL)}
-            className="mb-2"
-          >
+          <Button onPress={() => handleConnect(serverURL)} className="mb-2">
             Connect
           </Button>
         </View>

components/AudioTrackSelector.tsx

@@ -2,72 +2,52 @@ import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { atom, useAtom } from "jotai";
-import {
-  BaseItemDto,
-  MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useEffect, useMemo } from "react";
 import { MediaStream } from "@jellyfin/sdk/lib/generated-client/models";
 import { tc } from "@/utils/textTools";
-import { useSettings } from "@/utils/atoms/settings";
 
 interface Props extends React.ComponentProps<typeof View> {
-  source: MediaSourceInfo;
+  item: BaseItemDto;
   onChange: (value: number) => void;
   selected: number;
 }
 
 export const AudioTrackSelector: React.FC<Props> = ({
-  source,
+  item,
   onChange,
   selected,
   ...props
 }) => {
-  const [settings] = useSettings();
-
   const audioStreams = useMemo(
-    () => source.MediaStreams?.filter((x) => x.Type === "Audio"),
-    [source]
+    () =>
+      item.MediaSources?.[0].MediaStreams?.filter((x) => x.Type === "Audio"),
+    [item],
   );
 
   const selectedAudioSteam = useMemo(
     () => audioStreams?.find((x) => x.Index === selected),
-    [audioStreams, selected]
+    [audioStreams, selected],
   );
 
   useEffect(() => {
-    const defaultAudioIndex = audioStreams?.find(
-      (x) => x.Language === settings?.defaultAudioLanguage
-    )?.Index;
-    if (defaultAudioIndex !== undefined && defaultAudioIndex !== null) {
-      onChange(defaultAudioIndex);
-      return;
-    }
-    const index = source.DefaultAudioStreamIndex;
-    if (index !== undefined && index !== null) {
-      onChange(index);
-      return;
-    }
-
-    onChange(0);
-  }, [audioStreams, settings]);
+    const index = item.MediaSources?.[0].DefaultAudioStreamIndex;
+    if (index !== undefined && index !== null) onChange(index);
+  }, []);
 
   return (
-    <View
-      className="flex shrink"
-      style={{
-        minWidth: 50,
-      }}
-    >
+    <View className="flex flex-row items-center justify-between" {...props}>
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">Audio</Text>
-            <TouchableOpacity className="bg-neutral-900  h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
-              <Text className="" numberOfLines={1}>
-                {selectedAudioSteam?.DisplayTitle}
-              </Text>
-            </TouchableOpacity>
+          <View className="flex flex-col mb-2">
+            <Text className="opacity-50 mb-1 text-xs">Audio streams</Text>
+            <View className="flex flex-row">
+              <TouchableOpacity className="bg-neutral-900 max-w-32 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
+                <Text className="">
+                  {tc(selectedAudioSteam?.DisplayTitle, 13)}
+                </Text>
+              </TouchableOpacity>
+            </View>
           </View>
         </DropdownMenu.Trigger>
         <DropdownMenu.Content

components/BitrateSelector.tsx

@@ -1,12 +1,11 @@
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
-import { useMemo } from "react";
+import { atom, useAtom } from "jotai";
 
 export type Bitrate = {
   key: string;
   value: number | undefined;
-  height?: number;
 };
 
 const BITRATES: Bitrate[] = [
@@ -17,84 +16,63 @@ const BITRATES: Bitrate[] = [
   {
     key: "8 Mb/s",
     value: 8000000,
-    height: 1080,
   },
   {
     key: "4 Mb/s",
     value: 4000000,
-    height: 1080,
   },
   {
     key: "2 Mb/s",
     value: 2000000,
-    height: 720,
   },
   {
     key: "500 Kb/s",
     value: 500000,
-    height: 480,
   },
   {
     key: "250 Kb/s",
     value: 250000,
-    height: 480,
   },
 ];
 
 interface Props extends React.ComponentProps<typeof View> {
   onChange: (value: Bitrate) => void;
   selected: Bitrate;
-  inverted?: boolean;
 }
 
 export const BitrateSelector: React.FC<Props> = ({
   onChange,
   selected,
-  inverted,
   ...props
 }) => {
-  const sorted = useMemo(() => {
-    if (inverted)
-      return BITRATES.sort(
-        (a, b) => (a.value || Infinity) - (b.value || Infinity)
-      );
-    return BITRATES.sort(
-      (a, b) => (b.value || Infinity) - (a.value || Infinity)
-    );
-  }, []);
-
   return (
-    <View
-      className="flex shrink"
-      style={{
-        minWidth: 60,
-        maxWidth: 200,
-      }}
-    >
+    <View className="flex flex-row items-center justify-between" {...props}>
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">Quality</Text>
-            <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
-              <Text style={{}} className="" numberOfLines={1}>
-                {BITRATES.find((b) => b.value === selected.value)?.key}
-              </Text>
-            </TouchableOpacity>
+          <View className="flex flex-col mb-2">
+            <Text className="opacity-50 mb-1 text-xs">Bitrate</Text>
+            <View className="flex flex-row">
+              <TouchableOpacity className="bg-neutral-900 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
+                <Text>
+                  {BITRATES.find((b) => b.value === selected.value)?.key}
+                </Text>
+              </TouchableOpacity>
+            </View>
           </View>
         </DropdownMenu.Trigger>
         <DropdownMenu.Content
-          loop={false}
+          loop={true}
           side="bottom"
-          align="center"
+          align="start"
           alignOffset={0}
           avoidCollisions={true}
-          collisionPadding={0}
-          sideOffset={0}
+          collisionPadding={8}
+          sideOffset={8}
         >
           <DropdownMenu.Label>Bitrates</DropdownMenu.Label>
-          {sorted.map((b) => (
+          {BITRATES?.map((b, index: number) => (
             <DropdownMenu.Item
-              key={b.key}
+              key={index.toString()}
               onSelect={() => {
                 onChange(b);
               }}

components/Button.tsx

@@ -10,7 +10,7 @@ interface ButtonProps extends React.ComponentProps<typeof TouchableOpacity> {
   disabled?: boolean;
   children?: string | ReactNode;
   loading?: boolean;
-  color?: "purple" | "red" | "black" | "transparent";
+  color?: "purple" | "red" | "black";
   iconRight?: ReactNode;
   iconLeft?: ReactNode;
   justify?: "center" | "between";
@@ -37,8 +37,6 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
         return "bg-red-600";
       case "black":
         return "bg-neutral-900 border border-neutral-800";
-      case "transparent":
-        return "bg-transparent";
     }
   }, [color]);
 

components/Chromecast.tsx

@@ -1,33 +1,25 @@
-import { Feather } from "@expo/vector-icons";
-import { BlurView } from "expo-blur";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import React, { useEffect } from "react";
-import { Platform, TouchableOpacity, ViewProps } from "react-native";
-import GoogleCast, {
-  CastContext,
+import { View } from "react-native";
+import {
+  CastButton,
   useCastDevice,
   useDevices,
-  useMediaStatus,
   useRemoteMediaClient,
 } from "react-native-google-cast";
+import GoogleCast from "react-native-google-cast";
 
-interface Props extends ViewProps {
+type Props = {
   width?: number;
   height?: number;
-  background?: "blur" | "transparent";
-}
+};
 
-export const Chromecast: React.FC<Props> = ({
-  width = 48,
-  height = 48,
-  background = "transparent",
-  ...props
-}) => {
+export const Chromecast: React.FC<Props> = ({ width = 48, height = 48 }) => {
   const client = useRemoteMediaClient();
   const castDevice = useCastDevice();
   const devices = useDevices();
   const sessionManager = GoogleCast.getSessionManager();
   const discoveryManager = GoogleCast.getDiscoveryManager();
-  const mediaStatus = useMediaStatus();
 
   useEffect(() => {
     (async () => {
@@ -39,49 +31,9 @@ export const Chromecast: React.FC<Props> = ({
     })();
   }, [client, devices, castDevice, sessionManager, discoveryManager]);
 
-  if (background === "transparent")
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
-          else CastContext.showCastDialog();
-        }}
-        className="rounded-full h-10 w-10 flex items-center justify-center b"
-        {...props}
-      >
-        <Feather name="cast" size={22} color={"white"} />
-      </TouchableOpacity>
-    );
-
-  if (Platform.OS === "android")
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
-          else CastContext.showCastDialog();
-        }}
-        className="rounded-full h-10 w-10 flex items-center justify-center bg-neutral-800/80"
-        {...props}
-      >
-        <Feather name="cast" size={22} color={"white"} />
-      </TouchableOpacity>
-    );
-
   return (
-    <TouchableOpacity
-      onPress={() => {
-        if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
-        else CastContext.showCastDialog();
-      }}
-      {...props}
-    >
-      <BlurView
-        intensity={100}
-        className="rounded-full overflow-hidden h-10 aspect-square flex items-center justify-center"
-        {...props}
-      >
-        <Feather name="cast" size={22} color={"white"} />
-      </BlurView>
-    </TouchableOpacity>
+    <View className="rounded h-10 aspect-square flex items-center justify-center">
+      <CastButton style={{ tintColor: "white", height, width }} />
+    </View>
   );
 };

components/ContinueWatchingPoster.tsx

@@ -5,42 +5,27 @@ import { useAtom } from "jotai";
 import { useMemo, useState } from "react";
 import { View } from "react-native";
 import { WatchedIndicator } from "./WatchedIndicator";
-import React from "react";
+import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 
 type ContinueWatchingPosterProps = {
   item: BaseItemDto;
-  useEpisodePoster?: boolean;
-  size?: "small" | "normal";
 };
 
 const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
   item,
-  useEpisodePoster = false,
-  size = "normal",
 }) => {
   const [api] = useAtom(apiAtom);
 
-  /**
-   * Get horrizontal poster for movie and episode, with failover to primary.
-   */
-  const url = useMemo(() => {
-    if (!api) return;
-    if (item.Type === "Episode" && useEpisodePoster) {
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
-    }
-    if (item.Type === "Episode") {
-      if (item.ParentBackdropItemId && item.ParentThumbImageTag)
-        return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
-      else
-        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
-    }
-    if (item.Type === "Movie") {
-      if (item.ImageTags?.["Thumb"])
-        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.["Thumb"]}`;
-      else
-        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
-    }
-  }, [item]);
+  const url = useMemo(
+    () =>
+      getPrimaryImageUrl({
+        api,
+        item,
+        quality: 90,
+        width: 176 * 2,
+      }),
+    [item]
+  );
 
   const [progress, setProgress] = useState(
     item.UserData?.PlayedPercentage || 0
@@ -48,16 +33,11 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
 
   if (!url)
     return (
-      <View className="aspect-video border border-neutral-800 w-44"></View>
+      <View className="w-44 aspect-video border border-neutral-800"></View>
     );
 
   return (
-    <View
-      className={`
-      relative w-44 aspect-video rounded-lg overflow-hidden border border-neutral-800
-      ${size === "small" ? "w-32" : "w-44"}
-    `}
-    >
+    <View className="w-44 relative aspect-video rounded-lg overflow-hidden border border-neutral-800">
       <Image
         key={item.Id}
         id={item.Id}
@@ -72,7 +52,10 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
       {progress > 0 && (
         <>
           <View
-            className={`absolute w-100 bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full`}
+            style={{
+              width: `100%`,
+            }}
+            className={`absolute bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full`}
           ></View>
           <View
             style={{

components/CurrentlyPlayingBar.tsx

@@ -0,0 +1,274 @@
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { usePlayback } from "@/providers/PlaybackProvider";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
+import { writeToLog } from "@/utils/log";
+import { Ionicons } from "@expo/vector-icons";
+import { BlurView } from "expo-blur";
+import { useRouter, useSegments } from "expo-router";
+import { useAtom } from "jotai";
+import { useEffect, useMemo } from "react";
+import { Alert, Platform, TouchableOpacity, View } from "react-native";
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from "react-native-reanimated";
+import Video from "react-native-video";
+import { Text } from "./common/Text";
+import { Loader } from "./Loader";
+
+export const CurrentlyPlayingBar: React.FC = () => {
+  const segments = useSegments();
+  const {
+    currentlyPlaying,
+    pauseVideo,
+    playVideo,
+    setCurrentlyPlayingState,
+    stopPlayback,
+    setIsPlaying,
+    isPlaying,
+    videoRef,
+    onProgress,
+  } = usePlayback();
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const aBottom = useSharedValue(0);
+  const aPadding = useSharedValue(0);
+  const aHeight = useSharedValue(100);
+  const router = useRouter();
+  const animatedOuterStyle = useAnimatedStyle(() => {
+    return {
+      bottom: withTiming(aBottom.value, { duration: 500 }),
+      height: withTiming(aHeight.value, { duration: 500 }),
+      padding: withTiming(aPadding.value, { duration: 500 }),
+    };
+  });
+
+  const aPaddingBottom = useSharedValue(30);
+  const aPaddingInner = useSharedValue(12);
+  const aBorderRadiusBottom = useSharedValue(12);
+  const animatedInnerStyle = useAnimatedStyle(() => {
+    return {
+      padding: withTiming(aPaddingInner.value, { duration: 500 }),
+      paddingBottom: withTiming(aPaddingBottom.value, { duration: 500 }),
+      borderBottomLeftRadius: withTiming(aBorderRadiusBottom.value, {
+        duration: 500,
+      }),
+      borderBottomRightRadius: withTiming(aBorderRadiusBottom.value, {
+        duration: 500,
+      }),
+    };
+  });
+
+  useEffect(() => {
+    if (segments.find((s) => s.includes("tabs"))) {
+      // Tab screen - i.e. home
+      aBottom.value = Platform.OS === "ios" ? 78 : 50;
+      aHeight.value = 80;
+      aPadding.value = 8;
+      aPaddingBottom.value = 8;
+      aPaddingInner.value = 8;
+    } else {
+      // Inside a normal screen
+      aBottom.value = Platform.OS === "ios" ? 0 : 0;
+      aHeight.value = Platform.OS === "ios" ? 110 : 80;
+      aPadding.value = Platform.OS === "ios" ? 0 : 8;
+      aPaddingInner.value = Platform.OS === "ios" ? 12 : 8;
+      aPaddingBottom.value = Platform.OS === "ios" ? 40 : 12;
+    }
+  }, [segments]);
+
+  const startPosition = useMemo(
+    () =>
+      currentlyPlaying?.item?.UserData?.PlaybackPositionTicks
+        ? Math.round(
+            currentlyPlaying?.item.UserData.PlaybackPositionTicks / 10000
+          )
+        : 0,
+    [currentlyPlaying?.item]
+  );
+
+  const backdropUrl = useMemo(
+    () =>
+      getBackdropUrl({
+        api,
+        item: currentlyPlaying?.item,
+        quality: 70,
+        width: 200,
+      }),
+    [currentlyPlaying?.item, api]
+  );
+
+  if (!api || !currentlyPlaying) return null;
+
+  return (
+    <Animated.View
+      style={[animatedOuterStyle]}
+      className="absolute left-0 w-screen"
+    >
+      <BlurView
+        intensity={Platform.OS === "android" ? 60 : 100}
+        experimentalBlurMethod={Platform.OS === "android" ? "none" : undefined}
+        className={`h-full w-full rounded-xl overflow-hidden ${
+          Platform.OS === "android" && "bg-black"
+        }`}
+      >
+        <Animated.View
+          style={[
+            { padding: 8, borderTopLeftRadius: 12, borderTopEndRadius: 12 },
+            animatedInnerStyle,
+          ]}
+          className="h-full w-full  flex flex-row items-center justify-between overflow-hidden"
+        >
+          <View className="flex flex-row items-center space-x-4 shrink">
+            <TouchableOpacity
+              onPress={() => {
+                videoRef.current?.presentFullscreenPlayer();
+              }}
+              className={`relative h-full bg-neutral-800 rounded-md overflow-hidden
+                ${
+                  currentlyPlaying.item?.Type === "Audio"
+                    ? "aspect-square"
+                    : "aspect-video"
+                }
+                `}
+            >
+              {currentlyPlaying?.url && (
+                <Video
+                  ref={videoRef}
+                  allowsExternalPlayback
+                  style={{ width: "100%", height: "100%" }}
+                  playWhenInactive={true}
+                  playInBackground={true}
+                  showNotificationControls={true}
+                  ignoreSilentSwitch="ignore"
+                  controls={false}
+                  pictureInPicture={true}
+                  poster={
+                    backdropUrl && currentlyPlaying.item?.Type === "Audio"
+                      ? backdropUrl
+                      : undefined
+                  }
+                  debug={{
+                    enable: true,
+                    thread: true,
+                  }}
+                  paused={!isPlaying}
+                  onProgress={(e) => onProgress(e)}
+                  subtitleStyle={{
+                    fontSize: 16,
+                  }}
+                  source={{
+                    uri: currentlyPlaying.url,
+                    isNetwork: true,
+                    startPosition,
+                    headers: getAuthHeaders(api),
+                  }}
+                  onBuffer={(e) =>
+                    e.isBuffering ? console.log("Buffering...") : null
+                  }
+                  onFullscreenPlayerDidDismiss={() => {}}
+                  onFullscreenPlayerDidPresent={() => {}}
+                  onPlaybackStateChanged={(e) => {
+                    if (e.isPlaying) {
+                      setIsPlaying(true);
+                    } else if (e.isSeeking) {
+                      return;
+                    } else {
+                      setIsPlaying(false);
+                    }
+                  }}
+                  progressUpdateInterval={2000}
+                  onError={(e) => {
+                    console.log(e);
+                    writeToLog(
+                      "ERROR",
+                      "Video playback error: " + JSON.stringify(e)
+                    );
+                    Alert.alert("Error", "Cannot play this video file.");
+                    setIsPlaying(false);
+                    // setCurrentlyPlaying(null);
+                  }}
+                  renderLoader={
+                    currentlyPlaying.item?.Type !== "Audio" && (
+                      <View className="flex flex-col items-center justify-center h-full">
+                        <Loader />
+                      </View>
+                    )
+                  }
+                />
+              )}
+            </TouchableOpacity>
+            <View className="shrink text-xs">
+              <TouchableOpacity
+                onPress={() => {
+                  if (currentlyPlaying.item?.Type === "Audio")
+                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
+                  else router.push(`/items/${currentlyPlaying.item?.Id}`);
+                }}
+              >
+                <Text>{currentlyPlaying.item?.Name}</Text>
+              </TouchableOpacity>
+              {currentlyPlaying.item?.Type === "Episode" && (
+                <TouchableOpacity
+                  onPress={() => {
+                    router.push(
+                      `/(auth)/series/${currentlyPlaying.item.SeriesId}`
+                    );
+                  }}
+                  className="text-xs opacity-50"
+                >
+                  <Text>{currentlyPlaying.item.SeriesName}</Text>
+                </TouchableOpacity>
+              )}
+              {currentlyPlaying.item?.Type === "Movie" && (
+                <View>
+                  <Text className="text-xs opacity-50">
+                    {currentlyPlaying.item?.ProductionYear}
+                  </Text>
+                </View>
+              )}
+              {currentlyPlaying.item?.Type === "Audio" && (
+                <TouchableOpacity
+                  onPress={() => {
+                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
+                  }}
+                >
+                  <Text className="text-xs opacity-50">
+                    {currentlyPlaying.item?.Album}
+                  </Text>
+                </TouchableOpacity>
+              )}
+            </View>
+          </View>
+          <View className="flex flex-row items-center space-x-2">
+            <TouchableOpacity
+              onPress={() => {
+                if (isPlaying) pauseVideo();
+                else playVideo();
+              }}
+              className="aspect-square rounded flex flex-col items-center justify-center p-2"
+            >
+              {isPlaying ? (
+                <Ionicons name="pause" size={24} color="white" />
+              ) : (
+                <Ionicons name="play" size={24} color="white" />
+              )}
+            </TouchableOpacity>
+            <TouchableOpacity
+              onPress={() => {
+                stopPlayback();
+              }}
+              className="aspect-square rounded flex flex-col items-center justify-center p-2"
+            >
+              <Ionicons name="close" size={24} color="white" />
+            </TouchableOpacity>
+          </View>
+        </Animated.View>
+      </BlurView>
+    </Animated.View>
+  );
+};

components/DownloadItem.tsx

@@ -1,214 +1,77 @@
 import { useRemuxHlsToMp4 } from "@/hooks/useRemuxHlsToMp4";
-import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { runningProcesses } from "@/utils/atoms/downloads";
 import { queueActions, queueAtom } from "@/utils/atoms/queue";
-import { useSettings } from "@/utils/atoms/settings";
-import ios from "@/utils/profiles/ios";
-import native from "@/utils/profiles/native";
-import old from "@/utils/profiles/old";
+import { getPlaybackInfo } from "@/utils/jellyfin/media/getPlaybackInfo";
 import Ionicons from "@expo/vector-icons/Ionicons";
-import {
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import {
-  BaseItemDto,
-  MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { useQuery } from "@tanstack/react-query";
 import { router } from "expo-router";
 import { useAtom } from "jotai";
-import { useCallback, useMemo, useRef, useState } from "react";
-import { Alert, TouchableOpacity, View, ViewProps } from "react-native";
-import { AudioTrackSelector } from "./AudioTrackSelector";
-import { Bitrate, BitrateSelector } from "./BitrateSelector";
-import { Button } from "./Button";
-import { Text } from "./common/Text";
+import { TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";
-import { MediaSourceSelector } from "./MediaSourceSelector";
 import ProgressCircle from "./ProgressCircle";
-import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
-import { toast } from "sonner-native";
 
-interface DownloadProps extends ViewProps {
+type DownloadProps = {
   item: BaseItemDto;
-}
+  playbackUrl: string;
+};
 
-export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
+export const DownloadItem: React.FC<DownloadProps> = ({
+  item,
+  playbackUrl,
+}) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
+  const [process] = useAtom(runningProcesses);
   const [queue, setQueue] = useAtom(queueAtom);
-  const [settings] = useSettings();
-  const { processes, startBackgroundDownload } = useDownload();
-  const { startRemuxing, cancelRemuxing } = useRemuxHlsToMp4(item);
 
-  const [selectedMediaSource, setSelectedMediaSource] =
-    useState<MediaSourceInfo | null>(null);
-  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
-  const [selectedSubtitleStream, setSelectedSubtitleStream] =
-    useState<number>(0);
-  const [maxBitrate, setMaxBitrate] = useState<Bitrate>({
-    key: "Max",
-    value: undefined,
+  const { startRemuxing } = useRemuxHlsToMp4(playbackUrl, item);
+
+  const { data: playbackInfo, isLoading } = useQuery({
+    queryKey: ["playbackInfo", item.Id],
+    queryFn: async () => getPlaybackInfo(api, item.Id, user?.Id),
   });
 
-  const userCanDownload = useMemo(() => {
-    return user?.Policy?.EnableContentDownloading;
-  }, [user]);
+  const { data: downloaded, isLoading: isLoadingDownloaded } = useQuery({
+    queryKey: ["downloaded", item.Id],
+    queryFn: async () => {
+      if (!item.Id) return false;
 
-  /**
-   * Bottom sheet
-   */
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const handlePresentModalPress = useCallback(() => {
-    bottomSheetModalRef.current?.present();
-  }, []);
-
-  const handleSheetChanges = useCallback((index: number) => {}, []);
-
-  const closeModal = useCallback(() => {
-    bottomSheetModalRef.current?.dismiss();
-  }, []);
-
-  /**
-   * Start download
-   */
-  const initiateDownload = useCallback(async () => {
-    if (!api || !user?.Id || !item.Id || !selectedMediaSource?.Id) {
-      throw new Error(
-        "DownloadItem ~ initiateDownload: No api or user or item"
+      const data: BaseItemDto[] = JSON.parse(
+        (await AsyncStorage.getItem("downloaded_files")) || "[]"
       );
-    }
 
-    let deviceProfile: any = ios;
+      return data.some((d) => d.Id === item.Id);
+    },
+    enabled: !!item.Id,
+  });
 
-    if (settings?.deviceProfile === "Native") {
-      deviceProfile = native;
-    } else if (settings?.deviceProfile === "Old") {
-      deviceProfile = old;
-    }
-
-    const response = await api.axiosInstance.post(
-      `${api.basePath}/Items/${item.Id}/PlaybackInfo`,
-      {
-        DeviceProfile: deviceProfile,
-        UserId: user.Id,
-        MaxStreamingBitrate: maxBitrate.value,
-        StartTimeTicks: 0,
-        EnableTranscoding: maxBitrate.value ? true : undefined,
-        AutoOpenLiveStream: true,
-        AllowVideoStreamCopy: maxBitrate.value ? false : true,
-        MediaSourceId: selectedMediaSource?.Id,
-        AudioStreamIndex: selectedAudioStream,
-        SubtitleStreamIndex: selectedSubtitleStream,
-      },
-      {
-        headers: {
-          Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
-        },
-      }
+  if (isLoading || isLoadingDownloaded) {
+    return (
+      <View className="rounded h-10 aspect-square flex items-center justify-center">
+        <Loader />
+      </View>
     );
+  }
 
-    let url: string | undefined = undefined;
-    let fileExtension: string | undefined | null = "mp4";
-
-    const mediaSource: MediaSourceInfo = response.data.MediaSources.find(
-      (source: MediaSourceInfo) => source.Id === selectedMediaSource?.Id
+  if (playbackInfo?.MediaSources?.[0].SupportsDirectPlay === false) {
+    return (
+      <View className="rounded h-10 aspect-square flex items-center justify-center opacity-50">
+        <Ionicons name="cloud-download-outline" size={24} color="white" />
+      </View>
     );
+  }
 
-    if (!mediaSource) {
-      throw new Error("No media source");
-    }
-
-    if (mediaSource.SupportsDirectPlay) {
-      if (item.MediaType === "Video") {
-        url = `${api.basePath}/Videos/${item.Id}/stream.mp4?mediaSourceId=${item.Id}&static=true&mediaSourceId=${mediaSource.Id}&deviceId=${api.deviceInfo.id}&api_key=${api.accessToken}`;
-      } else if (item.MediaType === "Audio") {
-        console.log("Using direct stream for audio!");
-        const searchParams = new URLSearchParams({
-          UserId: user.Id,
-          DeviceId: api.deviceInfo.id,
-          MaxStreamingBitrate: "140000000",
-          Container:
-            "opus,webm|opus,mp3,aac,m4a|aac,m4b|aac,flac,webma,webm|webma,wav,ogg",
-          TranscodingContainer: "mp4",
-          TranscodingProtocol: "hls",
-          AudioCodec: "aac",
-          api_key: api.accessToken,
-          StartTimeTicks: "0",
-          EnableRedirection: "true",
-          EnableRemoteMedia: "false",
-        });
-        url = `${api.basePath}/Audio/${
-          item.Id
-        }/universal?${searchParams.toString()}`;
-      }
-    } else if (mediaSource.TranscodingUrl) {
-      url = `${api.basePath}${mediaSource.TranscodingUrl}`;
-      fileExtension = mediaSource.TranscodingContainer;
-    }
-
-    if (!url) throw new Error("No url");
-    if (!fileExtension) throw new Error("No file extension");
-
-    if (settings?.downloadMethod === "optimized") {
-      return await startBackgroundDownload(url, item, fileExtension);
-    } else {
-      return await startRemuxing(url);
-    }
-  }, [
-    api,
-    item,
-    startBackgroundDownload,
-    user?.Id,
-    selectedMediaSource,
-    selectedAudioStream,
-    selectedSubtitleStream,
-    maxBitrate,
-    settings?.downloadMethod,
-  ]);
-
-  /**
-   * Check if item is downloaded
-   */
-  const { downloadedFiles } = useDownload();
-
-  const isDownloaded = useMemo(() => {
-    if (!downloadedFiles) return false;
-
-    return downloadedFiles.some((file) => file.Id === item.Id);
-  }, [downloadedFiles, item.Id]);
-
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-      />
-    ),
-    []
-  );
-
-  const process = useMemo(() => {
-    if (!processes) return null;
-
-    return processes.find((process) => process?.item?.Id === item.Id);
-  }, [processes, item.Id]);
-
-  return (
-    <View
-      className="bg-neutral-800/80 rounded-full h-10 w-10 flex items-center justify-center"
-      {...props}
-    >
-      {process && process?.item.Id === item.Id ? (
-        <TouchableOpacity
-          onPress={() => {
-            router.push("/downloads");
-          }}
-        >
+  if (process && process?.item.Id === item.Id) {
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          router.push("/downloads");
+        }}
+      >
+        <View className="rounded h-10 aspect-square flex items-center justify-center">
           {process.progress === 0 ? (
             <Loader />
           ) : (
@@ -222,108 +85,54 @@ export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
               />
             </View>
           )}
-        </TouchableOpacity>
-      ) : queue.some((i) => i.id === item.Id) ? (
-        <TouchableOpacity
-          onPress={() => {
-            router.push("/downloads");
-          }}
-        >
-          <Ionicons name="hourglass" size={24} color="white" />
-        </TouchableOpacity>
-      ) : isDownloaded ? (
-        <TouchableOpacity
-          onPress={() => {
-            router.push("/downloads");
-          }}
-        >
-          <Ionicons name="cloud-download" size={26} color="#9333ea" />
-        </TouchableOpacity>
-      ) : (
-        <TouchableOpacity onPress={handlePresentModalPress}>
-          <Ionicons name="cloud-download-outline" size={24} color="white" />
-        </TouchableOpacity>
-      )}
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
+        </View>
+      </TouchableOpacity>
+    );
+  }
+
+  if (queue.some((i) => i.id === item.Id)) {
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          router.push("/downloads");
         }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        onChange={handleSheetChanges}
-        backdropComponent={renderBackdrop}
       >
-        <BottomSheetView>
-          <View className="flex flex-col space-y-4 px-4 pb-8 pt-2">
-            <Text className="font-bold text-2xl text-neutral-10">
-              Download options
-            </Text>
-            <View className="flex flex-col space-y-2 w-full items-start">
-              <BitrateSelector
-                inverted
-                onChange={(val) => setMaxBitrate(val)}
-                selected={maxBitrate}
-              />
-              <MediaSourceSelector
-                item={item}
-                onChange={setSelectedMediaSource}
-                selected={selectedMediaSource}
-              />
-              {selectedMediaSource && (
-                <View className="flex flex-col space-y-2">
-                  <AudioTrackSelector
-                    source={selectedMediaSource}
-                    onChange={setSelectedAudioStream}
-                    selected={selectedAudioStream}
-                  />
-                  <SubtitleTrackSelector
-                    source={selectedMediaSource}
-                    onChange={setSelectedSubtitleStream}
-                    selected={selectedSubtitleStream}
-                  />
-                </View>
-              )}
-            </View>
-            <Button
-              className="mt-auto"
-              onPress={() => {
-                if (userCanDownload === true) {
-                  if (!item.Id) {
-                    throw new Error("No item id");
-                  }
-                  closeModal();
-                  if (settings?.downloadMethod === "remux") {
-                    queueActions.enqueue(queue, setQueue, {
-                      id: item.Id,
-                      execute: async () => {
-                        await initiateDownload();
-                      },
-                      item,
-                    });
-                  } else {
-                    initiateDownload();
-                  }
-                } else {
-                  toast.error("You are not allowed to download files.");
-                }
-              }}
-              color="purple"
-            >
-              Download
-            </Button>
-            <View className="opacity-70 text-center w-full flex items-center">
-              {settings?.downloadMethod === "optimized" ? (
-                <Text className="text-xs">Using optimized server</Text>
-              ) : (
-                <Text className="text-xs">Using default method</Text>
-              )}
-            </View>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </View>
-  );
+        <View className="rounded h-10 aspect-square flex items-center justify-center opacity-50">
+          <Ionicons name="hourglass" size={24} color="white" />
+        </View>
+      </TouchableOpacity>
+    );
+  }
+
+  if (downloaded) {
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          router.push("/downloads");
+        }}
+      >
+        <View className="rounded h-10 aspect-square flex items-center justify-center">
+          <Ionicons name="cloud-download" size={26} color="#9333ea" />
+        </View>
+      </TouchableOpacity>
+    );
+  } else {
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          queueActions.enqueue(queue, setQueue, {
+            id: item.Id!,
+            execute: async () => {
+              await startRemuxing();
+            },
+            item,
+          });
+        }}
+      >
+        <View className="rounded h-10 aspect-square flex items-center justify-center">
+          <Ionicons name="cloud-download-outline" size={26} color="white" />
+        </View>
+      </TouchableOpacity>
+    );
+  }
 };

components/FullScreenMusicPlayer.tsx

@@ -1,544 +0,0 @@
-import { useAdjacentEpisodes } from "@/hooks/useAdjacentEpisodes";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
-import { useTrickplay } from "@/hooks/useTrickplay";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { usePlayback } from "@/providers/PlaybackProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
-import { writeToLog } from "@/utils/log";
-import orientationToOrientationLock from "@/utils/OrientationLockConverter";
-import { secondsToTicks } from "@/utils/secondsToTicks";
-import { formatTimeString, ticksToSeconds } from "@/utils/time";
-import { Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
-import { useRouter, useSegments } from "expo-router";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import {
-  Alert,
-  BackHandler,
-  Dimensions,
-  Pressable,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { Slider } from "react-native-awesome-slider";
-import {
-  runOnJS,
-  useAnimatedReaction,
-  useSharedValue,
-} from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import Video, { OnProgressData } from "react-native-video";
-import { Text } from "./common/Text";
-import { itemRouter } from "./common/TouchableItemRouter";
-import { Loader } from "./Loader";
-
-const windowDimensions = Dimensions.get("window");
-const screenDimensions = Dimensions.get("screen");
-
-export const FullScreenMusicPlayer: React.FC = () => {
-  const {
-    currentlyPlaying,
-    pauseVideo,
-    playVideo,
-    stopPlayback,
-    setIsPlaying,
-    isPlaying,
-    videoRef,
-    onProgress,
-    setIsBuffering,
-  } = usePlayback();
-
-  const [settings] = useSettings();
-  const [api] = useAtom(apiAtom);
-  const router = useRouter();
-  const segments = useSegments();
-  const insets = useSafeAreaInsets();
-
-  const { previousItem, nextItem } = useAdjacentEpisodes({ currentlyPlaying });
-
-  const [showControls, setShowControls] = useState(true);
-  const [isBuffering, setIsBufferingState] = useState(true);
-
-  // Seconds
-  const [currentTime, setCurrentTime] = useState(0);
-  const [remainingTime, setRemainingTime] = useState(0);
-
-  const isSeeking = useSharedValue(false);
-
-  const cacheProgress = useSharedValue(0);
-  const progress = useSharedValue(0);
-  const min = useSharedValue(0);
-  const max = useSharedValue(currentlyPlaying?.item.RunTimeTicks || 0);
-
-  const [dimensions, setDimensions] = useState({
-    window: windowDimensions,
-    screen: screenDimensions,
-  });
-
-  useEffect(() => {
-    const subscription = Dimensions.addEventListener(
-      "change",
-      ({ window, screen }) => {
-        setDimensions({ window, screen });
-      }
-    );
-    return () => subscription?.remove();
-  });
-
-  const from = useMemo(() => segments[2], [segments]);
-
-  const updateTimes = useCallback(
-    (currentProgress: number, maxValue: number) => {
-      const current = ticksToSeconds(currentProgress);
-      const remaining = ticksToSeconds(maxValue - current);
-
-      setCurrentTime(current);
-      setRemainingTime(remaining);
-    },
-    []
-  );
-
-  const { showSkipButton, skipIntro } = useIntroSkipper(
-    currentlyPlaying?.item.Id,
-    currentTime,
-    videoRef
-  );
-
-  const { showSkipCreditButton, skipCredit } = useCreditSkipper(
-    currentlyPlaying?.item.Id,
-    currentTime,
-    videoRef
-  );
-
-  useAnimatedReaction(
-    () => ({
-      progress: progress.value,
-      max: max.value,
-      isSeeking: isSeeking.value,
-    }),
-    (result) => {
-      if (result.isSeeking === false) {
-        runOnJS(updateTimes)(result.progress, result.max);
-      }
-    },
-    [updateTimes]
-  );
-
-  useEffect(() => {
-    const backAction = () => {
-      if (currentlyPlaying) {
-        Alert.alert("Hold on!", "Are you sure you want to exit?", [
-          {
-            text: "Cancel",
-            onPress: () => null,
-            style: "cancel",
-          },
-          {
-            text: "Yes",
-            onPress: () => {
-              stopPlayback();
-              router.back();
-            },
-          },
-        ]);
-        return true;
-      }
-      return false;
-    };
-
-    const backHandler = BackHandler.addEventListener(
-      "hardwareBackPress",
-      backAction
-    );
-
-    return () => backHandler.remove();
-  }, [currentlyPlaying, stopPlayback, router]);
-
-  const poster = useMemo(() => {
-    if (!currentlyPlaying?.item || !api) return "";
-    return currentlyPlaying.item.Type === "Audio"
-      ? `${api.basePath}/Items/${currentlyPlaying.item.AlbumId}/Images/Primary?tag=${currentlyPlaying.item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
-      : getBackdropUrl({
-          api,
-          item: currentlyPlaying.item,
-          quality: 70,
-          width: 200,
-        });
-  }, [currentlyPlaying?.item, api]);
-
-  const videoSource = useMemo(() => {
-    if (!api || !currentlyPlaying || !poster) return null;
-    const startPosition = currentlyPlaying.item?.UserData?.PlaybackPositionTicks
-      ? Math.round(currentlyPlaying.item.UserData.PlaybackPositionTicks / 10000)
-      : 0;
-    return {
-      uri: currentlyPlaying.url,
-      isNetwork: true,
-      startPosition,
-      headers: getAuthHeaders(api),
-      metadata: {
-        artist: currentlyPlaying.item?.AlbumArtist ?? undefined,
-        title: currentlyPlaying.item?.Name || "Unknown",
-        description: currentlyPlaying.item?.Overview ?? undefined,
-        imageUri: poster,
-        subtitle: currentlyPlaying.item?.Album ?? undefined,
-      },
-    };
-  }, [currentlyPlaying, api, poster]);
-
-  useEffect(() => {
-    if (currentlyPlaying) {
-      progress.value =
-        currentlyPlaying.item?.UserData?.PlaybackPositionTicks || 0;
-      max.value = currentlyPlaying.item.RunTimeTicks || 0;
-      setShowControls(true);
-      playVideo();
-    }
-  }, [currentlyPlaying]);
-
-  const toggleControls = () => setShowControls(!showControls);
-
-  const handleVideoProgress = useCallback(
-    (data: OnProgressData) => {
-      if (isSeeking.value === true) return;
-      progress.value = secondsToTicks(data.currentTime);
-      cacheProgress.value = secondsToTicks(data.playableDuration);
-      setIsBufferingState(data.playableDuration === 0);
-      setIsBuffering(data.playableDuration === 0);
-      onProgress(data);
-    },
-    [onProgress, setIsBuffering, isSeeking]
-  );
-
-  const handleVideoError = useCallback(
-    (e: any) => {
-      console.log(e);
-      writeToLog("ERROR", "Video playback error: " + JSON.stringify(e));
-      Alert.alert("Error", "Cannot play this video file.");
-      setIsPlaying(false);
-    },
-    [setIsPlaying]
-  );
-
-  const handlePlayPause = useCallback(() => {
-    if (isPlaying) pauseVideo();
-    else playVideo();
-  }, [isPlaying, pauseVideo, playVideo]);
-
-  const handleSliderComplete = (value: number) => {
-    progress.value = value;
-    isSeeking.value = false;
-    videoRef.current?.seek(value / 10000000);
-  };
-
-  const handleSliderChange = (value: number) => {};
-
-  const handleSliderStart = useCallback(() => {
-    if (showControls === false) return;
-    isSeeking.value = true;
-  }, []);
-
-  const handleSkipBackward = useCallback(async () => {
-    if (!settings) return;
-    try {
-      const curr = await videoRef.current?.getCurrentPosition();
-      if (curr !== undefined) {
-        videoRef.current?.seek(Math.max(0, curr - settings.rewindSkipTime));
-      }
-    } catch (error) {
-      writeToLog("ERROR", "Error seeking video backwards", error);
-    }
-  }, [settings]);
-
-  const handleSkipForward = useCallback(async () => {
-    if (!settings) return;
-    try {
-      const curr = await videoRef.current?.getCurrentPosition();
-      if (curr !== undefined) {
-        videoRef.current?.seek(Math.max(0, curr + settings.forwardSkipTime));
-      }
-    } catch (error) {
-      writeToLog("ERROR", "Error seeking video forwards", error);
-    }
-  }, [settings]);
-
-  const handleGoToPreviousItem = useCallback(() => {
-    if (!previousItem || !from) return;
-    const url = itemRouter(previousItem, from);
-    stopPlayback();
-    // @ts-ignore
-    router.push(url);
-  }, [previousItem, from, stopPlayback, router]);
-
-  const handleGoToNextItem = useCallback(() => {
-    if (!nextItem || !from) return;
-    const url = itemRouter(nextItem, from);
-    stopPlayback();
-    // @ts-ignore
-    router.push(url);
-  }, [nextItem, from, stopPlayback, router]);
-
-  if (!currentlyPlaying) return null;
-
-  return (
-    <View
-      style={{
-        width: dimensions.window.width,
-        height: dimensions.window.height,
-        backgroundColor: "black",
-      }}
-    >
-      <Pressable
-        onPress={toggleControls}
-        style={[
-          {
-            position: "absolute",
-            top: 0,
-            bottom: 0,
-            left: insets.left,
-            right: insets.right,
-            width: dimensions.window.width - (insets.left + insets.right),
-          },
-        ]}
-      >
-        {videoSource && (
-          <>
-            <Video
-              ref={videoRef}
-              source={videoSource}
-              style={{ width: "100%", height: "100%" }}
-              resizeMode={"contain"}
-              onProgress={handleVideoProgress}
-              onLoad={(data) => (max.value = secondsToTicks(data.duration))}
-              onError={handleVideoError}
-              playWhenInactive={true}
-              allowsExternalPlayback={true}
-              playInBackground={true}
-              pictureInPicture={true}
-              showNotificationControls={true}
-              ignoreSilentSwitch="ignore"
-              fullscreen={false}
-            />
-          </>
-        )}
-      </Pressable>
-
-      <View pointerEvents="none" className="p-4">
-        <Image
-          source={poster ? { uri: poster } : undefined}
-          style={{
-            width: "100%",
-            height: "100%",
-            resizeMode: "contain",
-          }}
-        />
-      </View>
-
-      {(showControls || isBuffering) && (
-        <View
-          pointerEvents="none"
-          style={[
-            {
-              top: 0,
-              left: 0,
-              position: "absolute",
-              width: dimensions.window.width,
-              height: dimensions.window.height,
-            },
-          ]}
-          className="  bg-black/50 z-0"
-        ></View>
-      )}
-
-      {isBuffering && (
-        <View
-          pointerEvents="none"
-          className="fixed top-0 left-0 w-screen h-screen flex flex-col items-center justify-center"
-        >
-          <Loader />
-        </View>
-      )}
-
-      {showSkipButton && (
-        <View
-          style={[
-            {
-              position: "absolute",
-              bottom: insets.bottom + 70,
-              right: insets.right + 16,
-              height: 70,
-            },
-          ]}
-          className="z-10"
-        >
-          <TouchableOpacity
-            onPress={skipIntro}
-            className="bg-purple-600 rounded-full px-2.5 py-2 font-semibold"
-          >
-            <Text className="text-white">Skip Intro</Text>
-          </TouchableOpacity>
-        </View>
-      )}
-
-      {showSkipCreditButton && (
-        <View
-          style={[
-            {
-              position: "absolute",
-              bottom: insets.bottom + 70,
-              right: insets.right + 16,
-              height: 70,
-            },
-          ]}
-          className="z-10"
-        >
-          <TouchableOpacity
-            onPress={skipCredit}
-            className="bg-purple-600 rounded-full px-2.5 py-2 font-semibold"
-          >
-            <Text className="text-white">Skip Credits</Text>
-          </TouchableOpacity>
-        </View>
-      )}
-
-      {showControls && (
-        <>
-          <View
-            style={[
-              {
-                position: "absolute",
-                top: insets.top,
-                right: insets.right + 16,
-                height: 70,
-                zIndex: 10,
-              },
-            ]}
-            className="flex flex-row items-center space-x-2 z-10"
-          >
-            <TouchableOpacity
-              onPress={() => {
-                stopPlayback();
-                router.back();
-              }}
-              className="aspect-square flex flex-col bg-neutral-800 rounded-xl items-center justify-center p-2"
-            >
-              <Ionicons name="close" size={24} color="white" />
-            </TouchableOpacity>
-          </View>
-
-          <View
-            style={[
-              {
-                position: "absolute",
-                bottom: insets.bottom + 8,
-                left: insets.left + 16,
-                width:
-                  dimensions.window.width - insets.left - insets.right - 32,
-              },
-            ]}
-          >
-            <View className="shrink flex flex-col justify-center h-full mb-2">
-              <Text className="font-bold">{currentlyPlaying.item?.Name}</Text>
-              {currentlyPlaying.item?.Type === "Episode" && (
-                <Text className="opacity-50">
-                  {currentlyPlaying.item.SeriesName}
-                </Text>
-              )}
-              {currentlyPlaying.item?.Type === "Movie" && (
-                <Text className="text-xs opacity-50">
-                  {currentlyPlaying.item?.ProductionYear}
-                </Text>
-              )}
-              {currentlyPlaying.item?.Type === "Audio" && (
-                <Text className="text-xs opacity-50">
-                  {currentlyPlaying.item?.Album}
-                </Text>
-              )}
-            </View>
-            <View
-              className={`flex ${"flex-col-reverse py-4 px-4 rounded-2xl"} 
-          items-center  bg-neutral-800`}
-            >
-              <View className="flex flex-row items-center space-x-4">
-                <TouchableOpacity
-                  style={{
-                    opacity: !previousItem ? 0.5 : 1,
-                  }}
-                  onPress={handleGoToPreviousItem}
-                >
-                  <Ionicons name="play-skip-back" size={24} color="white" />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handleSkipBackward}>
-                  <Ionicons
-                    name="refresh-outline"
-                    size={26}
-                    color="white"
-                    style={{
-                      transform: [{ scaleY: -1 }, { rotate: "180deg" }],
-                    }}
-                  />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handlePlayPause}>
-                  <Ionicons
-                    name={isPlaying ? "pause" : "play"}
-                    size={30}
-                    color="white"
-                  />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handleSkipForward}>
-                  <Ionicons name="refresh-outline" size={26} color="white" />
-                </TouchableOpacity>
-                <TouchableOpacity
-                  style={{
-                    opacity: !nextItem ? 0.5 : 1,
-                  }}
-                  onPress={handleGoToNextItem}
-                >
-                  <Ionicons name="play-skip-forward" size={24} color="white" />
-                </TouchableOpacity>
-              </View>
-              <View
-                className={`flex flex-col w-full shrink
-              ${""}
-            `}
-              >
-                <Slider
-                  theme={{
-                    maximumTrackTintColor: "rgba(255,255,255,0.2)",
-                    minimumTrackTintColor: "#fff",
-                    cacheTrackTintColor: "rgba(255,255,255,0.3)",
-                  }}
-                  cache={cacheProgress}
-                  onSlidingStart={handleSliderStart}
-                  onSlidingComplete={handleSliderComplete}
-                  onValueChange={handleSliderChange}
-                  containerStyle={{
-                    borderRadius: 100,
-                  }}
-                  sliderHeight={10}
-                  progress={progress}
-                  thumbWidth={0}
-                  minimumValue={min}
-                  maximumValue={max}
-                />
-                <View className="flex flex-row items-center justify-between mt-0.5">
-                  <Text className="text-[12px] text-neutral-400">
-                    {formatTimeString(currentTime)}
-                  </Text>
-                  <Text className="text-[12px] text-neutral-400">
-                    -{formatTimeString(remainingTime)}
-                  </Text>
-                </View>
-              </View>
-            </View>
-          </View>
-        </>
-      )}
-    </View>
-  );
-};

components/FullScreenVideoPlayer.tsx

@@ -1,625 +0,0 @@
-import { useAdjacentEpisodes } from "@/hooks/useAdjacentEpisodes";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
-import { useTrickplay } from "@/hooks/useTrickplay";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { usePlayback } from "@/providers/PlaybackProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
-import { writeToLog } from "@/utils/log";
-import orientationToOrientationLock from "@/utils/OrientationLockConverter";
-import { secondsToTicks } from "@/utils/secondsToTicks";
-import { formatTimeString, ticksToSeconds } from "@/utils/time";
-import { Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
-import { useRouter, useSegments } from "expo-router";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import {
-  Alert,
-  BackHandler,
-  Dimensions,
-  Pressable,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { Slider } from "react-native-awesome-slider";
-import {
-  runOnJS,
-  useAnimatedReaction,
-  useSharedValue,
-} from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import Video, { OnProgressData } from "react-native-video";
-import { Text } from "./common/Text";
-import { itemRouter } from "./common/TouchableItemRouter";
-import { Loader } from "./Loader";
-
-const windowDimensions = Dimensions.get("window");
-const screenDimensions = Dimensions.get("screen");
-
-export const FullScreenVideoPlayer: React.FC = () => {
-  const {
-    currentlyPlaying,
-    pauseVideo,
-    playVideo,
-    stopPlayback,
-    setIsPlaying,
-    isPlaying,
-    videoRef,
-    onProgress,
-    setIsBuffering,
-  } = usePlayback();
-
-  const [settings] = useSettings();
-  const [api] = useAtom(apiAtom);
-  const router = useRouter();
-  const segments = useSegments();
-  const insets = useSafeAreaInsets();
-
-  const { previousItem, nextItem } = useAdjacentEpisodes({ currentlyPlaying });
-  const { trickPlayUrl, calculateTrickplayUrl, trickplayInfo } =
-    useTrickplay(currentlyPlaying);
-
-  const [showControls, setShowControls] = useState(true);
-  const [isBuffering, setIsBufferingState] = useState(true);
-  const [ignoreSafeArea, setIgnoreSafeArea] = useState(false);
-  const [orientation, setOrientation] = useState(
-    ScreenOrientation.OrientationLock.UNKNOWN
-  );
-
-  // Seconds
-  const [currentTime, setCurrentTime] = useState(0);
-  const [remainingTime, setRemainingTime] = useState(0);
-
-  const isSeeking = useSharedValue(false);
-
-  const cacheProgress = useSharedValue(0);
-  const progress = useSharedValue(0);
-  const min = useSharedValue(0);
-  const max = useSharedValue(currentlyPlaying?.item.RunTimeTicks || 0);
-
-  const [dimensions, setDimensions] = useState({
-    window: windowDimensions,
-    screen: screenDimensions,
-  });
-
-  useEffect(() => {
-    const dimensionsSubscription = Dimensions.addEventListener(
-      "change",
-      ({ window, screen }) => {
-        setDimensions({ window, screen });
-      }
-    );
-
-    const orientationSubscription =
-      ScreenOrientation.addOrientationChangeListener((event) => {
-        setOrientation(
-          orientationToOrientationLock(event.orientationInfo.orientation)
-        );
-      });
-
-    ScreenOrientation.getOrientationAsync().then((orientation) => {
-      setOrientation(orientationToOrientationLock(orientation));
-    });
-
-    return () => {
-      dimensionsSubscription.remove();
-      orientationSubscription.remove();
-    };
-  }, []);
-
-  const from = useMemo(() => segments[2], [segments]);
-
-  const updateTimes = useCallback(
-    (currentProgress: number, maxValue: number) => {
-      const current = ticksToSeconds(currentProgress);
-      const remaining = ticksToSeconds(maxValue - current);
-
-      setCurrentTime(current);
-      setRemainingTime(remaining);
-    },
-    []
-  );
-
-  const { showSkipButton, skipIntro } = useIntroSkipper(
-    currentlyPlaying?.item.Id,
-    currentTime,
-    videoRef
-  );
-
-  const { showSkipCreditButton, skipCredit } = useCreditSkipper(
-    currentlyPlaying?.item.Id,
-    currentTime,
-    videoRef
-  );
-
-  useAnimatedReaction(
-    () => ({
-      progress: progress.value,
-      max: max.value,
-      isSeeking: isSeeking.value,
-    }),
-    (result) => {
-      if (result.isSeeking === false) {
-        runOnJS(updateTimes)(result.progress, result.max);
-      }
-    },
-    [updateTimes]
-  );
-
-  useEffect(() => {
-    const backAction = () => {
-      if (currentlyPlaying) {
-        Alert.alert("Hold on!", "Are you sure you want to exit?", [
-          {
-            text: "Cancel",
-            onPress: () => null,
-            style: "cancel",
-          },
-          {
-            text: "Yes",
-            onPress: () => {
-              stopPlayback();
-              router.back();
-            },
-          },
-        ]);
-        return true;
-      }
-      return false;
-    };
-
-    const backHandler = BackHandler.addEventListener(
-      "hardwareBackPress",
-      backAction
-    );
-
-    return () => backHandler.remove();
-  }, [currentlyPlaying, stopPlayback, router]);
-
-  const isLandscape = useMemo(() => {
-    return orientation === ScreenOrientation.OrientationLock.LANDSCAPE_LEFT ||
-      orientation === ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT
-      ? true
-      : false;
-  }, [orientation]);
-
-  const poster = useMemo(() => {
-    if (!currentlyPlaying?.item || !api) return "";
-    return currentlyPlaying.item.Type === "Audio"
-      ? `${api.basePath}/Items/${currentlyPlaying.item.AlbumId}/Images/Primary?tag=${currentlyPlaying.item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
-      : getBackdropUrl({
-          api,
-          item: currentlyPlaying.item,
-          quality: 70,
-          width: 200,
-        });
-  }, [currentlyPlaying?.item, api]);
-
-  const videoSource = useMemo(() => {
-    if (!api || !currentlyPlaying || !poster) return null;
-    const startPosition = currentlyPlaying.item?.UserData?.PlaybackPositionTicks
-      ? Math.round(currentlyPlaying.item.UserData.PlaybackPositionTicks / 10000)
-      : 0;
-    return {
-      uri: currentlyPlaying.url,
-      isNetwork: true,
-      startPosition,
-      headers: getAuthHeaders(api),
-      metadata: {
-        artist: currentlyPlaying.item?.AlbumArtist ?? undefined,
-        title: currentlyPlaying.item?.Name || "Unknown",
-        description: currentlyPlaying.item?.Overview ?? undefined,
-        imageUri: poster,
-        subtitle: currentlyPlaying.item?.Album ?? undefined,
-      },
-    };
-  }, [currentlyPlaying, api, poster]);
-
-  useEffect(() => {
-    if (currentlyPlaying) {
-      progress.value =
-        currentlyPlaying.item?.UserData?.PlaybackPositionTicks || 0;
-      max.value = currentlyPlaying.item.RunTimeTicks || 0;
-      setShowControls(true);
-      playVideo();
-    }
-  }, [currentlyPlaying]);
-
-  const toggleControls = () => setShowControls(!showControls);
-
-  const handleVideoProgress = useCallback(
-    (data: OnProgressData) => {
-      if (isSeeking.value === true) return;
-      progress.value = secondsToTicks(data.currentTime);
-      cacheProgress.value = secondsToTicks(data.playableDuration);
-      setIsBufferingState(data.playableDuration === 0);
-      setIsBuffering(data.playableDuration === 0);
-      onProgress(data);
-    },
-    [onProgress, setIsBuffering, isSeeking]
-  );
-
-  const handleVideoError = useCallback(
-    (e: any) => {
-      console.log(e);
-      writeToLog("ERROR", "Video playback error: " + JSON.stringify(e));
-      Alert.alert("Error", "Cannot play this video file.");
-      setIsPlaying(false);
-    },
-    [setIsPlaying]
-  );
-
-  const handlePlayPause = useCallback(() => {
-    if (isPlaying) pauseVideo();
-    else playVideo();
-  }, [isPlaying, pauseVideo, playVideo]);
-
-  const handleSliderComplete = (value: number) => {
-    progress.value = value;
-    isSeeking.value = false;
-    videoRef.current?.seek(value / 10000000);
-  };
-
-  const handleSliderChange = (value: number) => {
-    calculateTrickplayUrl(value);
-  };
-
-  const handleSliderStart = useCallback(() => {
-    if (showControls === false) return;
-    isSeeking.value = true;
-  }, []);
-
-  const handleSkipBackward = useCallback(async () => {
-    if (!settings) return;
-    try {
-      const curr = await videoRef.current?.getCurrentPosition();
-      if (curr !== undefined) {
-        videoRef.current?.seek(Math.max(0, curr - settings.rewindSkipTime));
-      }
-    } catch (error) {
-      writeToLog("ERROR", "Error seeking video backwards", error);
-    }
-  }, [settings]);
-
-  const handleSkipForward = useCallback(async () => {
-    if (!settings) return;
-    try {
-      const curr = await videoRef.current?.getCurrentPosition();
-      if (curr !== undefined) {
-        videoRef.current?.seek(Math.max(0, curr + settings.forwardSkipTime));
-      }
-    } catch (error) {
-      writeToLog("ERROR", "Error seeking video forwards", error);
-    }
-  }, [settings]);
-
-  const handleGoToPreviousItem = useCallback(() => {
-    if (!previousItem || !from) return;
-    const url = itemRouter(previousItem, from);
-    stopPlayback();
-    // @ts-ignore
-    router.push(url);
-  }, [previousItem, from, stopPlayback, router]);
-
-  const handleGoToNextItem = useCallback(() => {
-    if (!nextItem || !from) return;
-    const url = itemRouter(nextItem, from);
-    stopPlayback();
-    // @ts-ignore
-    router.push(url);
-  }, [nextItem, from, stopPlayback, router]);
-
-  const toggleIgnoreSafeArea = useCallback(() => {
-    setIgnoreSafeArea((prev) => !prev);
-  }, []);
-
-  if (!currentlyPlaying) return null;
-
-  return (
-    <View
-      style={{
-        width: dimensions.window.width,
-        height: dimensions.window.height,
-        backgroundColor: "black",
-      }}
-    >
-      <Pressable
-        onPress={toggleControls}
-        style={[
-          {
-            position: "absolute",
-            top: 0,
-            bottom: 0,
-            left: ignoreSafeArea ? 0 : insets.left,
-            right: ignoreSafeArea ? 0 : insets.right,
-            width: ignoreSafeArea
-              ? dimensions.window.width
-              : dimensions.window.width - (insets.left + insets.right),
-          },
-        ]}
-      >
-        {videoSource && (
-          <Video
-            ref={videoRef}
-            source={videoSource}
-            style={{ width: "100%", height: "100%" }}
-            resizeMode={ignoreSafeArea ? "cover" : "contain"}
-            onProgress={handleVideoProgress}
-            onLoad={(data) => (max.value = secondsToTicks(data.duration))}
-            onError={handleVideoError}
-            playWhenInactive={true}
-            allowsExternalPlayback={true}
-            playInBackground={true}
-            pictureInPicture={true}
-            showNotificationControls={true}
-            ignoreSilentSwitch="ignore"
-            fullscreen={false}
-          />
-        )}
-      </Pressable>
-
-      {(showControls || isBuffering) && (
-        <View
-          pointerEvents="none"
-          style={[
-            {
-              top: 0,
-              left: 0,
-              position: "absolute",
-              width: dimensions.window.width,
-              height: dimensions.window.height,
-            },
-          ]}
-          className="  bg-black/50 z-0"
-        ></View>
-      )}
-
-      {isBuffering && (
-        <View
-          pointerEvents="none"
-          className="fixed top-0 left-0 w-screen h-screen flex flex-col items-center justify-center"
-        >
-          <Loader />
-        </View>
-      )}
-
-      {showSkipButton && (
-        <View
-          style={[
-            {
-              position: "absolute",
-              bottom: isLandscape ? insets.bottom + 26 : insets.bottom + 70,
-              right: isLandscape ? insets.right + 32 : insets.right + 16,
-              height: 70,
-            },
-          ]}
-          className="z-10"
-        >
-          <TouchableOpacity
-            onPress={skipIntro}
-            className="bg-purple-600 rounded-full px-2.5 py-2 font-semibold"
-          >
-            <Text className="text-white">Skip Intro</Text>
-          </TouchableOpacity>
-        </View>
-      )}
-
-      {showSkipCreditButton && (
-        <View
-          style={[
-            {
-              position: "absolute",
-              bottom: isLandscape ? insets.bottom + 26 : insets.bottom + 70,
-              right: isLandscape ? insets.right + 32 : insets.right + 16,
-              height: 70,
-            },
-          ]}
-          className="z-10"
-        >
-          <TouchableOpacity
-            onPress={skipCredit}
-            className="bg-purple-600 rounded-full px-2.5 py-2 font-semibold"
-          >
-            <Text className="text-white">Skip Credits</Text>
-          </TouchableOpacity>
-        </View>
-      )}
-
-      {showControls && (
-        <>
-          <View
-            style={[
-              {
-                position: "absolute",
-                top: insets.top,
-                right: isLandscape ? insets.right + 32 : insets.right + 16,
-                height: 70,
-                zIndex: 10,
-              },
-            ]}
-            className="flex flex-row items-center space-x-2 z-10"
-          >
-            <TouchableOpacity
-              onPress={toggleIgnoreSafeArea}
-              className="aspect-square flex flex-col bg-neutral-800 rounded-xl items-center justify-center p-2"
-            >
-              <Ionicons
-                name={ignoreSafeArea ? "contract-outline" : "expand"}
-                size={24}
-                color="white"
-              />
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={() => {
-                stopPlayback();
-                router.back();
-              }}
-              className="aspect-square flex flex-col bg-neutral-800 rounded-xl items-center justify-center p-2"
-            >
-              <Ionicons name="close" size={24} color="white" />
-            </TouchableOpacity>
-          </View>
-
-          <View
-            style={[
-              {
-                position: "absolute",
-                bottom: insets.bottom + 8,
-                left: isLandscape ? insets.left + 32 : insets.left + 16,
-                width: isLandscape
-                  ? dimensions.window.width - insets.left - insets.right - 64
-                  : dimensions.window.width - insets.left - insets.right - 32,
-              },
-            ]}
-          >
-            <View className="shrink flex flex-col justify-center h-full mb-2">
-              <Text className="font-bold">{currentlyPlaying.item?.Name}</Text>
-              {currentlyPlaying.item?.Type === "Episode" && (
-                <Text className="opacity-50">
-                  {currentlyPlaying.item.SeriesName}
-                </Text>
-              )}
-              {currentlyPlaying.item?.Type === "Movie" && (
-                <Text className="text-xs opacity-50">
-                  {currentlyPlaying.item?.ProductionYear}
-                </Text>
-              )}
-              {currentlyPlaying.item?.Type === "Audio" && (
-                <Text className="text-xs opacity-50">
-                  {currentlyPlaying.item?.Album}
-                </Text>
-              )}
-            </View>
-            <View
-              className={`flex ${
-                isLandscape
-                  ? "flex-row space-x-6 py-2 px-4 rounded-full"
-                  : "flex-col-reverse py-4 px-4 rounded-2xl"
-              } 
-          items-center  bg-neutral-800`}
-            >
-              <View className="flex flex-row items-center space-x-4">
-                <TouchableOpacity
-                  style={{
-                    opacity: !previousItem ? 0.5 : 1,
-                  }}
-                  onPress={handleGoToPreviousItem}
-                >
-                  <Ionicons name="play-skip-back" size={24} color="white" />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handleSkipBackward}>
-                  <Ionicons
-                    name="refresh-outline"
-                    size={26}
-                    color="white"
-                    style={{
-                      transform: [{ scaleY: -1 }, { rotate: "180deg" }],
-                    }}
-                  />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handlePlayPause}>
-                  <Ionicons
-                    name={isPlaying ? "pause" : "play"}
-                    size={30}
-                    color="white"
-                  />
-                </TouchableOpacity>
-                <TouchableOpacity onPress={handleSkipForward}>
-                  <Ionicons name="refresh-outline" size={26} color="white" />
-                </TouchableOpacity>
-                <TouchableOpacity
-                  style={{
-                    opacity: !nextItem ? 0.5 : 1,
-                  }}
-                  onPress={handleGoToNextItem}
-                >
-                  <Ionicons name="play-skip-forward" size={24} color="white" />
-                </TouchableOpacity>
-              </View>
-              <View
-                className={`flex flex-col w-full shrink
-              ${""}
-            `}
-              >
-                <Slider
-                  theme={{
-                    maximumTrackTintColor: "rgba(255,255,255,0.2)",
-                    minimumTrackTintColor: "#fff",
-                    cacheTrackTintColor: "rgba(255,255,255,0.3)",
-                    bubbleBackgroundColor: "#fff",
-                    bubbleTextColor: "#000",
-                    heartbeatColor: "#999",
-                  }}
-                  cache={cacheProgress}
-                  onSlidingStart={handleSliderStart}
-                  onSlidingComplete={handleSliderComplete}
-                  onValueChange={handleSliderChange}
-                  containerStyle={{
-                    borderRadius: 100,
-                  }}
-                  renderBubble={() => {
-                    if (!trickPlayUrl || !trickplayInfo) {
-                      return null;
-                    }
-                    const { x, y, url } = trickPlayUrl;
-
-                    const tileWidth = 150;
-                    const tileHeight = 150 / trickplayInfo.aspectRatio!;
-                    return (
-                      <View
-                        style={{
-                          position: "absolute",
-                          bottom: 0,
-                          left: 0,
-                          width: tileWidth,
-                          height: tileHeight,
-                          marginLeft: -tileWidth / 4,
-                          marginTop: -tileHeight / 4 - 60,
-                          zIndex: 10,
-                        }}
-                        className=" bg-neutral-800 overflow-hidden"
-                      >
-                        <Image
-                          cachePolicy={"memory-disk"}
-                          style={{
-                            width: 150 * trickplayInfo?.data.TileWidth!,
-                            height:
-                              (150 / trickplayInfo.aspectRatio!) *
-                              trickplayInfo?.data.TileHeight!,
-                            transform: [
-                              { translateX: -x * tileWidth },
-                              { translateY: -y * tileHeight },
-                            ],
-                          }}
-                          source={{ uri: url }}
-                          contentFit="cover"
-                        />
-                      </View>
-                    );
-                  }}
-                  sliderHeight={10}
-                  thumbWidth={0}
-                  progress={progress}
-                  minimumValue={min}
-                  maximumValue={max}
-                />
-                <View className="flex flex-row items-center justify-between mt-0.5">
-                  <Text className="text-[12px] text-neutral-400">
-                    {formatTimeString(currentTime)}
-                  </Text>
-                  <Text className="text-[12px] text-neutral-400">
-                    -{formatTimeString(remainingTime)}
-                  </Text>
-                </View>
-              </View>
-            </View>
-          </View>
-        </>
-      )}
-    </View>
-  );
-};

components/GenreTags.tsx

@@ -1,25 +0,0 @@
-// GenreTags.tsx
-import React from "react";
-import { View } from "react-native";
-import { Text } from "./common/Text";
-
-interface GenreTagsProps {
-  genres?: string[];
-}
-
-export const GenreTags: React.FC<GenreTagsProps> = ({ genres }) => {
-  if (!genres || genres.length === 0) return null;
-
-  return (
-    <View className="flex flex-row flex-wrap mt-2">
-      {genres.map((genre) => (
-        <View
-          key={genre}
-          className="bg-neutral-800 rounded-full px-2 py-1 mr-1"
-        >
-          <Text className="text-xs">{genre}</Text>
-        </View>
-      ))}
-    </View>
-  );
-};

components/ItemCardText.tsx

@@ -10,7 +10,7 @@ type ItemCardProps = {
 
 export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
   return (
-    <View className="mt-2 flex flex-col">
+    <View className="mt-2 flex flex-col h-12">
       {item.Type === "Episode" ? (
         <>
           <Text numberOfLines={2} className="">

components/ItemContent.tsx

@@ -1,375 +0,0 @@
-import { AudioTrackSelector } from "@/components/AudioTrackSelector";
-import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import { DownloadItem } from "@/components/DownloadItem";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { PlayButton } from "@/components/PlayButton";
-import { PlayedStatus } from "@/components/PlayedStatus";
-import { SimilarItems } from "@/components/SimilarItems";
-import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
-import { ItemImage } from "@/components/common/ItemImage";
-import { CastAndCrew } from "@/components/series/CastAndCrew";
-import { CurrentSeries } from "@/components/series/CurrentSeries";
-import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
-import { useImageColors } from "@/hooks/useImageColors";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getItemImage } from "@/utils/getItemImage";
-import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { chromecastProfile } from "@/utils/profiles/chromecast";
-import ios from "@/utils/profiles/ios";
-import native from "@/utils/profiles/native";
-import old from "@/utils/profiles/old";
-import { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
-import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { Stack, useNavigation } from "expo-router";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { useAtom } from "jotai";
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { View } from "react-native";
-import { useCastDevice } from "react-native-google-cast";
-import Animated, {
-  runOnJS,
-  useAnimatedStyle,
-  useSharedValue,
-  withTiming,
-} from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Chromecast } from "./Chromecast";
-import { ItemHeader } from "./ItemHeader";
-import { Loader } from "./Loader";
-import { MediaSourceSelector } from "./MediaSourceSelector";
-import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
-
-export const ItemContent: React.FC<{ id: string }> = React.memo(({ id }) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const opacity = useSharedValue(0);
-  const castDevice = useCastDevice();
-  const navigation = useNavigation();
-  const [settings] = useSettings();
-  const [selectedMediaSource, setSelectedMediaSource] =
-    useState<MediaSourceInfo | null>(null);
-  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
-  const [selectedSubtitleStream, setSelectedSubtitleStream] =
-    useState<number>(-1);
-  const [maxBitrate, setMaxBitrate] = useState<Bitrate>({
-    key: "Max",
-    value: undefined,
-  });
-
-  const [loadingLogo, setLoadingLogo] = useState(true);
-
-  const [orientation, setOrientation] = useState(
-    ScreenOrientation.Orientation.PORTRAIT_UP
-  );
-
-  useEffect(() => {
-    const subscription = ScreenOrientation.addOrientationChangeListener(
-      (event) => {
-        setOrientation(event.orientationInfo.orientation);
-      }
-    );
-
-    ScreenOrientation.getOrientationAsync().then((initialOrientation) => {
-      setOrientation(initialOrientation);
-    });
-
-    return () => {
-      ScreenOrientation.removeOrientationChangeListener(subscription);
-    };
-  }, []);
-
-  const animatedStyle = useAnimatedStyle(() => {
-    return {
-      opacity: opacity.value,
-    };
-  });
-
-  const fadeIn = () => {
-    opacity.value = withTiming(1, { duration: 300 });
-  };
-
-  const fadeOut = (callback: any) => {
-    opacity.value = withTiming(0, { duration: 300 }, (finished) => {
-      if (finished) {
-        runOnJS(callback)();
-      }
-    });
-  };
-
-  const headerHeightRef = useRef(400);
-
-  const {
-    data: item,
-    isLoading,
-    isFetching,
-  } = useQuery({
-    queryKey: ["item", id],
-    queryFn: async () => {
-      const res = await getUserItemData({
-        api,
-        userId: user?.Id,
-        itemId: id,
-      });
-
-      return res;
-    },
-    enabled: !!id && !!api,
-    staleTime: 60 * 1000 * 5,
-  });
-
-  const [localItem, setLocalItem] = useState(item);
-  useImageColors(item);
-
-  useEffect(() => {
-    if (item) {
-      if (localItem) {
-        // Fade out current item
-        fadeOut(() => {
-          // Update local item after fade out
-          setLocalItem(item);
-          // Then fade in
-          fadeIn();
-        });
-      } else {
-        // If there's no current item, just set and fade in
-        setLocalItem(item);
-        fadeIn();
-      }
-    } else {
-      // If item is null, fade out and clear local item
-      fadeOut(() => setLocalItem(null));
-    }
-  }, [item]);
-
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () =>
-        item && (
-          <View className="flex flex-row items-center space-x-2">
-            <Chromecast background="blur" width={22} height={22} />
-            <DownloadItem item={item} />
-            <PlayedStatus item={item} />
-          </View>
-        ),
-    });
-  }, [item]);
-
-  useEffect(() => {
-    if (orientation !== ScreenOrientation.Orientation.PORTRAIT_UP) {
-      headerHeightRef.current = 230;
-      return;
-    }
-    if (item?.Type === "Episode") headerHeightRef.current = 400;
-    else if (item?.Type === "Movie") headerHeightRef.current = 500;
-    else headerHeightRef.current = 400;
-  }, [item, orientation]);
-
-  const { data: sessionData } = useQuery({
-    queryKey: ["sessionData", item?.Id],
-    queryFn: async () => {
-      if (!api || !user?.Id || !item?.Id) return null;
-      const playbackData = await getMediaInfoApi(api!).getPlaybackInfo({
-        itemId: item?.Id,
-        userId: user?.Id,
-      });
-
-      return playbackData.data;
-    },
-    enabled: !!item?.Id && !!api && !!user?.Id,
-    staleTime: 0,
-  });
-
-  const { data: playbackUrl } = useQuery({
-    queryKey: [
-      "playbackUrl",
-      item?.Id,
-      maxBitrate,
-      castDevice,
-      selectedMediaSource,
-      selectedAudioStream,
-      selectedSubtitleStream,
-      settings,
-    ],
-    queryFn: async () => {
-      if (!api || !user?.Id || !sessionData || !selectedMediaSource?.Id)
-        return null;
-
-      let deviceProfile: any = ios;
-
-      if (castDevice?.deviceId) {
-        deviceProfile = chromecastProfile;
-      } else if (settings?.deviceProfile === "Native") {
-        deviceProfile = native;
-      } else if (settings?.deviceProfile === "Old") {
-        deviceProfile = old;
-      }
-
-      const url = await getStreamUrl({
-        api,
-        userId: user.Id,
-        item,
-        startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
-        maxStreamingBitrate: maxBitrate.value,
-        sessionData,
-        deviceProfile,
-        audioStreamIndex: selectedAudioStream,
-        subtitleStreamIndex: selectedSubtitleStream,
-        forceDirectPlay: settings?.forceDirectPlay,
-        height: maxBitrate.height,
-        mediaSourceId: selectedMediaSource.Id,
-      });
-
-      console.info("Stream URL:", url);
-
-      return url;
-    },
-    enabled: !!sessionData && !!api && !!user?.Id && !!item?.Id,
-    staleTime: 0,
-  });
-
-  const logoUrl = useMemo(() => getLogoImageUrlById({ api, item }), [item]);
-
-  const loading = useMemo(() => {
-    return Boolean(isLoading || isFetching || (logoUrl && loadingLogo));
-  }, [isLoading, isFetching, loadingLogo, logoUrl]);
-
-  const insets = useSafeAreaInsets();
-
-  return (
-    <View
-      className="flex-1 relative"
-      style={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      {loading && (
-        <View className="absolute top-0 left-0 right-0 bottom-0 w-full h-full flex flex-col justify-center items-center z-50">
-          <Loader />
-        </View>
-      )}
-      <ParallaxScrollView
-        className={`flex-1 ${loading ? "opacity-0" : "opacity-100"}`}
-        headerHeight={headerHeightRef.current}
-        headerImage={
-          <>
-            <Animated.View style={[animatedStyle, { flex: 1 }]}>
-              {localItem && (
-                <ItemImage
-                  variant={
-                    localItem.Type === "Movie" && logoUrl
-                      ? "Backdrop"
-                      : "Primary"
-                  }
-                  item={localItem}
-                  style={{
-                    width: "100%",
-                    height: "100%",
-                  }}
-                />
-              )}
-            </Animated.View>
-          </>
-        }
-        logo={
-          <>
-            {logoUrl ? (
-              <Image
-                source={{
-                  uri: logoUrl,
-                }}
-                style={{
-                  height: 130,
-                  width: "100%",
-                  resizeMode: "contain",
-                }}
-                onLoad={() => setLoadingLogo(false)}
-                onError={() => setLoadingLogo(false)}
-              />
-            ) : null}
-          </>
-        }
-      >
-        <View className="flex flex-col bg-transparent shrink">
-          <View className="flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink">
-            <Animated.View style={[animatedStyle, { flex: 1 }]}>
-              <ItemHeader item={localItem} className="mb-4" />
-              {localItem ? (
-                <View className="flex flex-row items-center justify-start w-full h-16">
-                  <BitrateSelector
-                    className="mr-1"
-                    onChange={(val) => setMaxBitrate(val)}
-                    selected={maxBitrate}
-                  />
-                  <MediaSourceSelector
-                    className="mr-1"
-                    item={localItem}
-                    onChange={setSelectedMediaSource}
-                    selected={selectedMediaSource}
-                  />
-                  {selectedMediaSource && (
-                    <>
-                      <AudioTrackSelector
-                        className="mr-1"
-                        source={selectedMediaSource}
-                        onChange={setSelectedAudioStream}
-                        selected={selectedAudioStream}
-                      />
-                      <SubtitleTrackSelector
-                        source={selectedMediaSource}
-                        onChange={setSelectedSubtitleStream}
-                        selected={selectedSubtitleStream}
-                      />
-                    </>
-                  )}
-                </View>
-              ) : (
-                <View className="h-16">
-                  <View className="bg-neutral-900 h-4 w-2/4 rounded-md mb-1"></View>
-                  <View className="bg-neutral-900 h-10 w-3/4 rounded-lg"></View>
-                </View>
-              )}
-            </Animated.View>
-
-            <PlayButton item={item} url={playbackUrl} className="grow" />
-          </View>
-
-          {item?.Type === "Episode" && (
-            <SeasonEpisodesCarousel item={item} loading={loading} />
-          )}
-
-          <OverviewText text={item?.Overview} className="px-4 my-4" />
-
-          <CastAndCrew item={item} className="mb-4" loading={loading} />
-
-          {item?.People && item.People.length > 0 && (
-            <View className="mb-4">
-              {item.People.slice(0, 3).map((person) => (
-                <MoreMoviesWithActor
-                  currentItem={item}
-                  key={person.Id}
-                  actorId={person.Id!}
-                  className="mb-4"
-                />
-              ))}
-            </View>
-          )}
-
-          {item?.Type === "Episode" && (
-            <CurrentSeries item={item} className="mb-4" />
-          )}
-          <SimilarItems itemId={item?.Id} />
-
-          <View className="h-16"></View>
-        </View>
-      </ParallaxScrollView>
-    </View>
-  );
-});

components/ItemHeader.tsx

@@ -1,46 +0,0 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { View, ViewProps } from "react-native";
-import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
-import { Ratings } from "./Ratings";
-import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader";
-import { GenreTags } from "./GenreTags";
-import React from "react";
-
-interface Props extends ViewProps {
-  item?: BaseItemDto | null;
-}
-
-export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
-  if (!item)
-    return (
-      <View
-        className="flex flex-col space-y-1.5 w-full items-start h-32"
-        {...props}
-      >
-        <View className="w-1/3 h-6 bg-neutral-900 rounded" />
-        <View className="w-2/3 h-8 bg-neutral-900 rounded" />
-        <View className="w-2/3 h-4 bg-neutral-900 rounded" />
-        <View className="w-1/4 h-4 bg-neutral-900 rounded" />
-      </View>
-    );
-
-  return (
-    <View className="flex flex-col" {...props}>
-      <View className="flex flex-col" {...props}>
-        <Ratings item={item} className="mb-2" />
-        {item.Type === "Episode" && (
-          <>
-            <EpisodeTitleHeader item={item} />
-            <GenreTags genres={item.Genres!} />
-          </>
-        )}
-        {item.Type === "Movie" && (
-          <>
-            <MoviesTitleHeader item={item} />
-            <GenreTags genres={item.Genres!} />
-          </>
-        )}
-      </View>
-    </View>
-  );
-};

components/ListItem.tsx

@@ -23,11 +23,7 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
     >
       <View className="flex flex-col">
         <Text className="font-bold ">{title}</Text>
-        {subTitle && (
-          <Text className="text-xs" selectable>
-            {subTitle}
-          </Text>
-        )}
+        {subTitle && <Text className="text-xs">{subTitle}</Text>}
       </View>
       {iconAfter}
     </View>

components/MediaSourceSelector.tsx

@@ -1,92 +0,0 @@
-import { tc } from "@/utils/textTools";
-import {
-  BaseItemDto,
-  MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { useEffect, useMemo } from "react";
-import { TouchableOpacity, View } from "react-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
-import { Text } from "./common/Text";
-import { convertBitsToMegabitsOrGigabits } from "@/utils/bToMb";
-
-interface Props extends React.ComponentProps<typeof View> {
-  item: BaseItemDto;
-  onChange: (value: MediaSourceInfo) => void;
-  selected: MediaSourceInfo | null;
-}
-
-export const MediaSourceSelector: React.FC<Props> = ({
-  item,
-  onChange,
-  selected,
-  ...props
-}) => {
-  const mediaSources = useMemo(() => {
-    return item.MediaSources;
-  }, [item]);
-
-  const selectedMediaSource = useMemo(
-    () =>
-      mediaSources
-        ?.find((x) => x.Id === selected?.Id)
-        ?.MediaStreams?.find((x) => x.Type === "Video")?.DisplayTitle || "",
-    [mediaSources, selected]
-  );
-
-  useEffect(() => {
-    if (mediaSources?.length) onChange(mediaSources[0]);
-  }, [mediaSources]);
-
-  const name = (name?: string | null) => {
-    if (name && name.length > 40)
-      return (
-        name.substring(0, 20) + " [...] " + name.substring(name.length - 20)
-      );
-    return name;
-  };
-
-  return (
-    <View
-      className="flex shrink"
-      style={{
-        minWidth: 50,
-      }}
-    >
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">Video</Text>
-            <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center ">
-              <Text numberOfLines={1}>{selectedMediaSource}</Text>
-            </TouchableOpacity>
-          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side="bottom"
-          align="start"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Media sources</DropdownMenu.Label>
-          {mediaSources?.map((source, idx: number) => (
-            <DropdownMenu.Item
-              key={idx.toString()}
-              onSelect={() => {
-                onChange(source);
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {`${name(source.Name)} - ${convertBitsToMegabitsOrGigabits(
-                  source.Size
-                )}`}
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
-  );
-};

components/MoreMoviesWithActor.tsx

@@ -1,100 +0,0 @@
-import React from "react";
-import { View, ViewProps } from "react-native";
-import { Text } from "@/components/common/Text";
-import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import MoviePoster from "@/components/posters/MoviePoster";
-import { ItemCardText } from "@/components/ItemCardText";
-import { useAtom } from "jotai";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQuery } from "@tanstack/react-query";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-
-interface Props extends ViewProps {
-  actorId: string;
-  currentItem: BaseItemDto;
-}
-
-export const MoreMoviesWithActor: React.FC<Props> = ({
-  actorId,
-  currentItem,
-  ...props
-}) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const { data: actor } = useQuery({
-    queryKey: ["actor", actorId],
-    queryFn: async () => {
-      if (!api || !user?.Id) return null;
-      return await getUserItemData({
-        api,
-        userId: user.Id,
-        itemId: actorId,
-      });
-    },
-    enabled: !!api && !!user?.Id && !!actorId,
-  });
-
-  const { data: items, isLoading } = useQuery({
-    queryKey: ["actor", "movies", actorId, currentItem.Id],
-    queryFn: async () => {
-      if (!api || !user?.Id) return [];
-      const response = await getItemsApi(api).getItems({
-        userId: user.Id,
-        personIds: [actorId],
-        limit: 20,
-        sortOrder: ["Descending"],
-        includeItemTypes: ["Movie", "Series"],
-        recursive: true,
-        fields: ["ParentId", "PrimaryImageAspectRatio"],
-        sortBy: ["PremiereDate"],
-        collapseBoxSetItems: false,
-        excludeItemIds: [currentItem.SeriesId || "", currentItem.Id || ""],
-      });
-
-      // Remove duplicates based on item ID
-      const uniqueItems =
-        response.data.Items?.reduce((acc, current) => {
-          const x = acc.find((item) => item.Id === current.Id);
-          if (!x) {
-            return acc.concat([current]);
-          } else {
-            return acc;
-          }
-        }, [] as BaseItemDto[]) || [];
-
-      return uniqueItems;
-    },
-    enabled: !!api && !!user?.Id && !!actorId,
-  });
-
-  if (items?.length === 0) return null;
-
-  return (
-    <View {...props}>
-      <Text className="text-lg font-bold mb-2 px-4">
-        More with {actor?.Name}
-      </Text>
-      <HorizontalScroll
-        data={items}
-        loading={isLoading}
-        height={247}
-        renderItem={(item: BaseItemDto, idx: number) => (
-          <TouchableItemRouter
-            key={idx}
-            item={item}
-            className="flex flex-col w-28"
-          >
-            <View>
-              <MoviePoster item={item} />
-              <ItemCardText item={item} />
-            </View>
-          </TouchableItemRouter>
-        )}
-      />
-    </View>
-  );
-};

components/OverviewText.tsx

@@ -5,37 +5,34 @@ import { useState } from "react";
 
 interface Props extends ViewProps {
   text?: string | null;
-  characterLimit?: number;
 }
 
-export const OverviewText: React.FC<Props> = ({
-  text,
-  characterLimit = 100,
-  ...props
-}) => {
-  const [limit, setLimit] = useState(characterLimit);
+const LIMIT = 140;
+
+export const OverviewText: React.FC<Props> = ({ text, ...props }) => {
+  const [limit, setLimit] = useState(LIMIT);
 
   if (!text) return null;
 
-  return (
-    <View className="flex flex-col" {...props}>
-      <Text className="text-lg font-bold mb-2">Overview</Text>
+  if (text.length > LIMIT)
+    return (
       <TouchableOpacity
         onPress={() =>
-          setLimit((prev) =>
-            prev === characterLimit ? text.length : characterLimit
-          )
+          setLimit((prev) => (prev === LIMIT ? text.length : LIMIT))
         }
       >
-        <View>
+        <View {...props} className="">
           <Text>{tc(text, limit)}</Text>
-          {text.length > characterLimit && (
-            <Text className="text-purple-600 mt-1">
-              {limit === characterLimit ? "Show more" : "Show less"}
-            </Text>
-          )}
+          <Text className="text-purple-600 mt-1">
+            {limit === LIMIT ? "Show more" : "Show less"}
+          </Text>
         </View>
       </TouchableOpacity>
+    );
+
+  return (
+    <View {...props}>
+      <Text>{text}</Text>
     </View>
   );
 };

components/ParallaxPage.tsx

@@ -1,27 +1,27 @@
-import { LinearGradient } from "expo-linear-gradient";
-import { type PropsWithChildren, type ReactElement } from "react";
-import { View, ViewProps } from "react-native";
+import { Ionicons } from "@expo/vector-icons";
+import { router } from "expo-router";
+import type { PropsWithChildren, ReactElement } from "react";
+import { TouchableOpacity, View } from "react-native";
 import Animated, {
   interpolate,
   useAnimatedRef,
   useAnimatedStyle,
   useScrollViewOffset,
 } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Chromecast } from "./Chromecast";
 
-interface Props extends ViewProps {
+const HEADER_HEIGHT = 400;
+
+type Props = PropsWithChildren<{
   headerImage: ReactElement;
   logo?: ReactElement;
-  episodePoster?: ReactElement;
-  headerHeight?: number;
-}
+}>;
 
-export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
+export const ParallaxScrollView: React.FC<Props> = ({
   children,
   headerImage,
-  episodePoster,
-  headerHeight = 400,
   logo,
-  ...props
 }: Props) => {
   const scrollRef = useAnimatedRef<Animated.ScrollView>();
   const scrollOffset = useScrollViewOffset(scrollRef);
@@ -32,23 +32,25 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
         {
           translateY: interpolate(
             scrollOffset.value,
-            [-headerHeight, 0, headerHeight],
-            [-headerHeight / 2, 0, headerHeight * 0.75]
+            [-HEADER_HEIGHT, 0, HEADER_HEIGHT],
+            [-HEADER_HEIGHT / 2, 0, HEADER_HEIGHT * 0.75],
           ),
         },
         {
           scale: interpolate(
             scrollOffset.value,
-            [-headerHeight, 0, headerHeight],
-            [2, 1, 1]
+            [-HEADER_HEIGHT, 0, HEADER_HEIGHT],
+            [2, 1, 1],
           ),
         },
       ],
     };
   });
 
+  const inset = useSafeAreaInsets();
+
   return (
-    <View className="flex-1" {...props}>
+    <View className="flex-1">
       <Animated.ScrollView
         style={{
           position: "relative",
@@ -56,14 +58,32 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
         ref={scrollRef}
         scrollEventThrottle={16}
       >
+        <TouchableOpacity
+          onPress={() => router.back()}
+          className="absolute left-4 z-50 bg-black rounded-full p-2 border border-neutral-900"
+          style={{
+            top: inset.top + 17,
+          }}
+        >
+          <Ionicons
+            className="drop-shadow-2xl"
+            name="arrow-back"
+            size={24}
+            color="#077DF2"
+          />
+        </TouchableOpacity>
+
+        <View
+          className="absolute right-4 z-50 bg-black rounded-full p-0.5"
+          style={{
+            top: inset.top + 17,
+          }}
+        >
+          <Chromecast width={22} height={22} />
+        </View>
+
         {logo && (
-          <View
-            style={{
-              top: headerHeight - 200,
-              height: 130,
-            }}
-            className="absolute left-0 w-full z-40 px-4 flex justify-center items-center"
-          >
+          <View className="absolute top-[250px] h-[130px] left-0 w-full z-40 px-4 flex justify-center items-center">
             {logo}
           </View>
         )}
@@ -71,7 +91,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
         <Animated.View
           style={[
             {
-              height: headerHeight,
+              height: HEADER_HEIGHT,
               backgroundColor: "black",
             },
             headerAnimatedStyle,
@@ -79,35 +99,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
         >
           {headerImage}
         </Animated.View>
-
-        <View
-          style={{
-            top: -50,
-          }}
-          className="relative flex-1  bg-transparent pb-24"
-        >
-          <LinearGradient
-            // Background Linear Gradient
-            colors={["transparent", "rgba(0,0,0,1)"]}
-            style={{
-              position: "absolute",
-              left: 0,
-              right: 0,
-              top: -150,
-              height: 200,
-            }}
-          />
-          <View
-            // Background Linear Gradient
-            style={{
-              position: "absolute",
-              left: 0,
-              right: 0,
-              top: 50,
-              height: "100%",
-              backgroundColor: "black",
-            }}
-          />
+        <View className="flex-1 overflow-hidden bg-black pb-24">
           {children}
         </View>
       </Animated.ScrollView>

components/PlatformBlurView.tsx

@@ -1,35 +0,0 @@
-import { BlurView } from "expo-blur";
-import React from "react";
-import { Platform, View, ViewProps } from "react-native";
-interface Props extends ViewProps {
-  blurAmount?: number;
-  blurType?: "light" | "dark" | "xlight";
-}
-
-/**
- * BlurView for iOS and simple View for Android
- */
-export const PlatformBlurView: React.FC<Props> = ({
-  blurAmount = 100,
-  blurType = "light",
-  style,
-  children,
-  ...props
-}) => {
-  if (Platform.OS === "ios") {
-    return (
-      <BlurView style={style} intensity={blurAmount} {...props}>
-        {children}
-      </BlurView>
-    );
-  }
-
-  return (
-    <View
-      style={[{ backgroundColor: "rgba(50, 50, 50, 0.9)" }, style]}
-      {...props}
-    >
-      {children}
-    </View>
-  );
-};

components/PlayButton.tsx

@@ -1,170 +1,65 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
 import { usePlayback } from "@/providers/PlaybackProvider";
-import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
-import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { runtimeTicksToMinutes } from "@/utils/time";
 import { useActionSheet } from "@expo/react-native-action-sheet";
 import { Feather, Ionicons } from "@expo/vector-icons";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useAtom } from "jotai";
-import { useEffect, useMemo } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { View } from "react-native";
 import CastContext, {
   PlayServicesState,
-  useMediaStatus,
   useRemoteMediaClient,
 } from "react-native-google-cast";
-import Animated, {
-  Easing,
-  interpolate,
-  interpolateColor,
-  useAnimatedReaction,
-  useAnimatedStyle,
-  useDerivedValue,
-  useSharedValue,
-  withTiming,
-} from "react-native-reanimated";
 import { Button } from "./Button";
-import { Text } from "./common/Text";
-import { useRouter } from "expo-router";
 
 interface Props extends React.ComponentProps<typeof Button> {
   item?: BaseItemDto | null;
   url?: string | null;
 }
 
-const ANIMATION_DURATION = 500;
-const MIN_PLAYBACK_WIDTH = 15;
-
 export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
   const { showActionSheetWithOptions } = useActionSheet();
   const client = useRemoteMediaClient();
-  const { setCurrentlyPlayingState } = usePlayback();
-  const mediaStatus = useMediaStatus();
-
-  const [colorAtom] = useAtom(itemThemeColorAtom);
-  const [api] = useAtom(apiAtom);
-
-  const router = useRouter();
-
-  const memoizedItem = useMemo(() => item, [item?.Id]); // Memoize the item
-  const memoizedColor = useMemo(() => colorAtom, [colorAtom]); // Memoize the color
-
-  const startWidth = useSharedValue(0);
-  const targetWidth = useSharedValue(0);
-  const endColor = useSharedValue(memoizedColor);
-  const startColor = useSharedValue(memoizedColor);
-  const widthProgress = useSharedValue(0);
-  const colorChangeProgress = useSharedValue(0);
-
-  const directStream = useMemo(() => {
-    return !url?.includes("m3u8");
-  }, [url]);
+  const { currentlyPlaying, setCurrentlyPlayingState } = usePlayback();
 
   const onPress = async () => {
     if (!url || !item) return;
+
     if (!client) {
       setCurrentlyPlayingState({ item, url });
-      router.push("/play");
       return;
     }
+
     const options = ["Chromecast", "Device", "Cancel"];
     const cancelButtonIndex = 2;
+
     showActionSheetWithOptions(
       {
         options,
         cancelButtonIndex,
       },
       async (selectedIndex: number | undefined) => {
-        if (!api) return;
-        const currentTitle = mediaStatus?.mediaInfo?.metadata?.title;
-        const isOpeningCurrentlyPlayingMedia =
-          currentTitle && currentTitle === item?.Name;
-
         switch (selectedIndex) {
           case 0:
             await CastContext.getPlayServicesState().then((state) => {
               if (state && state !== PlayServicesState.SUCCESS)
                 CastContext.showPlayServicesErrorDialog(state);
               else {
-                // If we're opening a currently playing item, don't restart the media.
-                // Instead just open controls.
-                if (isOpeningCurrentlyPlayingMedia) {
-                  CastContext.showExpandedControls();
-                  return;
-                }
-                client
-                  .loadMedia({
-                    mediaInfo: {
-                      contentUrl: url,
-                      contentType: "video/mp4",
-                      metadata:
-                        item.Type === "Episode"
-                          ? {
-                              type: "tvShow",
-                              title: item.Name || "",
-                              episodeNumber: item.IndexNumber || 0,
-                              seasonNumber: item.ParentIndexNumber || 0,
-                              seriesTitle: item.SeriesName || "",
-                              images: [
-                                {
-                                  url: getParentBackdropImageUrl({
-                                    api,
-                                    item,
-                                    quality: 90,
-                                    width: 2000,
-                                  })!,
-                                },
-                              ],
-                            }
-                          : item.Type === "Movie"
-                          ? {
-                              type: "movie",
-                              title: item.Name || "",
-                              subtitle: item.Overview || "",
-                              images: [
-                                {
-                                  url: getPrimaryImageUrl({
-                                    api,
-                                    item,
-                                    quality: 90,
-                                    width: 2000,
-                                  })!,
-                                },
-                              ],
-                            }
-                          : {
-                              type: "generic",
-                              title: item.Name || "",
-                              subtitle: item.Overview || "",
-                              images: [
-                                {
-                                  url: getPrimaryImageUrl({
-                                    api,
-                                    item,
-                                    quality: 90,
-                                    width: 2000,
-                                  })!,
-                                },
-                              ],
-                            },
+                client.loadMedia({
+                  mediaInfo: {
+                    contentUrl: url,
+                    contentType: "video/mp4",
+                    metadata: {
+                      type: item.Type === "Episode" ? "tvShow" : "movie",
+                      title: item.Name || "",
+                      subtitle: item.Overview || "",
                     },
-                    startTime: 0,
-                  })
-                  .then(() => {
-                    // state is already set when reopening current media, so skip it here.
-                    if (isOpeningCurrentlyPlayingMedia) {
-                      return;
-                    }
-                    CastContext.showExpandedControls();
-                  });
+                  },
+                  startTime: 0,
+                });
               }
             });
             break;
           case 1:
             setCurrentlyPlayingState({ item, url });
-            router.push("/play");
             break;
           case cancelButtonIndex:
             break;
@@ -173,154 +68,18 @@ export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
     );
   };
 
-  const derivedTargetWidth = useDerivedValue(() => {
-    if (!memoizedItem || !memoizedItem.RunTimeTicks) return 0;
-    const userData = memoizedItem.UserData;
-    if (userData && userData.PlaybackPositionTicks) {
-      return userData.PlaybackPositionTicks > 0
-        ? Math.max(
-            (userData.PlaybackPositionTicks / memoizedItem.RunTimeTicks) * 100,
-            MIN_PLAYBACK_WIDTH
-          )
-        : 0;
-    }
-    return 0;
-  }, [memoizedItem]);
-
-  useAnimatedReaction(
-    () => derivedTargetWidth.value,
-    (newWidth) => {
-      targetWidth.value = newWidth;
-      widthProgress.value = 0;
-      widthProgress.value = withTiming(1, {
-        duration: ANIMATION_DURATION,
-        easing: Easing.bezier(0.7, 0, 0.3, 1.0),
-      });
-    },
-    [item]
-  );
-
-  useAnimatedReaction(
-    () => memoizedColor,
-    (newColor) => {
-      endColor.value = newColor;
-      colorChangeProgress.value = 0;
-      colorChangeProgress.value = withTiming(1, {
-        duration: ANIMATION_DURATION,
-        easing: Easing.bezier(0.9, 0, 0.31, 0.99),
-      });
-    },
-    [memoizedColor]
-  );
-
-  useEffect(() => {
-    const timeout_2 = setTimeout(() => {
-      startColor.value = memoizedColor;
-      startWidth.value = targetWidth.value;
-    }, ANIMATION_DURATION);
-
-    return () => {
-      clearTimeout(timeout_2);
-    };
-  }, [memoizedColor, memoizedItem]);
-
-  /**
-   * ANIMATED STYLES
-   */
-  const animatedAverageStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.primary, endColor.value.primary]
-    ),
-  }));
-
-  const animatedPrimaryStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.primary, endColor.value.primary]
-    ),
-  }));
-
-  const animatedWidthStyle = useAnimatedStyle(() => ({
-    width: `${interpolate(
-      widthProgress.value,
-      [0, 1],
-      [startWidth.value, targetWidth.value]
-    )}%`,
-  }));
-
-  const animatedTextStyle = useAnimatedStyle(() => ({
-    color: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.text, endColor.value.text]
-    ),
-  }));
-  /**
-   * *********************
-   */
-
   return (
-    <View>
-      <TouchableOpacity
-        accessibilityLabel="Play button"
-        accessibilityHint="Tap to play the media"
-        onPress={onPress}
-        className="relative"
-        {...props}
-      >
-        <View className="absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden">
-          <Animated.View
-            style={[
-              animatedPrimaryStyle,
-              animatedWidthStyle,
-              {
-                height: "100%",
-              },
-            ]}
-          />
+    <Button
+      onPress={onPress}
+      iconRight={
+        <View className="flex flex-row items-center space-x-2">
+          <Ionicons name="play-circle" size={24} color="white" />
+          {client && <Feather name="cast" size={22} color="white" />}
         </View>
-
-        <Animated.View
-          style={[animatedAverageStyle, { opacity: 0.5 }]}
-          className="absolute w-full h-full top-0 left-0 rounded-xl"
-        />
-        <View
-          style={{
-            borderWidth: 1,
-            borderColor: colorAtom.primary,
-            borderStyle: "solid",
-          }}
-          className="flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full "
-        >
-          <View className="flex flex-row items-center space-x-2">
-            <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
-              {runtimeTicksToMinutes(item?.RunTimeTicks)}
-            </Animated.Text>
-            <Animated.Text style={animatedTextStyle}>
-              <Ionicons name="play-circle" size={24} />
-            </Animated.Text>
-            {client && (
-              <Animated.Text style={animatedTextStyle}>
-                <Feather name="cast" size={22} />
-              </Animated.Text>
-            )}
-          </View>
-        </View>
-      </TouchableOpacity>
-      <View className="mt-2 flex flex-row items-center">
-        <Ionicons
-          name="information-circle"
-          size={12}
-          className=""
-          color={"#9BA1A6"}
-        />
-        <Text className="text-neutral-500 ml-1">
-          {directStream ? "Direct stream" : "Transcoded stream"}
-        </Text>
-      </View>
-    </View>
+      }
+      {...props}
+    >
+      {runtimeTicksToMinutes(item?.RunTimeTicks)}
+    </Button>
   );
 };

components/PlayedStatus.tsx

@@ -7,13 +7,9 @@ import { useQueryClient } from "@tanstack/react-query";
 import * as Haptics from "expo-haptics";
 import { useAtom } from "jotai";
 import React from "react";
-import { TouchableOpacity, View, ViewProps } from "react-native";
+import { TouchableOpacity, View } from "react-native";
 
-interface Props extends ViewProps {
-  item: BaseItemDto;
-}
-
-export const PlayedStatus: React.FC<Props> = ({ item, ...props }) => {
+export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
 
@@ -21,17 +17,11 @@ export const PlayedStatus: React.FC<Props> = ({ item, ...props }) => {
 
   const invalidateQueries = () => {
     queryClient.invalidateQueries({
-      queryKey: ["item", item.Id],
+      queryKey: ["item"],
     });
     queryClient.invalidateQueries({
       queryKey: ["resumeItems"],
     });
-    queryClient.invalidateQueries({
-      queryKey: ["continueWatching"],
-    });
-    queryClient.invalidateQueries({
-      queryKey: ["nextUp-all"],
-    });
     queryClient.invalidateQueries({
       queryKey: ["nextUp"],
     });
@@ -47,10 +37,7 @@ export const PlayedStatus: React.FC<Props> = ({ item, ...props }) => {
   };
 
   return (
-    <View
-      className=" bg-neutral-800/80 rounded-full h-10 w-10 flex items-center justify-center"
-      {...props}
-    >
+    <View>
       {item.UserData?.Played ? (
         <TouchableOpacity
           onPress={async () => {
@@ -64,7 +51,7 @@ export const PlayedStatus: React.FC<Props> = ({ item, ...props }) => {
           }}
         >
           <View className="rounded h-10 aspect-square flex items-center justify-center">
-            <Ionicons name="checkmark-circle" size={24} color="white" />
+            <Ionicons name="checkmark-circle" size={30} color="white" />
           </View>
         </TouchableOpacity>
       ) : (
@@ -80,7 +67,7 @@ export const PlayedStatus: React.FC<Props> = ({ item, ...props }) => {
           }}
         >
           <View className="rounded h-10 aspect-square flex items-center justify-center">
-            <Ionicons name="checkmark-circle-outline" size={24} color="white" />
+            <Ionicons name="checkmark-circle-outline" size={30} color="white" />
           </View>
         </TouchableOpacity>
       )}

components/Ratings.tsx

@@ -5,13 +5,12 @@ import { Ionicons } from "@expo/vector-icons";
 import { Image } from "expo-image";
 
 interface Props extends ViewProps {
-  item?: BaseItemDto | null;
+  item: BaseItemDto;
 }
 
-export const Ratings: React.FC<Props> = ({ item, ...props }) => {
-  if (!item) return null;
+export const Ratings: React.FC<Props> = ({ item }) => {
   return (
-    <View className="flex flex-row items-center mt-2 space-x-2" {...props}>
+    <View className="flex flex-row items-center justify-center mt-2 space-x-2">
       {item.OfficialRating && (
         <Badge text={item.OfficialRating} variant="gray" />
       )}

components/SimilarItems.tsx

@@ -6,28 +6,23 @@ import { useQuery } from "@tanstack/react-query";
 import { router } from "expo-router";
 import { useAtom } from "jotai";
 import { useMemo } from "react";
-import { ScrollView, TouchableOpacity, View, ViewProps } from "react-native";
+import { ScrollView, TouchableOpacity, View } from "react-native";
 import { Text } from "./common/Text";
 import { ItemCardText } from "./ItemCardText";
 import { Loader } from "./Loader";
-import { HorizontalScroll } from "./common/HorrizontalScroll";
-import { TouchableItemRouter } from "./common/TouchableItemRouter";
 
-interface SimilarItemsProps extends ViewProps {
-  itemId?: string | null;
-}
+type SimilarItemsProps = {
+  itemId: string;
+};
 
-export const SimilarItems: React.FC<SimilarItemsProps> = ({
-  itemId,
-  ...props
-}) => {
+export const SimilarItems: React.FC<SimilarItemsProps> = ({ itemId }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
 
   const { data: similarItems, isLoading } = useQuery<BaseItemDto[]>({
     queryKey: ["similarItems", itemId],
     queryFn: async () => {
-      if (!api || !user?.Id || !itemId) return [];
+      if (!api || !user?.Id) return [];
       const response = await getLibraryApi(api).getSimilarItems({
         itemId,
         userId: user.Id,
@@ -46,26 +41,29 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
   );
 
   return (
-    <View {...props}>
-      <Text className="px-4 text-lg font-bold mb-2">Similar items</Text>
-      <HorizontalScroll
-        data={movies}
-        loading={isLoading}
-        height={247}
-        noItemsText="No similar items found"
-        renderItem={(item: BaseItemDto, idx: number) => (
-          <TouchableItemRouter
-            key={idx}
-            item={item}
-            className="flex flex-col w-28"
-          >
-            <View>
-              <MoviePoster item={item} />
-              <ItemCardText item={item} />
-            </View>
-          </TouchableItemRouter>
-        )}
-      />
+    <View>
+      <Text className="px-4 text-2xl font-bold mb-2">Similar items</Text>
+      {isLoading ? (
+        <View className="my-12">
+          <Loader />
+        </View>
+      ) : (
+        <ScrollView horizontal>
+          <View className="px-4 flex flex-row gap-x-2">
+            {movies.map((item) => (
+              <TouchableOpacity
+                key={item.Id}
+                onPress={() => router.push(`/items/${item.Id}`)}
+                className="flex flex-col w-32"
+              >
+                <MoviePoster item={item} />
+                <ItemCardText item={item} />
+              </TouchableOpacity>
+            ))}
+          </View>
+        </ScrollView>
+      )}
+      {movies.length === 0 && <Text className="px-4">No similar items</Text>}
     </View>
   );
 };

components/SubtitleTrackSelector.tsx

@@ -2,77 +2,62 @@ import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { atom, useAtom } from "jotai";
-import {
-  BaseItemDto,
-  MediaSourceInfo,
-} from "@jellyfin/sdk/lib/generated-client/models";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useEffect, useMemo } from "react";
 import { MediaStream } from "@jellyfin/sdk/lib/generated-client/models";
 import { tc } from "@/utils/textTools";
-import { useSettings } from "@/utils/atoms/settings";
 
 interface Props extends React.ComponentProps<typeof View> {
-  source: MediaSourceInfo;
+  item: BaseItemDto;
   onChange: (value: number) => void;
   selected: number;
 }
 
 export const SubtitleTrackSelector: React.FC<Props> = ({
-  source,
+  item,
   onChange,
   selected,
   ...props
 }) => {
-  const [settings] = useSettings();
-
   const subtitleStreams = useMemo(
-    () => source.MediaStreams?.filter((x) => x.Type === "Subtitle") ?? [],
-    [source]
+    () =>
+      item.MediaSources?.[0].MediaStreams?.filter(
+        (x) => x.Type === "Subtitle",
+      ) ?? [],
+    [item],
   );
 
   const selectedSubtitleSteam = useMemo(
     () => subtitleStreams.find((x) => x.Index === selected),
-    [subtitleStreams, selected]
+    [subtitleStreams, selected],
   );
 
   useEffect(() => {
-    // const index = source.DefaultAudioStreamIndex;
-    // if (index !== undefined && index !== null) {
-    //   onChange(index);
-    //   return;
-    // }
-    const defaultSubIndex = subtitleStreams?.find(
-      (x) => x.Language === settings?.defaultSubtitleLanguage?.value
-    )?.Index;
-    if (defaultSubIndex !== undefined && defaultSubIndex !== null) {
-      onChange(defaultSubIndex);
-      return;
+    const index = item.MediaSources?.[0].DefaultSubtitleStreamIndex;
+    if (index !== undefined && index !== null) {
+      onChange(index);
+    } else {
+      onChange(-1);
     }
-
-    onChange(-1);
-  }, [subtitleStreams, settings]);
+  }, []);
 
   if (subtitleStreams.length === 0) return null;
 
   return (
-    <View
-      className="flex col shrink justify-start place-self-start items-start"
-      style={{
-        minWidth: 60,
-        maxWidth: 200,
-      }}
-    >
+    <View className="flex flex-row items-center justify-between" {...props}>
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
-          <View className="flex flex-col " {...props}>
-            <Text className="opacity-50 mb-1 text-xs">Subtitle</Text>
-            <TouchableOpacity className="bg-neutral-900  h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
-              <Text className=" ">
-                {selectedSubtitleSteam
-                  ? tc(selectedSubtitleSteam?.DisplayTitle, 7)
-                  : "None"}
-              </Text>
-            </TouchableOpacity>
+          <View className="flex flex-col mb-2">
+            <Text className="opacity-50 mb-1 text-xs">Subtitles</Text>
+            <View className="flex flex-row">
+              <TouchableOpacity className="bg-neutral-900 max-w-32 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
+                <Text className="">
+                  {selectedSubtitleSteam
+                    ? tc(selectedSubtitleSteam?.DisplayTitle, 13)
+                    : "None"}
+                </Text>
+              </TouchableOpacity>
+            </View>
           </View>
         </DropdownMenu.Trigger>
         <DropdownMenu.Content
@@ -84,7 +69,7 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
           collisionPadding={8}
           sideOffset={8}
         >
-          <DropdownMenu.Label>Subtitle tracks</DropdownMenu.Label>
+          <DropdownMenu.Label>Subtitles</DropdownMenu.Label>
           <DropdownMenu.Item
             key={"-1"}
             onSelect={() => {

components/common/HeaderBackButton.tsx

@@ -1,60 +0,0 @@
-import {
-  Platform,
-  TouchableOpacity,
-  TouchableOpacityProps,
-  View,
-  ViewProps,
-} from "react-native";
-import { Text } from "@/components/common/Text";
-import { useRouter } from "expo-router";
-import { Ionicons } from "@expo/vector-icons";
-import { BlurView, BlurViewProps } from "expo-blur";
-
-interface Props extends BlurViewProps {
-  background?: "blur" | "transparent";
-  touchableOpacityProps?: TouchableOpacityProps;
-}
-
-export const HeaderBackButton: React.FC<Props> = ({
-  background = "transparent",
-  touchableOpacityProps,
-  ...props
-}) => {
-  const router = useRouter();
-
-  if (background === "transparent" && Platform.OS !== "android")
-    return (
-      <BlurView
-        {...props}
-        intensity={100}
-        className="overflow-hidden rounded-full p-2"
-      >
-        <TouchableOpacity
-          onPress={() => router.back()}
-          {...touchableOpacityProps}
-        >
-          <Ionicons
-            className="drop-shadow-2xl"
-            name="arrow-back"
-            size={24}
-            color="white"
-          />
-        </TouchableOpacity>
-      </BlurView>
-    );
-
-  return (
-    <TouchableOpacity
-      onPress={() => router.back()}
-      className=" bg-neutral-800/80 rounded-full p-2"
-      {...touchableOpacityProps}
-    >
-      <Ionicons
-        className="drop-shadow-2xl"
-        name="arrow-back"
-        size={24}
-        color="white"
-      />
-    </TouchableOpacity>
-  );
-};

components/common/HorrizontalScroll.tsx

@@ -1,19 +1,14 @@
-import { FlashList, FlashListProps } from "@shopify/flash-list";
-import React, { forwardRef, useImperativeHandle, useRef } from "react";
-import { View, ViewStyle } from "react-native";
+import React, { useEffect } from "react";
+import { ScrollView, ScrollViewProps, View, ViewStyle } from "react-native";
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from "react-native-reanimated";
+import { Loader } from "../Loader";
 import { Text } from "./Text";
 
-type PartialExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
-
-export interface HorizontalScrollRef {
-  scrollToIndex: (index: number, viewOffset: number) => void;
-}
-
-interface HorizontalScrollProps<T>
-  extends PartialExcept<
-    Omit<FlashListProps<T>, "renderItem">,
-    "estimatedItemSize"
-  > {
+interface HorizontalScrollProps<T> extends ScrollViewProps {
   data?: T[] | null;
   renderItem: (item: T, index: number) => React.ReactNode;
   containerStyle?: ViewStyle;
@@ -21,84 +16,73 @@ interface HorizontalScrollProps<T>
   loadingContainerStyle?: ViewStyle;
   height?: number;
   loading?: boolean;
-  extraData?: any;
-  noItemsText?: string;
 }
 
-export const HorizontalScroll = forwardRef<
-  HorizontalScrollRef,
-  HorizontalScrollProps<any>
->(
-  <T,>(
-    {
-      data = [],
-      renderItem,
-      containerStyle,
-      contentContainerStyle,
-      loadingContainerStyle,
-      loading = false,
-      height = 164,
-      extraData,
-      noItemsText,
-      ...props
-    }: HorizontalScrollProps<T>,
-    ref: React.ForwardedRef<HorizontalScrollRef>
-  ) => {
-    const flashListRef = useRef<FlashList<T>>(null);
+export function HorizontalScroll<T>({
+  data = [],
+  renderItem,
+  containerStyle,
+  contentContainerStyle,
+  loadingContainerStyle,
+  loading = false,
+  height = 164,
+  ...props
+}: HorizontalScrollProps<T>): React.ReactElement {
+  const animatedOpacity = useSharedValue(0);
+  const animatedStyle1 = useAnimatedStyle(() => {
+    return {
+      opacity: withTiming(animatedOpacity.value, { duration: 250 }),
+    };
+  });
 
-    useImperativeHandle(ref!, () => ({
-      scrollToIndex: (index: number, viewOffset: number) => {
-        flashListRef.current?.scrollToIndex({
-          index,
-          animated: true,
-          viewPosition: 0,
-          viewOffset,
-        });
-      },
-    }));
+  useEffect(() => {
+    if (data) {
+      animatedOpacity.value = 1;
+    }
+  }, [data]);
 
-    const renderFlashListItem = ({
-      item,
-      index,
-    }: {
-      item: T;
-      index: number;
-    }) => (
-      <View className="mr-2">
-        <React.Fragment>{renderItem(item, index)}</React.Fragment>
+  if (data === undefined || data === null || loading) {
+    return (
+      <View
+        style={[
+          {
+            flex: 1,
+            justifyContent: "center",
+            alignItems: "center",
+          },
+          loadingContainerStyle,
+        ]}
+      >
+        <Loader />
       </View>
     );
+  }
 
-    if (!data || loading) {
-      return (
-        <View className="px-4 mb-2">
-          <View className="bg-neutral-950 h-24 w-full rounded-md mb-2"></View>
-          <View className="bg-neutral-950 h-10 w-full rounded-md mb-1"></View>
-        </View>
-      );
-    }
-
-    return (
-      <FlashList<T>
-        ref={flashListRef}
-        data={data}
-        extraData={extraData}
-        renderItem={renderFlashListItem}
-        horizontal
-        estimatedItemSize={200}
-        showsHorizontalScrollIndicator={false}
-        contentContainerStyle={{
-          paddingHorizontal: 16,
-          ...contentContainerStyle,
-        }}
-        ListEmptyComponent={() => (
+  return (
+    <ScrollView
+      horizontal
+      style={containerStyle}
+      contentContainerStyle={contentContainerStyle}
+      showsHorizontalScrollIndicator={false}
+      {...props}
+    >
+      <Animated.View
+        className={`
+        flex flex-row px-4
+      `}
+        style={[animatedStyle1]}
+      >
+        {data.map((item, index) => (
+          <View className="mr-2" key={index}>
+            <React.Fragment>{renderItem(item, index)}</React.Fragment>
+          </View>
+        ))}
+        {data.length === 0 && (
           <View className="flex-1 justify-center items-center">
-            <Text className="text-center text-gray-500">
-              {noItemsText || "No data available"}
-            </Text>
+            <Text className="text-center text-gray-500">No data available</Text>
           </View>
         )}
-      />
-    );
-  }
-);
+      </Animated.View>
+    </ScrollView>
+  );
+}

components/common/InfiniteHorrizontalScroll.tsx

@@ -1,13 +1,11 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import React, { useEffect } from "react";
 import {
-  BaseItemDto,
-  BaseItemDtoQueryResult,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { FlashList, FlashListProps } from "@shopify/flash-list";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
-import React, { useEffect, useMemo } from "react";
-import { View, ViewStyle } from "react-native";
+  NativeScrollEvent,
+  ScrollView,
+  ScrollViewProps,
+  View,
+  ViewStyle,
+} from "react-native";
 import Animated, {
   useAnimatedStyle,
   useSharedValue,
@@ -15,9 +13,16 @@ import Animated, {
 } from "react-native-reanimated";
 import { Loader } from "../Loader";
 import { Text } from "./Text";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import {
+  BaseItemDto,
+  BaseItemDtoQueryResult,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useNavigation } from "expo-router";
+import { useAtom } from "jotai";
 
-interface HorizontalScrollProps
-  extends Omit<FlashListProps<BaseItemDto>, "renderItem" | "data" | "style"> {
+interface HorizontalScrollProps extends ScrollViewProps {
   queryFn: ({
     pageParam,
   }: {
@@ -33,6 +38,18 @@ interface HorizontalScrollProps
   loading?: boolean;
 }
 
+const isCloseToBottom = ({
+  layoutMeasurement,
+  contentOffset,
+  contentSize,
+}: NativeScrollEvent) => {
+  const paddingToBottom = 50;
+  return (
+    layoutMeasurement.height + contentOffset.y >=
+    contentSize.height - paddingToBottom
+  );
+};
+
 export function InfiniteHorizontalScroll({
   queryFn,
   queryKey,
@@ -47,6 +64,7 @@ export function InfiniteHorizontalScroll({
 }: HorizontalScrollProps): React.ReactElement {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
+  const navigation = useNavigation();
 
   const animatedOpacity = useSharedValue(0);
   const animatedStyle1 = useAnimatedStyle(() => {
@@ -55,7 +73,7 @@ export function InfiniteHorizontalScroll({
     };
   });
 
-  const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
+  const { data, isFetching, fetchNextPage } = useInfiniteQuery({
     queryKey,
     queryFn,
     getNextPageParam: (lastPage, pages) => {
@@ -82,13 +100,6 @@ export function InfiniteHorizontalScroll({
     enabled: !!api && !!user?.Id,
   });
 
-  const flatData = useMemo(() => {
-    return (
-      (data?.pages.flatMap((p) => p?.Items).filter(Boolean) as BaseItemDto[]) ||
-      []
-    );
-  }, [data]);
-
   useEffect(() => {
     if (data) {
       animatedOpacity.value = 1;
@@ -113,34 +124,41 @@ export function InfiniteHorizontalScroll({
   }
 
   return (
-    <Animated.View style={[containerStyle, animatedStyle1]}>
-      <FlashList
-        data={flatData}
-        renderItem={({ item, index }) => (
-          <View className="mr-2">
-            <React.Fragment>{renderItem(item, index)}</React.Fragment>
-          </View>
-        )}
-        estimatedItemSize={height}
-        horizontal
-        onEndReached={() => {
-          if (hasNextPage) {
-            fetchNextPage();
-          }
-        }}
-        onEndReachedThreshold={0.5}
-        contentContainerStyle={{
-          paddingHorizontal: 16,
-          ...contentContainerStyle,
-        }}
-        showsHorizontalScrollIndicator={false}
-        ListEmptyComponent={
+    <ScrollView
+      horizontal
+      onScroll={({ nativeEvent }) => {
+        if (isCloseToBottom(nativeEvent)) {
+          fetchNextPage();
+        }
+      }}
+      scrollEventThrottle={400}
+      style={containerStyle}
+      contentContainerStyle={contentContainerStyle}
+      showsHorizontalScrollIndicator={false}
+      {...props}
+    >
+      <Animated.View
+        className={`
+        flex flex-row px-4
+      `}
+        style={[animatedStyle1]}
+      >
+        {data?.pages
+          .flatMap((page) => page?.Items)
+          .map(
+            (item, index) =>
+              item && (
+                <View className="mr-2" key={index}>
+                  <React.Fragment>{renderItem(item, index)}</React.Fragment>
+                </View>
+              )
+          )}
+        {data?.pages.flatMap((page) => page?.Items).length === 0 && (
           <View className="flex-1 justify-center items-center">
             <Text className="text-center text-gray-500">No data available</Text>
           </View>
-        }
-        {...props}
-      />
-    </Animated.View>
+        )}
+      </Animated.View>
+    </ScrollView>
   );
 }

components/common/ItemImage.tsx

@@ -1,85 +0,0 @@
-import { useImageColors } from "@/hooks/useImageColors";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getItemImage } from "@/utils/getItemImage";
-import { Ionicons } from "@expo/vector-icons";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { Image, ImageProps, ImageSource } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { View } from "react-native";
-
-interface Props extends ImageProps {
-  item: BaseItemDto;
-  variant?:
-    | "Primary"
-    | "Backdrop"
-    | "ParentBackdrop"
-    | "ParentLogo"
-    | "Logo"
-    | "AlbumPrimary"
-    | "SeriesPrimary"
-    | "Screenshot"
-    | "Thumb";
-  quality?: number;
-  width?: number;
-  onError?: () => void;
-}
-
-export const ItemImage: React.FC<Props> = ({
-  item,
-  variant = "Primary",
-  quality = 90,
-  width = 1000,
-  onError,
-  ...props
-}) => {
-  const [api] = useAtom(apiAtom);
-
-  const source = useMemo(() => {
-    if (!api) {
-      onError && onError();
-      return;
-    }
-    return getItemImage({
-      item,
-      api,
-      variant,
-      quality,
-      width,
-    });
-  }, [api, item, quality, variant, width]);
-
-  // return placeholder icon if no source
-  if (!source?.uri)
-    return (
-      <View
-        {...props}
-        className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
-      >
-        <Ionicons
-          name="image-outline"
-          size={24}
-          color="white"
-          style={{ opacity: 0.4 }}
-        />
-      </View>
-    );
-
-  return (
-    <Image
-      cachePolicy={"memory-disk"}
-      transition={300}
-      placeholder={{
-        blurhash: source?.blurhash,
-      }}
-      style={{
-        width: "100%",
-        height: "100%",
-      }}
-      source={{
-        uri: source?.uri,
-      }}
-      {...props}
-    />
-  );
-};

components/common/TouchableItemRouter.tsx

@@ -1,71 +1,61 @@
+import {
+  TouchableOpacity,
+  TouchableOpacityProps,
+  View,
+  ViewProps,
+} from "react-native";
+import { Text } from "@/components/common/Text";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import * as Haptics from "expo-haptics";
-import { useRouter, useSegments } from "expo-router";
 import { PropsWithChildren } from "react";
-import { TouchableOpacity, TouchableOpacityProps } from "react-native";
+import { useRouter } from "expo-router";
+import * as Haptics from "expo-haptics";
 
 interface Props extends TouchableOpacityProps {
   item: BaseItemDto;
 }
 
-export const itemRouter = (item: BaseItemDto, from: string) => {
-  if (item.Type === "Series") {
-    return `/(auth)/(tabs)/${from}/series/${item.Id}`;
-  }
-
-  if (item.Type === "MusicAlbum") {
-    return `/(auth)/(tabs)/${from}/albums/${item.Id}`;
-  }
-
-  if (item.Type === "Audio") {
-    return `/(auth)/(tabs)/${from}/albums/${item.AlbumId}`;
-  }
-
-  if (item.Type === "MusicArtist") {
-    return `/(auth)/(tabs)/${from}/artists/${item.Id}`;
-  }
-
-  if (item.Type === "Person") {
-    return `/(auth)/(tabs)/${from}/actors/${item.Id}`;
-  }
-
-  if (item.Type === "BoxSet") {
-    return `/(auth)/(tabs)/${from}/collections/${item.Id}`;
-  }
-
-  if (item.Type === "UserView") {
-    return `/(auth)/(tabs)/${from}/collections/${item.Id}`;
-  }
-
-  if (item.Type === "CollectionFolder") {
-    return `/(auth)/(tabs)/(libraries)/${item.Id}`;
-  }
-
-  return `/(auth)/(tabs)/${from}/items/page?id=${item.Id}`;
-};
-
 export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
   item,
   children,
   ...props
 }) => {
   const router = useRouter();
-  const segments = useSegments();
+  return (
+    <TouchableOpacity
+      onPress={() => {
+        Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
 
-  const from = segments[2];
+        if (item.Type === "Series") {
+          router.push(`/series/${item.Id}`);
+          return;
+        }
+        if (item.Type === "Episode") {
+          router.push(`/items/${item.Id}`);
+          return;
+        }
+        if (item.Type === "MusicAlbum") {
+          router.push(`/albums/${item.Id}`);
+          return;
+        }
+        if (item.Type === "Audio") {
+          router.push(`/albums/${item.AlbumId}`);
+          return;
+        }
+        if (item.Type === "MusicArtist") {
+          router.push(`/artists/${item.Id}/page`);
+          return;
+        }
 
-  if (from === "(home)" || from === "(search)" || from === "(libraries)")
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-          const url = itemRouter(item, from);
-          // @ts-ignore
-          router.push(url);
-        }}
-        {...props}
-      >
-        {children}
-      </TouchableOpacity>
-    );
+        if (item.Type === "BoxSet") {
+          router.push(`/collections/${item.Id}`);
+          return;
+        }
+
+        router.push(`/items/${item.Id}`);
+      }}
+      {...props}
+    >
+      {children}
+    </TouchableOpacity>
+  );
 };

components/common/VerticalSkeleton.tsx

@@ -1,29 +0,0 @@
-import { View, ViewProps } from "react-native";
-import { Text } from "@/components/common/Text";
-
-interface Props extends ViewProps {
-  index: number;
-}
-
-export const VerticalSkeleton: React.FC<Props> = ({ index, ...props }) => {
-  return (
-    <View
-      key={index}
-      style={{
-        width: "32%",
-      }}
-      className="flex flex-col"
-      {...props}
-    >
-      <View
-        style={{
-          aspectRatio: "10/15",
-        }}
-        className="w-full bg-neutral-800 mb-2 rounded-lg"
-      ></View>
-      <View className="h-2 bg-neutral-800 rounded-full mb-1"></View>
-      <View className="h-2 bg-neutral-800 rounded-full mb-1"></View>
-      <View className="h-2 bg-neutral-800 rounded-full mb-2 w-1/2"></View>
-    </View>
-  );
-};

components/downloads/ActiveDownloads.tsx

@@ -1,191 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { JobStatus } from "@/utils/optimize-server";
-import { formatTimeString } from "@/utils/time";
-import { Ionicons } from "@expo/vector-icons";
-import { checkForExistingDownloads } from "@kesha-antonov/react-native-background-downloader";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useRouter } from "expo-router";
-import { FFmpegKit } from "ffmpeg-kit-react-native";
-import { useAtom } from "jotai";
-import {
-  ActivityIndicator,
-  TouchableOpacity,
-  TouchableOpacityProps,
-  View,
-  ViewProps,
-} from "react-native";
-import { toast } from "sonner-native";
-import { Button } from "../Button";
-import { Image } from "expo-image";
-import { useMemo } from "react";
-import { storage } from "@/utils/mmkv";
-
-interface Props extends ViewProps {}
-
-export const ActiveDownloads: React.FC<Props> = ({ ...props }) => {
-  const { processes, startDownload } = useDownload();
-  if (processes?.length === 0)
-    return (
-      <View {...props} className="bg-neutral-900 p-4 rounded-2xl">
-        <Text className="text-lg font-bold">Active download</Text>
-        <Text className="opacity-50">No active downloads</Text>
-      </View>
-    );
-
-  return (
-    <View {...props} className="bg-neutral-900 p-4 rounded-2xl">
-      <Text className="text-lg font-bold mb-2">Active downloads</Text>
-      <View className="space-y-2">
-        {processes?.map((p) => (
-          <DownloadCard key={p.id} process={p} />
-        ))}
-      </View>
-    </View>
-  );
-};
-
-interface DownloadCardProps extends TouchableOpacityProps {
-  process: JobStatus;
-}
-
-const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
-  const { processes, startDownload } = useDownload();
-  const router = useRouter();
-  const { removeProcess, setProcesses } = useDownload();
-  const [settings] = useSettings();
-  const queryClient = useQueryClient();
-
-  const cancelJobMutation = useMutation({
-    mutationFn: async (id: string) => {
-      if (!process) throw new Error("No active download");
-
-      if (settings?.downloadMethod === "optimized") {
-        try {
-          const tasks = await checkForExistingDownloads();
-          for (const task of tasks) {
-            if (task.id === id) {
-              task.stop();
-            }
-          }
-        } catch (e) {
-          throw e;
-        } finally {
-          await removeProcess(id);
-          await queryClient.refetchQueries({ queryKey: ["jobs"] });
-        }
-      } else {
-        FFmpegKit.cancel();
-        setProcesses((prev) => prev.filter((p) => p.id !== id));
-      }
-    },
-    onSuccess: () => {
-      toast.success("Download canceled");
-    },
-    onError: (e) => {
-      console.log(e);
-      toast.error("Could not cancel download");
-    },
-  });
-
-  const eta = (p: JobStatus) => {
-    if (!p.speed || !p.progress) return null;
-
-    const length = p?.item?.RunTimeTicks || 0;
-    const timeLeft = (length - length * (p.progress / 100)) / p.speed;
-    return formatTimeString(timeLeft, true);
-  };
-
-  const base64Image = useMemo(() => {
-    return storage.getString(process.item.Id!);
-  }, []);
-
-  return (
-    <TouchableOpacity
-      onPress={() => router.push(`/(auth)/items/page?id=${process.item.Id}`)}
-      className="relative bg-neutral-900 border border-neutral-800 rounded-2xl overflow-hidden"
-      {...props}
-    >
-      {(process.status === "optimizing" ||
-        process.status === "downloading") && (
-        <View
-          className={`
-        bg-purple-600 h-1 absolute bottom-0 left-0
-        `}
-          style={{
-            width: process.progress
-              ? `${Math.max(5, process.progress)}%`
-              : "5%",
-          }}
-        ></View>
-      )}
-      <View className="px-3 py-1.5 flex flex-col w-full">
-        <View className="flex flex-row items-center w-full">
-          {base64Image && (
-            <View className="w-14 aspect-[10/15] rounded-lg overflow-hidden mr-4">
-              <Image
-                source={{
-                  uri: `data:image/jpeg;base64,${base64Image}`,
-                }}
-                style={{
-                  width: "100%",
-                  height: "100%",
-                  resizeMode: "cover",
-                }}
-              />
-            </View>
-          )}
-          <View className="shrink mb-1">
-            <Text className="text-xs opacity-50">{process.item.Type}</Text>
-            <Text className="font-semibold shrink">{process.item.Name}</Text>
-            <Text className="text-xs opacity-50">
-              {process.item.ProductionYear}
-            </Text>
-            <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
-              {process.progress === 0 ? (
-                <ActivityIndicator size={"small"} color={"white"} />
-              ) : (
-                <Text className="text-xs">{process.progress.toFixed(0)}%</Text>
-              )}
-              {process.speed && (
-                <Text className="text-xs">{process.speed?.toFixed(2)}x</Text>
-              )}
-              {eta(process) && (
-                <Text className="text-xs">ETA {eta(process)}</Text>
-              )}
-            </View>
-
-            <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
-              <Text className="text-xs capitalize">{process.status}</Text>
-            </View>
-          </View>
-          <TouchableOpacity
-            disabled={cancelJobMutation.isPending}
-            onPress={() => cancelJobMutation.mutate(process.id)}
-            className="ml-auto"
-          >
-            {cancelJobMutation.isPending ? (
-              <ActivityIndicator size="small" color="white" />
-            ) : (
-              <Ionicons name="close" size={24} color="red" />
-            )}
-          </TouchableOpacity>
-        </View>
-        {process.status === "completed" && (
-          <View className="flex flex-row mt-4 space-x-4">
-            <Button
-              onPress={() => {
-                startDownload(process);
-              }}
-              className="w-full"
-            >
-              Download now
-            </Button>
-          </View>
-        )}
-      </View>
-    </TouchableOpacity>
-  );
-};

components/downloads/EpisodeCard.tsx

@@ -1,41 +1,48 @@
+import React, { useCallback } from "react";
+import { TouchableOpacity } from "react-native";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import * as ContextMenu from "zeego/context-menu";
 import * as Haptics from "expo-haptics";
-import React, { useCallback, useMemo, useRef } from "react";
-import { TouchableOpacity, View } from "react-native";
-import {
-  ActionSheetProvider,
-  useActionSheet,
-} from "@expo/react-native-action-sheet";
+import * as FileSystem from "expo-file-system";
+import { useAtom } from "jotai";
 
-import { useFileOpener } from "@/hooks/useDownloadedFileOpener";
 import { Text } from "../common/Text";
-import { useDownload } from "@/providers/DownloadProvider";
-import { storage } from "@/utils/mmkv";
-import { Image } from "expo-image";
-import { ItemCardText } from "../ItemCardText";
-import { Ionicons } from "@expo/vector-icons";
+import { useFiles } from "@/hooks/useFiles";
+import { useSettings } from "@/utils/atoms/settings";
+import {
+  currentlyPlayingItemAtom,
+  fullScreenAtom,
+  playingAtom,
+} from "@/utils/atoms/playState";
 
 interface EpisodeCardProps {
   item: BaseItemDto;
 }
 
 /**
- * EpisodeCard component displays an episode with action sheet options.
+ * EpisodeCard component displays an episode with context menu options.
  * @param {EpisodeCardProps} props - The component props.
  * @returns {React.ReactElement} The rendered EpisodeCard component.
  */
 export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
-  const { deleteFile } = useDownload();
-  const { openFile } = useFileOpener();
-  const { showActionSheetWithOptions } = useActionSheet();
+  const { deleteFile } = useFiles();
+  const [, setCurrentlyPlaying] = useAtom(currentlyPlayingItemAtom);
+  const [, setPlaying] = useAtom(playingAtom);
+  const [, setFullscreen] = useAtom(fullScreenAtom);
+  const [settings] = useSettings();
 
-  const base64Image = useMemo(() => {
-    return storage.getString(item.Id!);
-  }, []);
-
-  const handleOpenFile = useCallback(() => {
-    openFile(item);
-  }, [item, openFile]);
+  /**
+   * Handles opening the file for playback.
+   */
+  const handleOpenFile = useCallback(async () => {
+    setCurrentlyPlaying({
+      item,
+      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
+    });
+    setPlaying(true);
+    if (settings?.openFullScreenVideoPlayerByDefault === true)
+      setFullscreen(true);
+  }, [item, setCurrentlyPlaying, settings]);
 
   /**
    * Handles deleting the file with haptic feedback.
@@ -47,70 +54,43 @@ export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
     }
   }, [deleteFile, item.Id]);
 
-  const showActionSheet = useCallback(() => {
-    const options = ["Delete", "Cancel"];
-    const destructiveButtonIndex = 0;
-    const cancelButtonIndex = 1;
-
-    showActionSheetWithOptions(
-      {
-        options,
-        cancelButtonIndex,
-        destructiveButtonIndex,
-      },
-      (selectedIndex) => {
-        switch (selectedIndex) {
-          case destructiveButtonIndex:
-            // Delete
-            handleDeleteFile();
-            break;
-          case cancelButtonIndex:
-            // Cancelled
-            break;
-        }
-      }
-    );
-  }, [showActionSheetWithOptions, handleDeleteFile]);
+  const contextMenuOptions = [
+    {
+      label: "Delete",
+      onSelect: handleDeleteFile,
+      destructive: true,
+    },
+  ];
 
   return (
-    <TouchableOpacity
-      onPress={handleOpenFile}
-      onLongPress={showActionSheet}
-      className="flex flex-col"
-    >
-      {base64Image ? (
-        <View className="w-44 aspect-video rounded-lg overflow-hidden mr-2">
-          <Image
-            source={{
-              uri: `data:image/jpeg;base64,${base64Image}`,
-            }}
-            style={{
-              width: "100%",
-              height: "100%",
-              resizeMode: "cover",
-            }}
-          />
-        </View>
-      ) : (
-        <View className="w-44 aspect-video rounded-lg bg-neutral-900 mr-2 flex items-center justify-center">
-          <Ionicons
-            name="image-outline"
-            size={24}
-            color="gray"
-            className="self-center mt-16"
-          />
-        </View>
-      )}
-      <ItemCardText item={item} />
-    </TouchableOpacity>
+    <ContextMenu.Root>
+      <ContextMenu.Trigger>
+        <TouchableOpacity
+          onPress={handleOpenFile}
+          className="bg-neutral-900 border border-neutral-800 rounded-2xl p-4"
+        >
+          <Text className="font-bold">{item.Name}</Text>
+          <Text className="text-xs opacity-50">Episode {item.IndexNumber}</Text>
+        </TouchableOpacity>
+      </ContextMenu.Trigger>
+      <ContextMenu.Content
+        alignOffset={0}
+        avoidCollisions
+        collisionPadding={10}
+        loop={false}
+      >
+        {contextMenuOptions.map((option) => (
+          <ContextMenu.Item
+            key={option.label}
+            onSelect={option.onSelect}
+            destructive={option.destructive}
+          >
+            <ContextMenu.ItemTitle style={{ color: "red" }}>
+              {option.label}
+            </ContextMenu.ItemTitle>
+          </ContextMenu.Item>
+        ))}
+      </ContextMenu.Content>
+    </ContextMenu.Root>
   );
 };
-
-// Wrap the parent component with ActionSheetProvider
-export const EpisodeCardWithActionSheet: React.FC<EpisodeCardProps> = (
-  props
-) => (
-  <ActionSheetProvider>
-    <EpisodeCard {...props} />
-  </ActionSheetProvider>
-);

components/downloads/MovieCard.tsx

@@ -1,43 +1,52 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import * as Haptics from "expo-haptics";
-import React, { useCallback, useMemo } from "react";
+import React, { useCallback } from "react";
 import { TouchableOpacity, View } from "react-native";
-import {
-  ActionSheetProvider,
-  useActionSheet,
-} from "@expo/react-native-action-sheet";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import * as ContextMenu from "zeego/context-menu";
+import * as FileSystem from "expo-file-system";
+import * as Haptics from "expo-haptics";
+import { useAtom } from "jotai";
 
-import { runtimeTicksToMinutes } from "@/utils/time";
 import { Text } from "../common/Text";
+import { useFiles } from "@/hooks/useFiles";
+import { runtimeTicksToMinutes } from "@/utils/time";
 
-import { useFileOpener } from "@/hooks/useDownloadedFileOpener";
-import { useDownload } from "@/providers/DownloadProvider";
-import { storage } from "@/utils/mmkv";
-import { Image } from "expo-image";
-import { Ionicons } from "@expo/vector-icons";
-import { ItemCardText } from "../ItemCardText";
+import { useSettings } from "@/utils/atoms/settings";
+import {
+  currentlyPlayingItemAtom,
+  playingAtom,
+  fullScreenAtom,
+} from "@/utils/atoms/playState";
 
 interface MovieCardProps {
   item: BaseItemDto;
 }
 
 /**
- * MovieCard component displays a movie with action sheet options.
+ * MovieCard component displays a movie with context menu options.
  * @param {MovieCardProps} props - The component props.
  * @returns {React.ReactElement} The rendered MovieCard component.
  */
 export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
-  const { deleteFile } = useDownload();
-  const { openFile } = useFileOpener();
-  const { showActionSheetWithOptions } = useActionSheet();
+  const { deleteFile } = useFiles();
+  const [, setCurrentlyPlaying] = useAtom(currentlyPlayingItemAtom);
+  const [, setPlaying] = useAtom(playingAtom);
+  const [, setFullscreen] = useAtom(fullScreenAtom);
+  const [settings] = useSettings();
 
+  /**
+   * Handles opening the file for playback.
+   */
   const handleOpenFile = useCallback(() => {
-    openFile(item);
-  }, [item, openFile]);
-
-  const base64Image = useMemo(() => {
-    return storage.getString(item.Id!);
-  }, []);
+    console.log("Open movie file", item.Name);
+    setCurrentlyPlaying({
+      item,
+      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
+    });
+    setPlaying(true);
+    if (settings?.openFullScreenVideoPlayerByDefault === true) {
+      setFullscreen(true);
+    }
+  }, [item, setCurrentlyPlaying, setPlaying, settings]);
 
   /**
    * Handles deleting the file with haptic feedback.
@@ -49,64 +58,48 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
     }
   }, [deleteFile, item.Id]);
 
-  const showActionSheet = useCallback(() => {
-    const options = ["Delete", "Cancel"];
-    const destructiveButtonIndex = 0;
-    const cancelButtonIndex = 1;
-
-    showActionSheetWithOptions(
-      {
-        options,
-        cancelButtonIndex,
-        destructiveButtonIndex,
-      },
-      (selectedIndex) => {
-        switch (selectedIndex) {
-          case destructiveButtonIndex:
-            // Delete
-            handleDeleteFile();
-            break;
-          case cancelButtonIndex:
-            // Cancelled
-            break;
-        }
-      }
-    );
-  }, [showActionSheetWithOptions, handleDeleteFile]);
+  const contextMenuOptions = [
+    {
+      label: "Delete",
+      onSelect: handleDeleteFile,
+      destructive: true,
+    },
+  ];
 
   return (
-    <TouchableOpacity onPress={handleOpenFile} onLongPress={showActionSheet}>
-      {base64Image ? (
-        <View className="w-28 aspect-[10/15] rounded-lg overflow-hidden mr-2 border border-neutral-900">
-          <Image
-            source={{
-              uri: `data:image/jpeg;base64,${base64Image}`,
-            }}
-            style={{
-              width: "100%",
-              height: "100%",
-              resizeMode: "cover",
-            }}
-          />
-        </View>
-      ) : (
-        <View className="w-28 aspect-[10/15] rounded-lg bg-neutral-900 mr-2 flex items-center justify-center">
-          <Ionicons
-            name="image-outline"
-            size={24}
-            color="gray"
-            className="self-center mt-16"
-          />
-        </View>
-      )}
-      <ItemCardText item={item} />
-    </TouchableOpacity>
+    <ContextMenu.Root>
+      <ContextMenu.Trigger>
+        <TouchableOpacity
+          onPress={handleOpenFile}
+          className="bg-neutral-900 border border-neutral-800 rounded-2xl p-4"
+        >
+          <Text className="font-bold">{item.Name}</Text>
+          <View className="flex flex-col">
+            <Text className="text-xs opacity-50">{item.ProductionYear}</Text>
+            <Text className="text-xs opacity-50">
+              {runtimeTicksToMinutes(item.RunTimeTicks)}
+            </Text>
+          </View>
+        </TouchableOpacity>
+      </ContextMenu.Trigger>
+      <ContextMenu.Content
+        loop={false}
+        alignOffset={0}
+        avoidCollisions={false}
+        collisionPadding={0}
+      >
+        {contextMenuOptions.map((option) => (
+          <ContextMenu.Item
+            key={option.label}
+            onSelect={option.onSelect}
+            destructive={option.destructive}
+          >
+            <ContextMenu.ItemTitle style={{ color: "red" }}>
+              {option.label}
+            </ContextMenu.ItemTitle>
+          </ContextMenu.Item>
+        ))}
+      </ContextMenu.Content>
+    </ContextMenu.Root>
   );
 };
-
-// Wrap the parent component with ActionSheetProvider
-export const MovieCardWithActionSheet: React.FC<MovieCardProps> = (props) => (
-  <ActionSheetProvider>
-    <MovieCard {...props} />
-  </ActionSheetProvider>
-);

components/downloads/SeriesCard.tsx

@@ -1,5 +1,5 @@
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { ScrollView, View } from "react-native";
+import { View } from "react-native";
 import { EpisodeCard } from "./EpisodeCard";
 import { Text } from "../common/Text";
 import { useMemo } from "react";
@@ -22,32 +22,26 @@ export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
     );
   }, [items]);
 
-  const sortByIndex = (a: BaseItemDto, b: BaseItemDto) => {
-    return a.IndexNumber! > b.IndexNumber! ? 1 : -1;
-  };
-
   return (
     <View>
-      <View className="flex flex-row items-center justify-between px-4">
-        <Text className="text-lg font-bold shrink">{items[0].SeriesName}</Text>
+      <View className="flex flex-row items-center justify-between">
+        <Text className="text-2xl font-bold">{items[0].SeriesName}</Text>
         <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
           <Text className="text-xs font-bold">{items.length}</Text>
         </View>
       </View>
 
-      <Text className="opacity-50 mb-2 px-4">TV-Series</Text>
+      <Text className="opacity-50 mb-2">TV-Series</Text>
       {groupBySeason.map((seasonItems, seasonIndex) => (
         <View key={seasonIndex}>
-          <Text className="mb-2 font-semibold px-4">
+          <Text className="mb-2 font-semibold">
             {seasonItems[0].SeasonName}
           </Text>
-          <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-            <View className="px-4 flex flex-row">
-              {seasonItems.sort(sortByIndex)?.map((item, index) => (
-                <EpisodeCard item={item} />
-              ))}
+          {seasonItems.map((item, index) => (
+            <View className="mb-2" key={index}>
+              <EpisodeCard item={item} />
             </View>
-          </ScrollView>
+          ))}
         </View>
       ))}
     </View>

components/filters/FilterButton.tsx

@@ -1,7 +1,7 @@
 import { Text } from "@/components/common/Text";
 import { FontAwesome, Ionicons } from "@expo/vector-icons";
 import { useQuery } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { TouchableOpacity, View, ViewProps } from "react-native";
 import { FilterSheet } from "./FilterSheet";
 
@@ -23,7 +23,7 @@ export const FilterButton = <T,>({
   queryFn,
   queryKey,
   set,
-  values, // selected values
+  values,
   title,
   renderItemLabel,
   searchFilter,
@@ -34,19 +34,16 @@ export const FilterButton = <T,>({
   const [open, setOpen] = useState(false);
 
   const { data: filters } = useQuery<T[]>({
-    queryKey: ["filters", title, queryKey, collectionId],
+    queryKey: [queryKey, collectionId],
     queryFn,
     staleTime: 0,
-    enabled: !!collectionId && !!queryFn && !!queryKey,
   });
 
+  if (filters?.length === 0) return null;
+
   return (
     <>
-      <TouchableOpacity
-        onPress={() => {
-          filters?.length && setOpen(true);
-        }}
-      >
+      <TouchableOpacity onPress={() => setOpen(true)}>
         <View
           className={`
             px-3 py-1.5 rounded-full flex flex-row items-center space-x-1
@@ -55,7 +52,6 @@ export const FilterButton = <T,>({
                 ? "bg-purple-600  border border-purple-700"
                 : "bg-neutral-900 border border-neutral-900"
             }
-          ${filters?.length === 0 && "opacity-50"}
             `}
           {...props}
         >

components/filters/FilterSheet.tsx

@@ -173,7 +173,7 @@ export const FilterSheet = <T,>({
             className="mb-4 flex flex-col rounded-xl overflow-hidden"
           >
             {renderData?.map((item, index) => (
-              <View key={index}>
+              <>
                 <TouchableOpacity
                   onPress={() => {
                     if (!values.includes(item)) {
@@ -183,10 +183,11 @@ export const FilterSheet = <T,>({
                       }, 250);
                     }
                   }}
+                  key={`${index}`}
                   className=" bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between"
                 >
                   <Text>{renderItemLabel(item)}</Text>
-                  {values.some((i) => i === item) ? (
+                  {values.includes(item) ? (
                     <Ionicons name="radio-button-on" size={24} color="white" />
                   ) : (
                     <Ionicons name="radio-button-off" size={24} color="white" />
@@ -198,7 +199,7 @@ export const FilterSheet = <T,>({
                   }}
                   className="h-1 divide-neutral-700 "
                 ></View>
-              </View>
+              </>
             ))}
           </View>
           {data.length < (_data?.length || 0) && (

components/filters/ResetFiltersButton.tsx

@@ -29,7 +29,7 @@ export const ResetFiltersButton: React.FC<Props> = ({ ...props }) => {
         setSelectedTags([]);
         setSelectedYears([]);
       }}
-      className="bg-purple-600 rounded-full w-[30px] h-[30px] flex items-center justify-center mr-1"
+      className="bg-purple-600 rounded-full w-8 h-8 flex items-center justify-center"
       {...props}
     >
       <Ionicons name="close" size={20} color="white" />

components/home/LargeMovieCarousel.tsx

@@ -4,29 +4,25 @@ import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { Image } from "expo-image";
+import { useRouter } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useMemo } from "react";
-import { Dimensions, TouchableOpacity, View, ViewProps } from "react-native";
-import Animated, {
-  runOnJS,
-  useSharedValue,
-  withTiming,
-} from "react-native-reanimated";
+import React, { useMemo } from "react";
+import { Dimensions, View, ViewProps } from "react-native";
+import { useSharedValue } from "react-native-reanimated";
 import Carousel, {
   ICarouselInstance,
   Pagination,
 } from "react-native-reanimated-carousel";
-import { itemRouter, TouchableItemRouter } from "../common/TouchableItemRouter";
+import { TouchableItemRouter } from "../common/TouchableItemRouter";
 import { Loader } from "../Loader";
-import { Gesture, GestureDetector } from "react-native-gesture-handler";
-import { useRouter, useSegments } from "expo-router";
-import * as Haptics from "expo-haptics";
 
 interface Props extends ViewProps {}
 
 export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
+  const router = useRouter();
+  const queryClient = useQueryClient();
   const [settings] = useSettings();
 
   const ref = React.useRef<ICarouselInstance>(null);
@@ -51,7 +47,7 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
       return response.data.Items?.[0].Id || null;
     },
     enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
-    staleTime: 60 * 1000,
+    staleTime: 0,
   });
 
   const onPressPagination = (index: number) => {
@@ -79,19 +75,25 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
       return response.data.Items || [];
     },
     enabled: !!api && !!user?.Id && !!sf_carousel,
-    staleTime: 60 * 1000,
+    staleTime: 0,
   });
 
   const width = Dimensions.get("screen").width;
 
-  if (l1 || l2) return null;
+  if (l1 || l2)
+    return (
+      <View className="h-[242px] flex items-center justify-center">
+        <Loader />
+      </View>
+    );
+
   if (!popularItems) return null;
 
   return (
     <View className="flex flex-col items-center" {...props}>
       <Carousel
         autoPlay={true}
-        autoPlayInterval={3000}
+        autoPlayInterval={2000}
         loop={true}
         ref={ref}
         width={width}
@@ -120,8 +122,6 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
 
 const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
   const [api] = useAtom(apiAtom);
-  const router = useRouter();
-  const screenWidth = Dimensions.get("screen").width;
 
   const uri = useMemo(() => {
     if (!api) return null;
@@ -129,8 +129,8 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
     return getBackdropUrl({
       api,
       item,
-      quality: 70,
-      width: Math.floor(screenWidth * 0.8 * 2),
+      quality: 90,
+      width: 1000,
     });
   }, [api, item]);
 
@@ -139,41 +139,11 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
     return getLogoImageUrlById({ api, item, height: 100 });
   }, [item]);
 
-  const segments = useSegments();
-  const from = segments[2];
-
-  const opacity = useSharedValue(1);
-
-  const handleRoute = useCallback(() => {
-    if (!from) return;
-    const url = itemRouter(item, from);
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-    // @ts-ignore
-    if (url) router.push(url);
-  }, [item, from]);
-
-  const tap = Gesture.Tap()
-    .maxDuration(2000)
-    .onBegin(() => {
-      opacity.value = withTiming(0.5, { duration: 100 });
-    })
-    .onEnd(() => {
-      runOnJS(handleRoute)();
-    })
-    .onFinalize(() => {
-      opacity.value = withTiming(1, { duration: 100 });
-    });
-
   if (!uri || !logoUri) return null;
 
   return (
-    <GestureDetector gesture={tap}>
-      <Animated.View
-        style={{
-          opacity: opacity,
-        }}
-        className="px-4"
-      >
+    <TouchableItemRouter item={item}>
+      <View className="px-4">
         <View className="relative flex justify-center rounded-2xl overflow-hidden border border-neutral-800">
           <Image
             source={{
@@ -199,7 +169,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
             />
           </View>
         </View>
-      </Animated.View>
-    </GestureDetector>
+      </View>
+    </TouchableItemRouter>
   );
 };

components/home/ScrollingCollectionList.tsx

@@ -1,109 +1,60 @@
 import { Text } from "@/components/common/Text";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  useQuery,
-  type QueryFunction,
-  type QueryKey,
-} from "@tanstack/react-query";
-import { ScrollView, View, ViewProps } from "react-native";
+import { View, ViewProps } from "react-native";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { ItemCardText } from "../ItemCardText";
 import { HorizontalScroll } from "../common/HorrizontalScroll";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
-import SeriesPoster from "../posters/SeriesPoster";
-import { FlashList } from "@shopify/flash-list";
 
 interface Props extends ViewProps {
-  title?: string | null;
+  title: string;
+  loading?: boolean;
   orientation?: "horizontal" | "vertical";
+  data?: BaseItemDto[] | null;
+  height?: "small" | "large";
   disabled?: boolean;
-  queryKey: QueryKey;
-  queryFn: QueryFunction<BaseItemDto[]>;
 }
 
 export const ScrollingCollectionList: React.FC<Props> = ({
   title,
+  data,
   orientation = "vertical",
+  height = "small",
+  loading = false,
   disabled = false,
-  queryFn,
-  queryKey,
   ...props
 }) => {
-  const { data, isLoading } = useQuery({
-    queryKey,
-    queryFn,
-    enabled: !disabled,
-    staleTime: 60 * 1000,
-  });
-
-  if (disabled || !title) return null;
+  if (disabled) return null;
 
   return (
-    <View {...props} className="">
-      <Text className="px-4 text-lg font-bold mb-2 text-neutral-100">
+    <View {...props}>
+      <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
         {title}
       </Text>
-      {isLoading ? (
-        <View
-          className={`
-            flex flex-row gap-2 px-4
-        `}
-        >
-          {[1, 2, 3].map((i) => (
-            <View className="w-44" key={i}>
-              <View className="bg-neutral-900 h-24 w-full rounded-md mb-1"></View>
-              <View className="rounded-md overflow-hidden mb-1 self-start">
-                <Text
-                  className="text-neutral-900 bg-neutral-900 rounded-md"
-                  numberOfLines={1}
-                >
-                  Nisi mollit voluptate amet.
-                </Text>
-              </View>
-              <View className="rounded-md overflow-hidden self-start mb-1">
-                <Text
-                  className="text-neutral-900 bg-neutral-900 text-xs rounded-md "
-                  numberOfLines={1}
-                >
-                  Lorem ipsum
-                </Text>
-              </View>
-            </View>
-          ))}
-        </View>
-      ) : (
-        <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-          <View className="px-4 flex flex-row">
-            {data?.map((item, index) => (
-              <TouchableItemRouter
-                item={item}
-                key={index}
-                className={`
-              mr-2 
-
-              ${orientation === "horizontal" ? "w-44" : "w-28"}
+      <HorizontalScroll<BaseItemDto>
+        data={data}
+        height={orientation === "vertical" ? 247 : 164}
+        loading={loading}
+        renderItem={(item, index) => (
+          <TouchableItemRouter
+            key={index}
+            item={item}
+            className={`flex flex-col
+              ${orientation === "vertical" ? "w-28" : "w-44"}
             `}
-              >
-                {item.Type === "Episode" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster item={item} />
-                )}
-                {item.Type === "Episode" && orientation === "vertical" && (
-                  <SeriesPoster item={item} />
-                )}
-                {item.Type === "Movie" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster item={item} />
-                )}
-                {item.Type === "Movie" && orientation === "vertical" && (
-                  <MoviePoster item={item} />
-                )}
-                {item.Type === "Series" && <SeriesPoster item={item} />}
-                <ItemCardText item={item} />
-              </TouchableItemRouter>
-            ))}
-          </View>
-        </ScrollView>
-      )}
+          >
+            <View>
+              {orientation === "vertical" ? (
+                <MoviePoster item={item} />
+              ) : (
+                <ContinueWatchingPoster item={item} />
+              )}
+              <ItemCardText item={item} />
+            </View>
+          </TouchableItemRouter>
+        )}
+      />
     </View>
   );
 };

components/library/LibraryItemCard.tsx

@@ -1,207 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BaseItemDto,
-  CollectionType,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useEffect, useMemo, useState } from "react";
-import { TouchableOpacityProps, View } from "react-native";
-import { getColors } from "react-native-image-colors";
-import { TouchableItemRouter } from "../common/TouchableItemRouter";
-
-interface Props extends TouchableOpacityProps {
-  library: BaseItemDto;
-}
-
-type LibraryColor = {
-  dominantColor: string;
-  averageColor: string;
-  secondary: string;
-};
-
-type IconName = React.ComponentProps<typeof Ionicons>["name"];
-
-const icons: Record<CollectionType, IconName> = {
-  movies: "film",
-  tvshows: "tv",
-  music: "musical-notes",
-  books: "book",
-  homevideos: "videocam",
-  boxsets: "albums",
-  playlists: "list",
-  folders: "folder",
-  livetv: "tv",
-  musicvideos: "musical-notes",
-  photos: "images",
-  trailers: "videocam",
-  unknown: "help-circle",
-} as const;
-export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const [settings] = useSettings();
-
-  const [imageInfo, setImageInfo] = useState<LibraryColor>({
-    dominantColor: "#fff",
-    averageColor: "#fff",
-    secondary: "#fff",
-  });
-
-  const url = useMemo(
-    () =>
-      getPrimaryImageUrl({
-        api,
-        item: library,
-      }),
-    [library]
-  );
-
-  const { data: itemsCount } = useQuery({
-    queryKey: ["library-count", library.Id],
-    queryFn: async () => {
-      if (!api) return null;
-      const response = await getItemsApi(api).getItems({
-        userId: user?.Id,
-        parentId: library.Id,
-        limit: 0,
-      });
-      return response.data.TotalRecordCount;
-    },
-  });
-
-  useEffect(() => {
-    if (url) {
-      getColors(url, {
-        fallback: "#fff",
-        cache: true,
-        key: url,
-      })
-        .then((colors) => {
-          let dominantColor: string = "#fff";
-          let averageColor: string = "#fff";
-          let secondary: string = "#fff";
-
-          if (colors.platform === "android") {
-            dominantColor = colors.dominant;
-            averageColor = colors.average;
-            secondary = colors.muted;
-          } else if (colors.platform === "ios") {
-            dominantColor = colors.primary;
-            averageColor = colors.background;
-            secondary = colors.detail;
-          }
-
-          setImageInfo({
-            dominantColor,
-            averageColor,
-            secondary,
-          });
-        })
-        .catch((error) => {
-          console.error("Error getting colors", error);
-        });
-    }
-  }, [url]);
-
-  if (!url) return null;
-
-  if (settings?.libraryOptions?.display === "row") {
-    return (
-      <TouchableItemRouter item={library} className="w-full px-4">
-        <View className="flex flex-row items-center w-full relative ">
-          <Ionicons
-            name={icons[library.CollectionType!] || "folder"}
-            size={22}
-            color={"#e5e5e5"}
-          />
-          <Text className="text-start px-4 text-neutral-200">
-            {library.Name}
-          </Text>
-          {settings?.libraryOptions?.showStats && (
-            <Text className="font-bold text-xs text-neutral-500 text-start ml-auto">
-              {itemsCount} items
-            </Text>
-          )}
-        </View>
-      </TouchableItemRouter>
-    );
-  }
-
-  if (settings?.libraryOptions?.imageStyle === "cover") {
-    return (
-      <TouchableItemRouter item={library} className="w-full">
-        <View className="flex justify-center rounded-xl w-full relative border border-neutral-900 h-20 ">
-          <View
-            style={{
-              width: "100%",
-              height: "100%",
-              borderRadius: 8,
-              position: "absolute",
-              top: 0,
-              left: 0,
-              overflow: "hidden",
-            }}
-          >
-            <Image
-              source={{ uri: url }}
-              style={{
-                width: "100%",
-                height: "100%",
-              }}
-            />
-            <View
-              style={{
-                position: "absolute",
-                top: 0,
-                left: 0,
-                right: 0,
-                bottom: 0,
-                backgroundColor: "rgba(0, 0, 0, 0.3)", // Adjust the alpha value (0.3) to control darkness
-              }}
-            />
-          </View>
-          {settings?.libraryOptions?.showTitles && (
-            <Text className="font-bold text-lg text-start px-4">
-              {library.Name}
-            </Text>
-          )}
-          {settings?.libraryOptions?.showStats && (
-            <Text className="font-bold text-xs  text-start px-4">
-              {itemsCount} items
-            </Text>
-          )}
-        </View>
-      </TouchableItemRouter>
-    );
-  }
-
-  return (
-    <TouchableItemRouter item={library} {...props}>
-      <View className="flex flex-row items-center justify-between rounded-xl w-full relative border bg-neutral-900 border-neutral-900 h-20">
-        <View className="flex flex-col">
-          <Text className="font-bold text-lg text-start px-4">
-            {library.Name}
-          </Text>
-          {settings?.libraryOptions?.showStats && (
-            <Text className="font-bold text-xs text-neutral-500 text-start px-4">
-              {itemsCount} items
-            </Text>
-          )}
-        </View>
-        <View className="p-2">
-          <Image
-            source={{ uri: url }}
-            className="h-full aspect-[2/1] object-cover rounded-lg overflow-hidden"
-          />
-        </View>
-      </View>
-    </TouchableItemRouter>
-  );
-};

components/medialists/MediaListSection.tsx

@@ -4,57 +4,43 @@ import {
   BaseItemDtoQueryResult,
 } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
 import { useAtom } from "jotai";
-import { useCallback } from "react";
 import { View, ViewProps } from "react-native";
-import { InfiniteHorizontalScroll } from "../common/InfiniteHorrizontalScroll";
+import { ScrollingCollectionList } from "../home/ScrollingCollectionList";
 import { Text } from "../common/Text";
+import { InfiniteHorizontalScroll } from "../common/InfiniteHorrizontalScroll";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
-import { ItemCardText } from "../ItemCardText";
 import MoviePoster from "../posters/MoviePoster";
-import {
-  type QueryKey,
-  type QueryFunction,
-  useQuery,
-} from "@tanstack/react-query";
+import { useCallback } from "react";
+import { ItemCardText } from "../ItemCardText";
 
 interface Props extends ViewProps {
-  queryKey: QueryKey;
-  queryFn: QueryFunction<BaseItemDto>;
+  collection: BaseItemDto;
 }
 
-export const MediaListSection: React.FC<Props> = ({
-  queryFn,
-  queryKey,
-  ...props
-}) => {
+export const MediaListSection: React.FC<Props> = ({ collection, ...props }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
 
-  const { data: collection, isLoading } = useQuery({
-    queryKey,
-    queryFn,
-    staleTime: 60 * 1000,
-  });
-
   const fetchItems = useCallback(
     async ({
       pageParam,
     }: {
       pageParam: number;
     }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !user?.Id || !collection) return null;
+      if (!api || !user?.Id) return null;
 
       const response = await getItemsApi(api).getItems({
         userId: user.Id,
         parentId: collection.Id,
         startIndex: pageParam,
-        limit: 8,
+        limit: 10,
       });
 
       return response.data;
     },
-    [api, user?.Id, collection?.Id]
+    [api, user?.Id, collection.Id]
   );
 
   if (!collection) return null;

components/movies/MoviesTitleHeader.tsx

@@ -1,18 +1,21 @@
+import { TouchableOpacity, View, ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
+import { useRouter } from "expo-router";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { View, ViewProps } from "react-native";
 
 interface Props extends ViewProps {
   item: BaseItemDto;
 }
 
 export const MoviesTitleHeader: React.FC<Props> = ({ item, ...props }) => {
+  const router = useRouter();
   return (
-    <View {...props}>
-      <Text className=" font-bold text-2xl mb-1" selectable>
-        {item?.Name}
-      </Text>
-      <Text className=" opacity-50">{item?.ProductionYear}</Text>
-    </View>
+    <>
+      <View className="flex flex-row items-center self-center px-4">
+        <Text className="text-center font-bold text-2xl mr-2">
+          {item?.Name}
+        </Text>
+      </View>
+    </>
   );
 };

components/music/SongsList.tsx

@@ -1,6 +1,9 @@
+import { TouchableOpacity, View, ViewProps } from "react-native";
+import { Text } from "@/components/common/Text";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import ArtistPoster from "../ArtistPoster";
+import { runtimeTicksToMinutes, runtimeTicksToSeconds } from "@/utils/time";
 import { useRouter } from "expo-router";
-import { View, ViewProps } from "react-native";
 import { SongsListItem } from "./SongsListItem";
 
 interface Props extends ViewProps {

components/music/SongsListItem.tsx

@@ -1,21 +1,27 @@
+import {
+  TouchableOpacity,
+  TouchableOpacityProps,
+  View,
+  ViewProps,
+} from "react-native";
 import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { usePlayback } from "@/providers/PlaybackProvider";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { chromecastProfile } from "@/utils/profiles/chromecast";
-import ios from "@/utils/profiles/ios";
+import index from "@/app/(auth)/(tabs)/home";
 import { runtimeTicksToSeconds } from "@/utils/time";
-import { useActionSheet } from "@expo/react-native-action-sheet";
+import { router } from "expo-router";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
-import { useRouter } from "expo-router";
+import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { useAtom } from "jotai";
-import { TouchableOpacity, TouchableOpacityProps, View } from "react-native";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { chromecastProfile } from "@/utils/profiles/chromecast";
+import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
 import CastContext, {
   PlayServicesState,
   useCastDevice,
   useRemoteMediaClient,
 } from "react-native-google-cast";
+import { currentlyPlayingItemAtom, playingAtom } from "../CurrentlyPlayingBar";
+import { useActionSheet } from "@expo/react-native-action-sheet";
+import ios from "@/utils/profiles/ios";
 
 interface Props extends TouchableOpacityProps {
   collectionId: string;
@@ -36,12 +42,12 @@ export const SongsListItem: React.FC<Props> = ({
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
   const castDevice = useCastDevice();
-  const router = useRouter();
+  const [, setCp] = useAtom(currentlyPlayingItemAtom);
+  const [, setPlaying] = useAtom(playingAtom);
+
   const client = useRemoteMediaClient();
   const { showActionSheetWithOptions } = useActionSheet();
 
-  const { setCurrentlyPlayingState } = usePlayback();
-
   const openSelect = () => {
     if (!castDevice?.deviceId) {
       play("device");
@@ -67,15 +73,12 @@ export const SongsListItem: React.FC<Props> = ({
           case cancelButtonIndex:
             break;
         }
-      }
+      },
     );
   };
 
   const play = async (type: "device" | "cast") => {
-    if (!user?.Id || !api || !item.Id) {
-      console.warn("No user, api or item", user, api, item.Id);
-      return;
-    }
+    if (!user?.Id || !api || !item.Id) return;
 
     const response = await getMediaInfoApi(api!).getPlaybackInfo({
       itemId: item?.Id,
@@ -91,13 +94,9 @@ export const SongsListItem: React.FC<Props> = ({
       startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
       sessionData,
       deviceProfile: castDevice?.deviceId ? chromecastProfile : ios,
-      mediaSourceId: item.Id,
     });
 
-    if (!url || !item) {
-      console.warn("No url or item", url, item.Id);
-      return;
-    }
+    if (!url || !item) return;
 
     if (type === "cast" && client) {
       await CastContext.getPlayServicesState().then((state) => {
@@ -119,12 +118,11 @@ export const SongsListItem: React.FC<Props> = ({
         }
       });
     } else {
-      console.log("Playing on device", url, item.Id);
-      setCurrentlyPlayingState({
+      setCp({
         item,
-        url,
+        playbackUrl: url,
       });
-      router.push("/play-music");
+      setPlaying(true);
     }
   };
 

components/posters/AlbumCover.tsx

@@ -36,7 +36,7 @@ const AlbumCover: React.FC<ArtistPosterProps> = ({ item, id }) => {
 
   if (!item && id)
     return (
-      <View className="relative rounded-lg overflow-hidden border border-neutral-900">
+      <View className="relative rounded-md overflow-hidden border border-neutral-900">
         <Image
           key={id}
           id={id}

components/posters/ArtistPoster.tsx

@@ -29,7 +29,7 @@ const ArtistPoster: React.FC<ArtistPosterProps> = ({
   if (!url)
     return (
       <View
-        className="rounded-lg overflow-hidden border border-neutral-900"
+        className="rounded-md overflow-hidden border border-neutral-900"
         style={{
           aspectRatio: "1/1",
         }}

components/posters/EpisodePoster.tsx

@@ -1,64 +0,0 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo, useState } from "react";
-import { View } from "react-native";
-import { WatchedIndicator } from "@/components/WatchedIndicator";
-
-type MoviePosterProps = {
-  item: BaseItemDto;
-  showProgress?: boolean;
-};
-
-export const EpisodePoster: React.FC<MoviePosterProps> = ({
-  item,
-  showProgress = false,
-}) => {
-  const [api] = useAtom(apiAtom);
-
-  const url = useMemo(() => {
-    if (item.Type === "Episode") {
-      return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
-    }
-  }, [item]);
-
-  const [progress, setProgress] = useState(
-    item.UserData?.PlayedPercentage || 0
-  );
-
-  const blurhash = useMemo(() => {
-    const key = item.ImageTags?.["Primary"] as string;
-    return item.ImageBlurHashes?.["Primary"]?.[key];
-  }, [item]);
-
-  return (
-    <View className="relative rounded-lg overflow-hidden border border-neutral-900">
-      <Image
-        placeholder={{
-          blurhash,
-        }}
-        key={item.Id}
-        id={item.Id}
-        source={
-          url
-            ? {
-                uri: url,
-              }
-            : null
-        }
-        cachePolicy={"memory-disk"}
-        contentFit="cover"
-        style={{
-          aspectRatio: "10/15",
-          width: "100%",
-        }}
-      />
-      <WatchedIndicator item={item} />
-      {showProgress && progress > 0 && (
-        <View className="h-1 bg-red-600 w-full"></View>
-      )}
-    </View>
-  );
-};

components/posters/ItemPoster.tsx

@@ -1,53 +0,0 @@
-import { View, ViewProps } from "react-native";
-import { Text } from "@/components/common/Text";
-import {
-  BaseItemDto,
-  BaseItemKind,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { ItemImage } from "../common/ItemImage";
-import { WatchedIndicator } from "../WatchedIndicator";
-import { useState } from "react";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-  showProgress?: boolean;
-}
-
-export const ItemPoster: React.FC<Props> = ({
-  item,
-  showProgress,
-  ...props
-}) => {
-  const [progress, setProgress] = useState(
-    item.UserData?.PlayedPercentage || 0
-  );
-
-  if (item.Type === "Movie" || item.Type === "Series" || item.Type === "BoxSet")
-    return (
-      <View
-        className="relative rounded-lg overflow-hidden border border-neutral-900"
-        {...props}
-      >
-        <ItemImage
-          style={{
-            aspectRatio: "10/15",
-            width: "100%",
-          }}
-          item={item}
-        />
-        <WatchedIndicator item={item} />
-        {showProgress && progress > 0 && (
-          <View className="h-1 bg-red-600 w-full"></View>
-        )}
-      </View>
-    );
-
-  return (
-    <View
-      className="rounded-lg w-full aspect-square overflow-hidden border border-neutral-900"
-      {...props}
-    >
-      <ItemImage className="w-full aspect-square" item={item} />
-    </View>
-  );
-};

components/posters/MoviePoster.tsx

@@ -1,4 +1,3 @@
-import { WatchedIndicator } from "@/components/WatchedIndicator";
 import { apiAtom } from "@/providers/JellyfinProvider";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
@@ -6,6 +5,7 @@ import { Image } from "expo-image";
 import { useAtom } from "jotai";
 import { useMemo, useState } from "react";
 import { View } from "react-native";
+import { WatchedIndicator } from "@/components/WatchedIndicator";
 
 type MoviePosterProps = {
   item: BaseItemDto;
@@ -18,13 +18,14 @@ const MoviePoster: React.FC<MoviePosterProps> = ({
 }) => {
   const [api] = useAtom(apiAtom);
 
-  const url = useMemo(() => {
-    return getPrimaryImageUrl({
-      api,
-      item,
-      width: 300,
-    });
-  }, [item]);
+  const url = useMemo(
+    () =>
+      getPrimaryImageUrl({
+        api,
+        item,
+      }),
+    [item]
+  );
 
   const [progress, setProgress] = useState(
     item.UserData?.PlayedPercentage || 0
@@ -36,7 +37,7 @@ const MoviePoster: React.FC<MoviePosterProps> = ({
   }, [item]);
 
   return (
-    <View className="relative rounded-lg overflow-hidden border border-neutral-900 w-28 aspect-[10/15]">
+    <View className="relative rounded-md overflow-hidden border border-neutral-900">
       <Image
         placeholder={{
           blurhash,

components/posters/ParentPoster.tsx

@@ -28,7 +28,7 @@ const ParentPoster: React.FC<PosterProps> = ({ id }) => {
     );
 
   return (
-    <View className="rounded-lg overflow-hidden border border-neutral-900">
+    <View className="rounded-md overflow-hidden border border-neutral-900">
       <Image
         key={id}
         id={id}

components/posters/Poster.tsx

@@ -24,7 +24,7 @@ const Poster: React.FC<PosterProps> = ({ item, url, blurhash }) => {
     );
 
   return (
-    <View className="rounded-lg overflow-hidden border border-neutral-900">
+    <View className="rounded-md overflow-hidden border border-neutral-900">
       <Image
         placeholder={
           blurhash

components/posters/SeriesPoster.tsx

@@ -15,16 +15,14 @@ type MoviePosterProps = {
 const SeriesPoster: React.FC<MoviePosterProps> = ({ item }) => {
   const [api] = useAtom(apiAtom);
 
-  const url = useMemo(() => {
-    if (item.Type === "Episode") {
-      return `${api?.basePath}/Items/${item.SeriesId}/Images/Primary?fillHeight=389&quality=80&tag=${item.SeriesPrimaryImageTag}`;
-    }
-    return getPrimaryImageUrl({
-      api,
-      item,
-      width: 300,
-    });
-  }, [item]);
+  const url = useMemo(
+    () =>
+      getPrimaryImageUrl({
+        api,
+        item,
+      }),
+    [item]
+  );
 
   const blurhash = useMemo(() => {
     const key = item.ImageTags?.["Primary"] as string;
@@ -32,7 +30,7 @@ const SeriesPoster: React.FC<MoviePosterProps> = ({ item }) => {
   }, [item]);
 
   return (
-    <View className="w-28 aspect-[10/15] relative rounded-lg overflow-hidden border border-neutral-900 ">
+    <View className="relative rounded-md overflow-hidden border border-neutral-900">
       <Image
         placeholder={{
           blurhash,
@@ -49,7 +47,7 @@ const SeriesPoster: React.FC<MoviePosterProps> = ({ item }) => {
         cachePolicy={"memory-disk"}
         contentFit="cover"
         style={{
-          height: "100%",
+          aspectRatio: "10/15",
           width: "100%",
         }}
       />

components/series/CastAndCrew.tsx

@@ -1,39 +1,34 @@
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import {
   BaseItemDto,
   BaseItemPerson,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { router } from "expo-router";
-import { useAtom } from "jotai";
 import React from "react";
-import { TouchableOpacity, View, ViewProps } from "react-native";
+import { Linking, TouchableOpacity, View } from "react-native";
 import { HorizontalScroll } from "../common/HorrizontalScroll";
 import { Text } from "../common/Text";
 import Poster from "../posters/Poster";
+import { useAtom } from "jotai";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
+import { router, usePathname } from "expo-router";
 
-interface Props extends ViewProps {
-  item?: BaseItemDto | null;
-  loading?: boolean;
-}
-
-export const CastAndCrew: React.FC<Props> = ({ item, loading, ...props }) => {
+export const CastAndCrew = ({ item }: { item: BaseItemDto }) => {
   const [api] = useAtom(apiAtom);
 
+  const pathname = usePathname();
+
   return (
-    <View {...props} className="flex flex-col">
+    <View>
       <Text className="text-lg font-bold mb-2 px-4">Cast & Crew</Text>
-      <HorizontalScroll
-        loading={loading}
-        height={247}
-        data={item?.People || []}
+      <HorizontalScroll<NonNullable<BaseItemPerson>>
+        data={item.People}
         renderItem={(item, index) => (
           <TouchableOpacity
             onPress={() => {
-              router.push(`/actors/${item.Id}`);
+              router.push(`/search?q=${item.Name}&prev=${pathname}`);
             }}
             key={item.Id}
-            className="flex flex-col w-28"
+            className="flex flex-col w-32"
           >
             <Poster item={item} url={getPrimaryImageUrl({ api, item })} />
             <Text className="mt-2">{item.Name}</Text>

components/series/CurrentSeries.tsx

@@ -3,30 +3,25 @@ import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { router } from "expo-router";
 import { useAtom } from "jotai";
 import React from "react";
-import { TouchableOpacity, View, ViewProps } from "react-native";
+import { TouchableOpacity, View } from "react-native";
 import Poster from "../posters/Poster";
 import { HorizontalScroll } from "../common/HorrizontalScroll";
 import { Text } from "../common/Text";
 import { getPrimaryImageUrlById } from "@/utils/jellyfin/image/getPrimaryImageUrlById";
 
-interface Props extends ViewProps {
-  item?: BaseItemDto | null;
-}
-
-export const CurrentSeries: React.FC<Props> = ({ item, ...props }) => {
+export const CurrentSeries = ({ item }: { item: BaseItemDto }) => {
   const [api] = useAtom(apiAtom);
 
   return (
-    <View {...props}>
+    <View>
       <Text className="text-lg font-bold mb-2 px-4">Series</Text>
-      <HorizontalScroll
+      <HorizontalScroll<BaseItemDto>
         data={[item]}
-        height={247}
         renderItem={(item, index) => (
           <TouchableOpacity
             key={item.Id}
             onPress={() => router.push(`/series/${item.SeriesId}`)}
-            className="flex flex-col space-y-2 w-28"
+            className="flex flex-col space-y-2 w-32"
           >
             <Poster
               item={item}

components/series/EpisodeTitleHeader.tsx

@@ -1,36 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useRouter } from "expo-router";
-import { TouchableOpacity, View, ViewProps } from "react-native";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-}
-
-export const EpisodeTitleHeader: React.FC<Props> = ({ item, ...props }) => {
-  const router = useRouter();
-
-  return (
-    <View {...props}>
-      <Text className="font-bold text-2xl" selectable>
-        {item?.Name}
-      </Text>
-      <View className="flex flex-row items-center mb-1">
-        <TouchableOpacity
-          onPress={() => {
-            router.push(
-              // @ts-ignore
-              `/(auth)/series/${item.SeriesId}?seasonIndex=${item?.ParentIndexNumber}`
-            );
-          }}
-        >
-          <Text className="opacity-50">{item?.SeasonName}</Text>
-        </TouchableOpacity>
-
-        <Text className="opacity-50 mx-2">{"—"}</Text>
-        <Text className="opacity-50">{`Episode ${item.IndexNumber}`}</Text>
-      </View>
-      <Text className="opacity-50">{item?.ProductionYear}</Text>
-    </View>
-  );
-};

components/series/NextEpisodeButton.tsx

@@ -23,6 +23,40 @@ export const NextEpisodeButton: React.FC<Props> = ({
   const [user] = useAtom(userAtom);
   const [api] = useAtom(apiAtom);
 
+  // const { data: seasons } = useQuery({
+  //   queryKey: ["seasons", item.SeriesId],
+  //   queryFn: async () => {
+  //     if (
+  //       !api ||
+  //       !user?.Id ||
+  //       !item?.Id ||
+  //       !item?.SeriesId ||
+  //       !item?.IndexNumber
+  //     )
+  //       return [];
+
+  //     const response = await getItemsApi(api).getItems({
+  //       parentId: item?.SeriesId,
+  //     });
+
+  //     console.log("seasons ~", type, response.data);
+
+  //     return (response.data.Items as BaseItemDto[]) ?? [];
+  //   },
+  //   enabled: Boolean(api && user?.Id && item?.Id && item.SeasonId),
+  // });
+
+  // const nextSeason = useMemo(() => {
+  //   if (!seasons) return null;
+  //   const currentSeasonIndex = seasons.findIndex(
+  //     (season) => season.Id === item.SeasonId,
+  //   );
+
+  //   if (currentSeasonIndex === seasons.length - 1) return null;
+
+  //   return seasons[currentSeasonIndex + 1];
+  // }, [seasons]);
+
   const { data: nextEpisode } = useQuery({
     queryKey: ["nextEpisode", item.Id, item.ParentId, type],
     queryFn: async () => {
@@ -56,7 +90,7 @@ export const NextEpisodeButton: React.FC<Props> = ({
 
   return (
     <Button
-      onPress={() => router.setParams({ id: nextEpisode?.Id })}
+      onPress={() => router.replace(`/items/${nextEpisode?.Id}`)}
       className={`h-12 aspect-square`}
       disabled={disabled}
       {...props}

components/series/NextUp.tsx

@@ -1,16 +1,17 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { router } from "expo-router";
-import { useAtom } from "jotai";
 import React from "react";
 import { TouchableOpacity, View } from "react-native";
 import { HorizontalScroll } from "../common/HorrizontalScroll";
 import { Text } from "../common/Text";
+import Poster from "../posters/Poster";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { ItemCardText } from "../ItemCardText";
-import { TouchableItemRouter } from "../common/TouchableItemRouter";
+import { router } from "expo-router";
+import { useQuery } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { nextUp } from "@/utils/jellyfin/tvshows/nextUp";
+import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
 
 export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
   const [user] = useAtom(userAtom);
@@ -25,7 +26,6 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
           userId: user?.Id,
           seriesId,
           fields: ["MediaSourceCount"],
-          limit: 10,
         })
       ).data.Items;
     },
@@ -35,7 +35,7 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
 
   if (!items?.length)
     return (
-      <View className="px-4">
+      <View>
         <Text className="text-lg font-bold mb-2">Next up</Text>
         <Text className="opacity-50">No items to display</Text>
       </View>
@@ -44,17 +44,19 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
   return (
     <View>
       <Text className="text-lg font-bold mb-2 px-4">Next up</Text>
-      <HorizontalScroll
+      <HorizontalScroll<BaseItemDto>
         data={items}
         renderItem={(item, index) => (
-          <TouchableItemRouter
-            item={item}
-            key={index}
+          <TouchableOpacity
+            onPress={() => {
+              router.push(`/(auth)/items/${item.Id}`);
+            }}
+            key={item.Id}
             className="flex flex-col w-44"
           >
-            <ContinueWatchingPoster item={item} useEpisodePoster />
+            <ContinueWatchingPoster item={item} />
             <ItemCardText item={item} />
-          </TouchableItemRouter>
+          </TouchableOpacity>
         )}
       />
     </View>

components/series/SeasonEpisodesCarousel.tsx

@@ -1,143 +0,0 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { router } from "expo-router";
-import { useAtom } from "jotai";
-import { useEffect, useMemo, useRef } from "react";
-import { TouchableOpacity, View, ViewProps } from "react-native";
-import {
-  HorizontalScroll,
-  HorizontalScrollRef,
-} from "../common/HorrizontalScroll";
-import ContinueWatchingPoster from "../ContinueWatchingPoster";
-import { ItemCardText } from "../ItemCardText";
-
-interface Props extends ViewProps {
-  item?: BaseItemDto | null;
-  loading?: boolean;
-}
-
-export const SeasonEpisodesCarousel: React.FC<Props> = ({
-  item,
-  loading,
-  ...props
-}) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const scrollRef = useRef<HorizontalScrollRef>(null);
-
-  const scrollToIndex = (index: number) => {
-    scrollRef.current?.scrollToIndex(index, 16);
-  };
-
-  const seasonId = useMemo(() => {
-    return item?.SeasonId;
-  }, [item]);
-
-  const {
-    data: episodes,
-    isLoading,
-    isFetching,
-  } = useQuery({
-    queryKey: ["episodes", seasonId],
-    queryFn: async () => {
-      if (!api || !user?.Id) return [];
-      const response = await api.axiosInstance.get(
-        `${api.basePath}/Shows/${item?.Id}/Episodes`,
-        {
-          params: {
-            userId: user?.Id,
-            seasonId,
-            Fields:
-              "ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount,Overview",
-          },
-          headers: {
-            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
-          },
-        }
-      );
-
-      return response.data.Items as BaseItemDto[];
-    },
-    enabled: !!api && !!user?.Id && !!seasonId,
-  });
-
-  /**
-   * Prefetch previous and next episode
-   */
-  const queryClient = useQueryClient();
-  useEffect(() => {
-    if (!item?.Id || !item.IndexNumber || !episodes || episodes.length === 0) {
-      return;
-    }
-
-    const previousId = episodes?.find(
-      (ep) => ep.IndexNumber === item.IndexNumber! - 1
-    )?.Id;
-    if (previousId) {
-      queryClient.prefetchQuery({
-        queryKey: ["item", previousId],
-        queryFn: async () =>
-          await getUserItemData({
-            api,
-            userId: user?.Id,
-            itemId: previousId,
-          }),
-        staleTime: 60 * 1000,
-      });
-    }
-
-    const nextId = episodes?.find(
-      (ep) => ep.IndexNumber === item.IndexNumber! + 1
-    )?.Id;
-    if (nextId) {
-      queryClient.prefetchQuery({
-        queryKey: ["item", nextId],
-        queryFn: async () =>
-          await getUserItemData({
-            api,
-            userId: user?.Id,
-            itemId: nextId,
-          }),
-        staleTime: 60 * 1000,
-      });
-    }
-  }, [episodes, api, user?.Id, item]);
-
-  useEffect(() => {
-    if (item?.Type === "Episode" && item.Id) {
-      const index = episodes?.findIndex((ep) => ep.Id === item.Id);
-      if (index !== undefined && index !== -1) {
-        setTimeout(() => {
-          scrollToIndex(index);
-        }, 400);
-      }
-    }
-  }, [episodes, item]);
-
-  return (
-    <HorizontalScroll
-      ref={scrollRef}
-      data={episodes}
-      extraData={item}
-      loading={loading || isLoading || isFetching}
-      renderItem={(_item, idx) => (
-        <TouchableOpacity
-          key={_item.Id}
-          onPress={() => {
-            router.setParams({ id: _item.Id });
-          }}
-          className={`flex flex-col w-44 
-                  ${item?.Id === _item.Id ? "" : "opacity-50"}
-                `}
-        >
-          <ContinueWatchingPoster item={_item} useEpisodePoster />
-          <ItemCardText item={_item} />
-        </TouchableOpacity>
-      )}
-      {...props}
-    />
-  );
-};

components/series/SeasonPicker.tsx

@@ -1,39 +1,26 @@
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { runtimeTicksToSeconds } from "@/utils/time";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
 import { atom, useAtom } from "jotai";
-import { useEffect, useMemo, useState } from "react";
+import { useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
-import { DownloadItem } from "../DownloadItem";
-import { Loader } from "../Loader";
+import { ItemCardText } from "../ItemCardText";
+import { HorizontalScroll } from "../common/HorrizontalScroll";
 import { Text } from "../common/Text";
-import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { Image } from "expo-image";
-import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
-import { TouchableItemRouter } from "../common/TouchableItemRouter";
 
 type Props = {
   item: BaseItemDto;
-  initialSeasonIndex?: number;
 };
 
-type SeasonIndexState = {
-  [seriesId: string]: number;
-};
+export const seasonIndexAtom = atom<number>(1);
 
-export const seasonIndexAtom = atom<SeasonIndexState>({});
-
-export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
+export const SeasonPicker: React.FC<Props> = ({ item }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
-  const [seasonIndexState, setSeasonIndexState] = useAtom(seasonIndexAtom);
-
-  const seasonIndex = seasonIndexState[item.Id ?? ""];
+  const [seasonIndex, setSeasonIndex] = useAtom(seasonIndexAtom);
 
   const router = useRouter();
 
@@ -53,7 +40,7 @@ export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
           headers: {
             Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
           },
-        }
+        },
       );
 
       return response.data.Items;
@@ -61,93 +48,38 @@ export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
     enabled: !!api && !!user?.Id && !!item.Id,
   });
 
-  useEffect(() => {
-    if (seasons && seasons.length > 0 && seasonIndex === undefined) {
-      let initialIndex: number | undefined;
-
-      if (initialSeasonIndex !== undefined) {
-        // Use the provided initialSeasonIndex if it exists in the seasons
-        const seasonExists = seasons.some(
-          (season: any) => season.IndexNumber === initialSeasonIndex
-        );
-        if (seasonExists) {
-          initialIndex = initialSeasonIndex;
-        }
-      }
-
-      if (initialIndex === undefined) {
-        // Fall back to the previous logic if initialIndex is not set
-        const season1 = seasons.find((season: any) => season.IndexNumber === 1);
-        const season0 = seasons.find((season: any) => season.IndexNumber === 0);
-        const firstSeason = season1 || season0 || seasons[0];
-        initialIndex = firstSeason.IndexNumber;
-      }
-
-      if (initialIndex !== undefined) {
-        setSeasonIndexState((prev) => ({
-          ...prev,
-          [item.Id ?? ""]: initialIndex,
-        }));
-      }
-    }
-  }, [seasons, seasonIndex, setSeasonIndexState, item.Id, initialSeasonIndex]);
-
   const selectedSeasonId: string | null = useMemo(
     () =>
       seasons?.find((season: any) => season.IndexNumber === seasonIndex)?.Id,
-    [seasons, seasonIndex]
+    [seasons, seasonIndex],
   );
 
-  const { data: episodes, isFetching } = useQuery({
+  const { data: episodes } = useQuery({
     queryKey: ["episodes", item.Id, selectedSeasonId],
     queryFn: async () => {
-      if (!api || !user?.Id || !item.Id || !selectedSeasonId) return [];
-      const res = await getTvShowsApi(api).getEpisodes({
-        seriesId: item.Id,
-        userId: user.Id,
-        seasonId: selectedSeasonId,
-        enableUserData: true,
-        fields: ["MediaSources", "MediaStreams", "Overview"],
-      });
+      if (!api || !user?.Id || !item.Id) return [];
+      const response = await api.axiosInstance.get(
+        `${api.basePath}/Shows/${item.Id}/Episodes`,
+        {
+          params: {
+            userId: user?.Id,
+            seasonId: selectedSeasonId,
+            Fields:
+              "ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount,Overview",
+          },
+          headers: {
+            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
+          },
+        },
+      );
 
-      return res.data.Items;
+      return response.data.Items as BaseItemDto[];
     },
     enabled: !!api && !!user?.Id && !!item.Id && !!selectedSeasonId,
   });
 
-  const queryClient = useQueryClient();
-  useEffect(() => {
-    for (let e of episodes || []) {
-      queryClient.prefetchQuery({
-        queryKey: ["item", e.Id],
-        queryFn: async () => {
-          if (!e.Id) return;
-          const res = await getUserItemData({
-            api,
-            userId: user?.Id,
-            itemId: e.Id,
-          });
-          return res;
-        },
-        staleTime: 60 * 5 * 1000,
-      });
-    }
-  }, [episodes]);
-
-  // Used for height calculation
-  const [nrOfEpisodes, setNrOfEpisodes] = useState(0);
-  useEffect(() => {
-    if (episodes && episodes.length > 0) {
-      setNrOfEpisodes(episodes.length);
-    }
-  }, [episodes]);
-
   return (
-    <View
-      style={{
-        minHeight: 144 * nrOfEpisodes,
-      }}
-    >
+    <View className="mb-2">
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
           <View className="flex flex-row px-4">
@@ -170,10 +102,7 @@ export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
             <DropdownMenu.Item
               key={season.Name}
               onSelect={() => {
-                setSeasonIndexState((prev) => ({
-                  ...prev,
-                  [item.Id ?? ""]: season.IndexNumber,
-                }));
+                setSeasonIndex(season.IndexNumber);
               }}
             >
               <DropdownMenu.ItemTitle>{season.Name}</DropdownMenu.ItemTitle>
@@ -181,57 +110,25 @@ export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
           ))}
         </DropdownMenu.Content>
       </DropdownMenu.Root>
-      <View className="px-4 flex flex-col my-4">
-        {isFetching ? (
-          <View
-            style={{
-              minHeight: 144 * nrOfEpisodes,
-            }}
-            className="flex flex-col items-center justify-center"
-          >
-            <Loader />
-          </View>
-        ) : (
-          episodes?.map((e: BaseItemDto) => (
-            <TouchableItemRouter
-              item={e}
-              key={e.Id}
-              className="flex flex-col mb-4"
-            >
-              <View className="flex flex-row items-start mb-2">
-                <View className="mr-2">
-                  <ContinueWatchingPoster
-                    size="small"
-                    item={e}
-                    useEpisodePoster
-                  />
-                </View>
-                <View className="shrink">
-                  <Text numberOfLines={2} className="">
-                    {e.Name}
-                  </Text>
-                  <Text numberOfLines={1} className="text-xs text-neutral-500">
-                    {`S${e.ParentIndexNumber?.toString()}:E${e.IndexNumber?.toString()}`}
-                  </Text>
-                  <Text className="text-xs text-neutral-500">
-                    {runtimeTicksToSeconds(e.RunTimeTicks)}
-                  </Text>
-                </View>
-                <View className="self-start ml-auto -mt-0.5">
-                  <DownloadItem item={e} />
-                </View>
-              </View>
-
-              <Text
-                numberOfLines={3}
-                className="text-xs text-neutral-500 shrink"
+      {episodes && (
+        <View className="mt-4">
+          <HorizontalScroll<BaseItemDto>
+            data={episodes}
+            renderItem={(item, index) => (
+              <TouchableOpacity
+                key={item.Id}
+                onPress={() => {
+                  router.push(`/(auth)/items/${item.Id}`);
+                }}
+                className="flex flex-col w-48"
               >
-                {e.Overview}
-              </Text>
-            </TouchableItemRouter>
-          ))
-        )}
-      </View>
+                <ContinueWatchingPoster item={item} />
+                <ItemCardText item={item} />
+              </TouchableOpacity>
+            )}
+          />
+        </View>
+      )}
     </View>
   );
 };