chore

fix: can't play local media bug
appeared after playback rewrite
2024-08-21 23:21:59 +02:00 · 2024-08-21 23:21:53 +02:00 · 2024-08-21 23:20:40 +02:00 · 2024-08-21 21:05:53 +02:00 · 2024-08-21 20:37:50 +02:00 · 2024-08-21 20:34:52 +02:00
50 changed files with 1892 additions and 961 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ pc-api-7079014811501811218-719-3b9f15aeccf8.json
 credentials.json
 *.apk
 *.ipa
+.continuerc.json
--- a/README.md
+++ b/README.md
@@ -26,22 +26,46 @@ Streamyfin includes some exciting experimental features like media downloading a

 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.

+### 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 build in support for a few plugins. These plugins are not required to use Streamyfin, but they add some extra functionality.
+
+### Collection rows
+
+Jellyfin collections can be shown as rows or carousel on the home screen.
+The following tags can be added to an collection to provide this functionality.
+
+Avaiable tags:
+
+- sf_promoted: Wil make the collection an row on home
+- sf_carousel: Wil make the collection an carousel on home.
+
+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.

 ## Get it now

-<div style="display:flex;">
-  <a href="https://apps.apple.com/se/app/streamyfin/id6593660679?l=en-GB">
-    <img height=50 alt="Get Streamyfin on App Store" src="./assets/Download_on_the_App_Store_Badge.png"/>
-  </a>
-
-  <a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin">
-    <img height=75 alt="Get the beta on Google Play" src="./assets/en_badge_web_generic.png"/>
-  </a>
+<div style="display: flex; gap: 5px;">
+  <a href="https://apps.apple.com/se/app/streamyfin/id6593660679?l=en-GB"><img height=50 alt="Get Streamyfin on App Store" src="./assets/Download_on_the_App_Store_Badge.png"/></a>
+  <a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin"><img height=50 alt="Get the beta on Google Play" src="./assets/Google_Play_Store_badge_EN.svg"/></a>
 </div>

+Or download the APKs [here on GitHub](https://github.com/fredrikburmester/streamyfin/releases) for Android.
+
 ### Beta testing

 Get the latest updates by using the TestFlight version of the app.
@@ -50,8 +74,6 @@ Get the latest updates by using the TestFlight version of the app.
  <img height=75 alt="Get the beta on TestFlight" src="./assets/Get_the_beta_on_Testflight.svg"/>
 </a>

-Or download the APKs here on GitHub for Android.
-
 ## 🚀 Getting Started

 ### Prerequisites
@@ -106,7 +128,7 @@ Key points of the MPL-2.0:

 ## 🌐 Connect with Us

-Join our Discord: [https://discord.gg/zyGKHJZvv4](https://discord.gg/zyGKHJZvv4)
+Join our Discord: [https://discord.gg/zyGKHJZvv4](https://discord.gg/aJvAYeycyY)

 If you have questions or need support, feel free to reach out:

--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.6.1",
+    "version": "0.8.1",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
@@ -30,7 +30,7 @@
    },
    "android": {
      "jsEngine": "hermes",
-      "versionCode": 17,
+      "versionCode": 21,
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/icon.png"
      },
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -73,7 +73,7 @@ export default function TabLayout() {
        }}
      />
      <Tabs.Screen
-        name="library"
+        name="libraries"
        options={{
          headerShown: false,
          title: "Library",
--- a/app/(auth)/(tabs)/home/index.tsx
+++ b/app/(auth)/(tabs)/home/index.tsx
@@ -171,30 +171,19 @@ export default function index() {
  });

  const { data: mediaListCollections } = useQuery({
-    queryKey: [
-      "mediaListCollections-home",
-      user?.Id,
-      settings?.mediaListCollectionIds,
-    ],
+    queryKey: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
    queryFn: async () => {
      if (!api || !user?.Id) return [];

      const response = await getItemsApi(api).getItems({
        userId: user.Id,
-        tags: ["medialist", "promoted"],
+        tags: ["sf_promoted"],
        recursive: true,
        fields: ["Tags"],
        includeItemTypes: ["BoxSet"],
      });

-      const ids =
-        response.data.Items?.filter(
-          (c) =>
-            c.Name !== "cf_carousel" &&
-            settings?.mediaListCollectionIds?.includes(c.Id!)
-        ) ?? [];
-
-      return ids;
+      return response.data.Items || [];
    },
    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
    staleTime: 0,
@@ -208,7 +197,10 @@ export default function index() {
    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInTVShows"] });
    await queryClient.refetchQueries({ queryKey: ["suggestions"] });
    await queryClient.refetchQueries({
-      queryKey: ["mediaListCollections-home"],
+      queryKey: ["sf_promoted"],
+    });
+    await queryClient.refetchQueries({
+      queryKey: ["sf_carousel"],
    });
    setLoading(false);
  }, [queryClient, user?.Id]);
--- a/app/(auth)/(tabs)/library/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/library/collections/[collectionId].tsx
@@ -19,12 +19,17 @@ import {
  BaseItemDtoQueryResult,
  BaseItemKind,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { getFilterApi, getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+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 React, { useCallback, useEffect, useMemo, useState } from "react";
 import { NativeScrollEvent, ScrollView, View } from "react-native";
+import * as ScreenOrientation from "expo-screen-orientation";

 const isCloseToBottom = ({
  layoutMeasurement,
@@ -40,7 +45,7 @@ const isCloseToBottom = ({

 const page: React.FC = () => {
  const searchParams = useLocalSearchParams();
-  const { collectionId } = searchParams as { collectionId: string };
+  const { libraryId } = searchParams as { libraryId: string };

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -52,18 +57,39 @@ const page: React.FC = () => {
  const [sortBy, setSortBy] = useAtom(sortByAtom);
  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);

-  const { data: collection } = useQuery({
-    queryKey: ["collection", collectionId],
+  const [orientation, setOrientation] = useState(
+    ScreenOrientation.Orientation.PORTRAIT_UP
+  );
+
+  useEffect(() => {
+    const subscription = ScreenOrientation.addOrientationChangeListener(
+      (event) => {
+        setOrientation(event.orientationInfo.orientation);
+      }
+    );
+
+    // Set the initial orientation
+    ScreenOrientation.getOrientationAsync().then((initialOrientation) => {
+      setOrientation(initialOrientation);
+    });
+
+    return () => {
+      ScreenOrientation.removeOrientationChangeListener(subscription);
+    };
+  }, [ScreenOrientation]);
+
+  const { data: library } = useQuery({
+    queryKey: ["library", libraryId],
    queryFn: async () => {
      if (!api) return null;
-      const response = await getItemsApi(api).getItems({
+      const response = await getUserLibraryApi(api).getItem({
+        itemId: libraryId,
        userId: user?.Id,
-        ids: [collectionId],
      });
-      const data = response.data.Items?.[0];
+      const data = response.data;
      return data;
    },
-    enabled: !!api && !!user?.Id && !!collectionId,
+    enabled: !!api && !!user?.Id && !!libraryId,
    staleTime: 0,
  });

@@ -73,11 +99,11 @@ const page: React.FC = () => {
    }: {
      pageParam: number;
    }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !collection) return null;
+      if (!api || !library) return null;

      const includeItemTypes: BaseItemKind[] = [];

-      switch (collection?.CollectionType) {
+      switch (library?.CollectionType) {
        case "movies":
          includeItemTypes.push("Movie");
          break;
@@ -96,7 +122,7 @@ const page: React.FC = () => {

      const response = await getItemsApi(api).getItems({
        userId: user?.Id,
-        parentId: collectionId,
+        parentId: libraryId,
        limit: 66,
        startIndex: pageParam,
        sortBy: [sortBy[0].key, "SortName", "ProductionYear"],
@@ -116,8 +142,8 @@ const page: React.FC = () => {
    [
      api,
      user?.Id,
-      collectionId,
-      collection?.CollectionType,
+      libraryId,
+      library,
      selectedGenres,
      selectedYears,
      selectedTags,
@@ -129,7 +155,7 @@ const page: React.FC = () => {
  const { data, isFetching, fetchNextPage } = useInfiniteQuery({
    queryKey: [
      "library-items",
-      collection,
+      library,
      selectedGenres,
      selectedYears,
      selectedTags,
@@ -158,7 +184,7 @@ const page: React.FC = () => {
      }
    },
    initialPageParam: 0,
-    enabled: !!api && !!user?.Id && !!collection,
+    enabled: !!api && !!user?.Id && !!library,
  });

  const type = useMemo(() => {
@@ -169,7 +195,7 @@ const page: React.FC = () => {
    return data?.pages.flatMap((p) => p?.Items) || [];
  }, [data]);

-  if (!collection || !collection.CollectionType) return null;
+  if (!library || !library.CollectionType) return null;

  return (
    <ScrollView
@@ -187,7 +213,7 @@ const page: React.FC = () => {
            <View className="flex flex-row space-x-1 px-3">
              <ResetFiltersButton />
              <FilterButton
-                collectionId={collectionId}
+                collectionId={libraryId}
                queryKey="genreFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -196,7 +222,7 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
+                    parentId: libraryId,
                  });
                  return response.data.Genres || [];
                }}
@@ -209,7 +235,7 @@ const page: React.FC = () => {
                }
              />
              <FilterButton
-                collectionId={collectionId}
+                collectionId={libraryId}
                queryKey="tagsFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -218,7 +244,7 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
+                    parentId: libraryId,
                  });
                  return response.data.Tags || [];
                }}
@@ -231,7 +257,7 @@ const page: React.FC = () => {
                }
              />
              <FilterButton
-                collectionId={collectionId}
+                collectionId={libraryId}
                queryKey="yearFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -240,7 +266,7 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
+                    parentId: libraryId,
                  });
                  return (
                    response.data.Years?.sort((a, b) => b - a).map((y) =>
@@ -258,7 +284,7 @@ const page: React.FC = () => {
              />
              <FilterButton
                icon="sort"
-                collectionId={collectionId}
+                collectionId={libraryId}
                queryKey="sortByFilter"
                queryFn={async () => {
                  return sortOptions;
@@ -276,7 +302,7 @@ const page: React.FC = () => {
              <FilterButton
                icon="sort"
                showSearch={false}
-                collectionId={collectionId}
+                collectionId={libraryId}
                queryKey="orderByFilter"
                queryFn={async () => {
                  return sortOrderOptions;
@@ -305,10 +331,16 @@ const page: React.FC = () => {
            (item, index) =>
              item && (
                <TouchableItemRouter
-                  key={`${item.Id}`}
+                  key={`${item.Id}-${index}`}
                  style={{
-                    width: "32%",
-                    marginBottom: 4,
+                    width:
+                      orientation === ScreenOrientation.Orientation.PORTRAIT_UP
+                        ? "32%"
+                        : "20%",
+                    marginBottom:
+                      orientation === ScreenOrientation.Orientation.PORTRAIT_UP
+                        ? 4
+                        : 16,
                  }}
                  item={item}
                  className={`
@@ -322,7 +354,10 @@ const page: React.FC = () => {
          {flatData.length % 3 !== 0 && (
            <View
              style={{
-                width: "33%",
+                width:
+                  orientation === ScreenOrientation.Orientation.PORTRAIT_UP
+                    ? "32%"
+                    : "20%",
              }}
            ></View>
          )}
--- a/app/(auth)/(tabs)/libraries/_layout.tsx
+++ b/app/(auth)/(tabs)/libraries/_layout.tsx
@@ -16,7 +16,7 @@ export default function IndexLayout() {
        }}
      />
      <Stack.Screen
-        name="collections/[collectionId]"
+        name="[libraryId]"
        options={{
          title: "",
          headerShown: true,
--- a/app/(auth)/(tabs)/libraries/index.tsx
+++ b/app/(auth)/(tabs)/libraries/index.tsx
@@ -49,7 +49,7 @@ export default function index() {
        paddingBottom: 150,
      }}
      data={data}
-      renderItem={({ item }) => <CollectionCard collection={item} />}
+      renderItem={({ item }) => <LibraryItemCard library={item} />}
      keyExtractor={(item) => item.Id || ""}
      ItemSeparatorComponent={() => <View className="h-4" />}
      estimatedItemSize={200}
@@ -58,10 +58,10 @@ export default function index() {
 }

 interface Props {
-  collection: BaseItemDto;
+  library: BaseItemDto;
 }

-const CollectionCard: React.FC<Props> = ({ collection }) => {
+const LibraryItemCard: React.FC<Props> = ({ library }) => {
  const router = useRouter();

  const [api] = useAtom(apiAtom);
@@ -70,9 +70,9 @@ const CollectionCard: React.FC<Props> = ({ collection }) => {
    () =>
      getPrimaryImageUrl({
        api,
-        item: collection,
+        item: library,
      }),
-    [collection]
+    [library]
  );

  if (!url) return null;
@@ -80,7 +80,7 @@ const CollectionCard: React.FC<Props> = ({ collection }) => {
  return (
    <TouchableOpacity
      onPress={() => {
-        router.push(`/library/collections/${collection.Id}`);
+        router.push(`/libraries/${library.Id}`);
      }}
    >
      <View className="flex justify-center rounded-xl w-full relative border border-neutral-900 h-20 ">
@@ -96,7 +96,7 @@ const CollectionCard: React.FC<Props> = ({ collection }) => {
          }}
        />
        <Text className="font-bold text-xl text-start px-4">
-          {collection.Name}
+          {library.Name}
        </Text>
      </View>
    </TouchableOpacity>
--- a/app/(auth)/(tabs)/search/index.tsx
+++ b/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";
@@ -9,13 +10,32 @@ import AlbumCover from "@/components/posters/AlbumCover";
 import MoviePoster from "@/components/posters/MoviePoster";
 import SeriesPoster from "@/components/posters/SeriesPoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getSearchApi } from "@jellyfin/sdk/lib/utils/api";
+import { Ionicons } from "@expo/vector-icons";
+import { Api } from "@jellyfin/sdk";
+import {
+  BaseItemDto,
+  BaseItemKind,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
-import { router, useNavigation } from "expo-router";
+import axios from "axios";
+import {
+  Href,
+  router,
+  useLocalSearchParams,
+  useNavigation,
+  usePathname,
+} from "expo-router";
 import { useAtom } from "jotai";
-import React, { useLayoutEffect, useMemo, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useState,
+} from "react";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useDebounce } from "use-debounce";

@@ -29,6 +49,10 @@ const exampleSearches = [
 ];

 export default function search() {
+  const params = useLocalSearchParams();
+
+  const { q, prev } = params as { q: string; prev: Href<string> };
+
  const [search, setSearch] = useState<string>("");

  const [debouncedSearch] = useDebounce(search, 500);
@@ -36,107 +60,131 @@ export default function search() {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);

+  const [settings] = useSettings();
+
+  const searchEngine = useMemo(() => {
+    return settings?.searchEngine || "Jellyfin";
+  }, [settings]);
+
+  useEffect(() => {
+    if (q && q.length > 0) setSearch(q);
+  }, [q]);
+
+  const searchFn = useCallback(
+    async ({
+      types,
+      query,
+    }: {
+      types: BaseItemKind[];
+      query: string;
+    }): Promise<BaseItemDto[]> => {
+      if (!api) return [];
+
+      if (searchEngine === "Jellyfin") {
+        const searchApi = await getSearchApi(api).getSearchHints({
+          searchTerm: query,
+          limit: 10,
+          includeItemTypes: types,
+        });
+
+        return searchApi.data.SearchHints as BaseItemDto[];
+      } else {
+        const url = `${settings?.marlinServerUrl}/search?q=${encodeURIComponent(
+          query
+        )}&includeItemTypes=${types
+          .map((type) => encodeURIComponent(type))
+          .join("&includeItemTypes=")}`;
+
+        const response1 = await axios.get(url);
+        const ids = response1.data.ids;
+
+        if (!ids || !ids.length) return [];
+
+        const response2 = await getItemsApi(api).getItems({
+          ids,
+          enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+        });
+
+        return response2.data.Items as BaseItemDto[];
+      }
+    },
+    [api, settings]
+  );
+
  const navigation = useNavigation();
  useLayoutEffect(() => {
    if (Platform.OS === "ios")
      navigation.setOptions({
        headerSearchBarOptions: {
          placeholder: "Search...",
-          onChangeText: (e: any) => setSearch(e.nativeEvent.text),
+          onChangeText: (e: any) => {
+            router.setParams({ q: "" });
+            setSearch(e.nativeEvent.text);
+          },
          hideWhenScrolling: false,
          autoFocus: true,
        },
      });
  }, [navigation]);

-  const { data: movies, isLoading: l1 } = useQuery({
-    queryKey: ["search-movies", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["Movie"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: movies, isFetching: l1 } = useQuery({
+    queryKey: ["search", "movies", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Movie"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

-  const { data: series, isLoading: l2 } = useQuery({
-    queryKey: ["search-series", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["Series"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: series, isFetching: l2 } = useQuery({
+    queryKey: ["search", "series", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Series"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

-  const { data: episodes, isLoading: l3 } = useQuery({
-    queryKey: ["search-episodes", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["Episode"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: episodes, isFetching: l3 } = useQuery({
+    queryKey: ["search", "episodes", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Episode"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

-  const { data: artists, isLoading: l4 } = useQuery({
-    queryKey: ["search-artists", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["MusicArtist"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: artists, isFetching: l4 } = useQuery({
+    queryKey: ["search", "artists", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicArtist"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

-  const { data: albums, isLoading: l5 } = useQuery({
-    queryKey: ["search-albums", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["MusicAlbum"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: albums, isFetching: l5 } = useQuery({
+    queryKey: ["search", "albums", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicAlbum"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

-  const { data: songs, isLoading: l6 } = useQuery({
-    queryKey: ["search-songs", debouncedSearch],
-    queryFn: async () => {
-      if (!api || !user || debouncedSearch.length === 0) return [];
-
-      const searchApi = await getSearchApi(api).getSearchHints({
-        searchTerm: debouncedSearch,
-        limit: 10,
-        includeItemTypes: ["Audio"],
-      });
-
-      return searchApi.data.SearchHints;
-    },
+  const { data: songs, isFetching: l6 } = useQuery({
+    queryKey: ["search", "songs", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Audio"],
+      }),
+    enabled: debouncedSearch.length > 0,
  });

  const noResults = useMemo(() => {
@@ -173,6 +221,13 @@ export default function search() {
              />
            </View>
          )}
+          {!!q && (
+            <View className="px-4 flex flex-col space-y-2">
+              <Text className="text-neutral-500 ">
+                Results for <Text className="text-purple-600">{q}</Text>
+              </Text>
+            </View>
+          )}
          <SearchItemWrapper
            header="Movies"
            ids={movies?.map((m) => m.Id!)}
@@ -182,7 +237,7 @@ export default function search() {
                renderItem={(item) => (
                  <TouchableOpacity
                    key={item.Id}
-                    className="flex flex-col w-32"
+                    className="flex flex-col w-28"
                    onPress={() => router.push(`/items/${item.Id}`)}
                  >
                    <MoviePoster item={item} key={item.Id} />
@@ -207,7 +262,7 @@ export default function search() {
                  <TouchableOpacity
                    key={item.Id}
                    onPress={() => router.push(`/series/${item.Id}`)}
-                    className="flex flex-col w-32"
+                    className="flex flex-col w-28"
                  >
                    <SeriesPoster item={item} key={item.Id} />
                    <Text numberOfLines={2} className="mt-2">
@@ -231,7 +286,7 @@ export default function search() {
                  <TouchableOpacity
                    key={item.Id}
                    onPress={() => router.push(`/items/${item.Id}`)}
-                    className="flex flex-col w-48"
+                    className="flex flex-col w-44"
                  >
                    <ContinueWatchingPoster item={item} />
                    <ItemCardText item={item} />
@@ -250,7 +305,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-32"
+                    className="flex flex-col w-28"
                  >
                    <AlbumCover id={item.Id} />
                    <ItemCardText item={item} />
@@ -269,7 +324,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-32"
+                    className="flex flex-col w-28"
                  >
                    <AlbumCover id={item.Id} />
                    <ItemCardText item={item} />
@@ -288,7 +343,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-32"
+                    className="flex flex-col w-28"
                  >
                    <AlbumCover id={item.AlbumId} />
                    <ItemCardText item={item} />
--- a/app/(auth)/collections/[collectionId].tsx
+++ b/app/(auth)/collections/[collectionId].tsx
@@ -1,20 +1,46 @@
 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 ArtistPoster from "@/components/posters/ArtistPoster";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { Ionicons } from "@expo/vector-icons";
 import {
-  BaseItemDto,
+  genreFilterAtom,
+  sortByAtom,
+  sortOptions,
+  sortOrderAtom,
+  sortOrderOptions,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";
+import {
+  BaseItemDtoQueryResult,
  BaseItemKind,
-  ItemSortBy,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { router, useLocalSearchParams } from "expo-router";
+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 { useMemo, useState } from "react";
-import { ScrollView, TouchableOpacity, View } from "react-native";
+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();
@@ -22,200 +48,294 @@ const page: React.FC = () => {

  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);
+
+  useEffect(() => {
+    setSortBy([
+      {
+        key: "PremiereDate",
+        value: "Premiere Date",
+      },
+    ]);
+    setSortOrder([
+      {
+        key: "Ascending",
+        value: "Ascending",
+      },
+    ]);
+  }, []);

  const { data: collection } = useQuery({
    queryKey: ["collection", collectionId],
    queryFn: async () => {
      if (!api) return null;
-      const response = await getItemsApi(api).getItems({
+      const response = await getUserLibraryApi(api).getItem({
+        itemId: collectionId,
        userId: user?.Id,
-        ids: [collectionId],
      });
-      const data = response.data.Items?.[0];
+      const data = response.data;
      return data;
    },
    enabled: !!api && !!user?.Id && !!collectionId,
    staleTime: 0,
  });

-  const [startIndex, setStartIndex] = useState<number>(0);
+  useEffect(() => {
+    navigation.setOptions({ title: collection?.Name || "" });
+  }, [navigation, collection]);

-  const { data, isLoading, isError } = useQuery<{
-    Items: BaseItemDto[];
-    TotalRecordCount: number;
-  }>({
-    queryKey: ["collection-items", collection?.Id, startIndex],
-    queryFn: async () => {
-      if (!api || !collectionId)
-        return {
-          Items: [],
-          TotalRecordCount: 0,
-        };
-
-      const sortBy: ItemSortBy[] = [];
-      const includeItemTypes: BaseItemKind[] = [];
-
-      switch (collection?.CollectionType) {
-        case "movies":
-          sortBy.push("SortName", "ProductionYear");
-          break;
-        case "boxsets":
-          sortBy.push("IsFolder", "SortName");
-          break;
-        default:
-          sortBy.push("SortName");
-          break;
-      }
-
-      switch (collection?.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 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: 100,
-        startIndex,
-        sortBy,
-        sortOrder: ["Ascending"],
-        includeItemTypes,
-        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
-        recursive: true,
-        imageTypeLimit: 1,
-        fields: ["PrimaryImageAspectRatio", "SortName"],
+        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)),
      });

-      const data = response.data.Items;
-
-      return {
-        Items: data || [],
-        TotalRecordCount: response.data.TotalRecordCount || 0,
-      };
+      return response.data || null;
    },
-    enabled: !!collection?.Id && !!api && !!user?.Id,
+    [
+      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,
  });

-  const totalItems = useMemo(() => {
-    return data?.TotalRecordCount;
+  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>
-      <View>
-        <View className="px-4 mb-4">
-          <Text className="font-bold text-3xl mb-2">{collection?.Name}</Text>
-          <View className="flex flex-row items-center justify-between">
-            <Text>
-              {startIndex + 1}-{Math.min(startIndex + 100, totalItems || 0)} of{" "}
-              {totalItems}
-            </Text>
-            <View className="flex flex-row items-center space-x-2">
-              <TouchableOpacity
-                onPress={() => {
-                  setStartIndex((prev) => Math.max(prev - 100, 0));
+    <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 || [];
                }}
-              >
-                <Ionicons
-                  name="arrow-back-circle-outline"
-                  size={32}
-                  color="white"
-                />
-              </TouchableOpacity>
-              <TouchableOpacity
-                onPress={() => {
-                  setStartIndex((prev) => prev + 100);
+                set={setSelectedGenres}
+                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 || [];
                }}
-              >
-                <Ionicons
-                  name="arrow-forward-circle-outline"
-                  size={32}
-                  color="white"
-                />
-              </TouchableOpacity>
+                set={setSelectedTags}
+                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={setSelectedYears}
+                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 sortOptions;
+                }}
+                set={setSortBy}
+                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={setSortOrder}
+                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>
-          </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>
-        {isLoading ? (
-          <View className="my-12">
-            <Loader />
-          </View>
-        ) : (
-          <View className="flex flex-row flex-wrap">
-            {data?.Items?.map((item: BaseItemDto, index: number) => (
-              <TouchableOpacity
-                style={{
-                  maxWidth: "33%",
-                  width: "100%",
-                  padding: 10,
-                }}
-                key={index}
-                onPress={() => {
-                  if (item?.Type === "Series") {
-                    router.push(`/series/${item.Id}`);
-                  } else if (item.IsFolder) {
-                    router.push(`/collections/${item?.Id}`);
-                  } else {
-                    router.push(`/items/${item.Id}`);
-                  }
-                }}
-              >
-                <View className="flex flex-col gap-y-2">
-                  {collection?.CollectionType === "movies" ? (
-                    <MoviePoster item={item} />
-                  ) : collection?.CollectionType === "music" ? (
-                    <ArtistPoster item={item} />
-                  ) : (
-                    <MoviePoster item={item} />
-                  )}
-                  <Text>{item.Name}</Text>
-                  <Text className="opacity-50 text-xs">
-                    {item.ProductionYear}
-                  </Text>
-                </View>
-              </TouchableOpacity>
-            ))}
-          </View>
-        )}
      </View>
-      {!isLoading && (
-        <View className="flex flex-row items-center space-x-2 justify-center mt-4 mb-12">
-          <TouchableOpacity
-            onPress={() => {
-              setStartIndex((prev) => Math.max(prev - 100, 0));
-            }}
-          >
-            <Ionicons
-              name="arrow-back-circle-outline"
-              size={32}
-              color="white"
-            />
-          </TouchableOpacity>
-          <TouchableOpacity
-            onPress={() => {
-              setStartIndex((prev) => prev + 100);
-            }}
-          >
-            <Ionicons
-              name="arrow-forward-circle-outline"
-              size={32}
-              color="white"
-            />
-          </TouchableOpacity>
-        </View>
-      )}
    </ScrollView>
  );
 };
--- a/app/(auth)/items/[id].tsx
+++ b/app/(auth)/items/[id].tsx
@@ -1,10 +1,5 @@
 import { AudioTrackSelector } from "@/components/AudioTrackSelector";
 import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import {
-  currentlyPlayingItemAtom,
-  fullScreenAtom,
-  playingAtom,
-} from "@/components/CurrentlyPlayingBar";
 import { DownloadItem } from "@/components/DownloadItem";
 import { Loader } from "@/components/Loader";
 import { OverviewText } from "@/components/OverviewText";
@@ -34,13 +29,9 @@ 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 { useMemo, useState } from "react";
 import { View } from "react-native";
-import CastContext, {
-  PlayServicesState,
-  useCastDevice,
-  useRemoteMediaClient,
-} from "react-native-google-cast";
+import { useCastDevice } from "react-native-google-cast";
 import { ParallaxScrollView } from "../../../components/ParallaxPage";

 const page: React.FC = () => {
@@ -54,12 +45,6 @@ const page: React.FC = () => {

  const castDevice = useCastDevice();

-  const [, setCurrentlyPlying] = useAtom(currentlyPlayingItemAtom);
-  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);
@@ -139,43 +124,6 @@ const page: React.FC = () => {
    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);
-        if (settings?.openFullScreenVideoPlayerByDefault === true) {
-          setFullscreen(true);
-        }
-      }
-    },
-    [playbackUrl, item, settings]
-  );
-
  const backdropUrl = useMemo(
    () =>
      getBackdropUrl({
@@ -246,7 +194,7 @@ const page: React.FC = () => {

        <View className="flex flex-row justify-between items-center mb-2">
          {playbackUrl ? (
-            <DownloadItem item={item} playbackUrl={playbackUrl} />
+            <DownloadItem item={item} />
          ) : (
            <View className="h-12 aspect-square flex items-center justify-center"></View>
          )}
@@ -274,12 +222,7 @@ const page: React.FC = () => {
        </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"
-          />
+          <PlayButton item={item} url={playbackUrl} className="grow" />
          <NextEpisodeButton item={item} className="ml-2" />
        </View>
      </View>
--- a/app/(auth)/series/[id].tsx
+++ b/app/(auth)/series/[id].tsx
@@ -43,7 +43,7 @@ const page: React.FC = () => {
        quality: 90,
        width: 1000,
      }),
-    [item],
+    [item]
  );

  const logoUrl = useMemo(
@@ -52,7 +52,7 @@ const page: React.FC = () => {
        api,
        item,
      }),
-    [item],
+    [item]
  );

  if (!item || !backdropUrl) return null;
@@ -87,7 +87,7 @@ const page: React.FC = () => {
        </>
      }
    >
-      <View className="flex flex-col pt-4 pb-24">
+      <View className="flex flex-col pt-4">
        <View className="px-4 py-4">
          <Text className="text-3xl font-bold">{item?.Name}</Text>
          <Text className="">{item?.Overview}</Text>
--- a/app/(auth)/settings.tsx
+++ b/app/(auth)/settings.tsx
@@ -9,6 +9,7 @@ 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();
@@ -44,7 +45,7 @@ export default function settings() {
            onPress={async () => {
              await deleteAllFiles();
              Haptics.notificationAsync(
-                Haptics.NotificationFeedbackType.Success,
+                Haptics.NotificationFeedbackType.Success
              );
            }}
          >
@@ -55,7 +56,7 @@ export default function settings() {
            onPress={async () => {
              await clearLogs();
              Haptics.notificationAsync(
-                Haptics.NotificationFeedbackType.Success,
+                Haptics.NotificationFeedbackType.Success
              );
            }}
          >
--- a/app/(auth)/songs/[songId].tsx
+++ b/app/(auth)/songs/[songId].tsx
@@ -2,10 +2,6 @@ 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";
@@ -15,6 +11,7 @@ import { NextEpisodeButton } from "@/components/series/NextEpisodeButton";
 import { SimilarItems } from "@/components/SimilarItems";
 import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { usePlayback } from "@/providers/PlaybackProvider";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
@@ -41,7 +38,7 @@ const page: React.FC = () => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);

-  const [, setPlaying] = useAtom(playingAtom);
+  const { setCurrentlyPlayingState } = usePlayback();

  const castDevice = useCastDevice();
  const navigation = useNavigation();
@@ -140,7 +137,6 @@ const page: React.FC = () => {
    staleTime: 0,
  });

-  const [, setCp] = useAtom(currentlyPlayingItemAtom);
  const client = useRemoteMediaClient();

  const onPressPlay = useCallback(
@@ -167,11 +163,10 @@ const page: React.FC = () => {
          }
        });
      } else {
-        setCp({
+        setCurrentlyPlayingState({
          item,
-          playbackUrl,
+          url: playbackUrl,
        });
-        setPlaying(true);
      }
    },
    [playbackUrl, item]
@@ -224,7 +219,7 @@ const page: React.FC = () => {

        <View className="flex flex-row justify-between items-center w-full my-4">
          {playbackUrl ? (
-            <DownloadItem item={item} playbackUrl={playbackUrl} />
+            <DownloadItem item={item} />
          ) : (
            <View className="h-12 aspect-square flex items-center justify-center"></View>
          )}
@@ -249,12 +244,7 @@ const page: React.FC = () => {
        </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"
-          />
+          <PlayButton item={item} className="grow" />
          <NextEpisodeButton item={item} className="ml-2" />
        </View>
      </View>
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -1,22 +1,22 @@
+import { CurrentlyPlayingBar } from "@/components/CurrentlyPlayingBar";
 import { JellyfinProvider } from "@/providers/JellyfinProvider";
+import { JobQueueProvider } from "@/providers/JobQueueProvider";
+import { PlaybackProvider } from "@/providers/PlaybackProvider";
+import { useSettings } from "@/utils/atoms/settings";
+import { ActionSheetProvider } from "@expo/react-native-action-sheet";
+import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useFonts } from "expo-font";
-import { Stack } from "expo-router";
-import * as SplashScreen from "expo-splash-screen";
-import { Provider as JotaiProvider } from "jotai";
-import { useEffect, useRef, useState } from "react";
-import "react-native-reanimated";
-import * as ScreenOrientation from "expo-screen-orientation";
-import { StatusBar } from "expo-status-bar";
-import { CurrentlyPlayingBar } from "@/components/CurrentlyPlayingBar";
-import { ActionSheetProvider } from "@expo/react-native-action-sheet";
-import { useJobProcessor } from "@/utils/atoms/queue";
-import { JobQueueProvider } from "@/providers/JobQueueProvider";
 import { useKeepAwake } from "expo-keep-awake";
-import { useSettings } from "@/utils/atoms/settings";
+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 { Provider as JotaiProvider } from "jotai";
+import { useEffect, useRef } from "react";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
+import "react-native-reanimated";

 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
@@ -82,99 +82,101 @@ function Layout() {
          <ActionSheetProvider>
            <BottomSheetModalProvider>
              <JellyfinProvider>
-                <StatusBar style="light" backgroundColor="#000" />
-                <ThemeProvider value={DarkTheme}>
-                  <Stack initialRouteName="/home">
-                    <Stack.Screen
-                      name="(auth)/(tabs)"
-                      options={{
-                        headerShown: false,
-                        title: "",
-                      }}
-                    />
-                    <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>
+                  <StatusBar style="light" backgroundColor="#000" />
+                  <ThemeProvider value={DarkTheme}>
+                    <Stack initialRouteName="/home">
+                      <Stack.Screen
+                        name="(auth)/(tabs)"
+                        options={{
+                          headerShown: false,
+                          title: "",
+                        }}
+                      />
+                      <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>
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -44,8 +44,11 @@ const Login: React.FC = () => {
        await login(credentials.username, credentials.password);
      }
    } catch (error) {
-      const e = error as AxiosError;
-      setError(e.message);
+      if (error instanceof Error) {
+        setError(error.message);
+      } else {
+        setError("An unexpected error occurred");
+      }
    } finally {
      setLoading(false);
    }
--- a/assets/Download_on_the_App_Store_Badge_DE_RGB_blk_092917.svg
+++ b/assets/Download_on_the_App_Store_Badge_DE_RGB_blk_092917.svg
@@ -0,0 +1,40 @@
+<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
+  <title>Download_on_the_App_Store_Badge_DE_RGB_blk_092917</title>
+  <g>
+    <g>
+      <g>
+        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
+        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
+      </g>
+      <g id="_Group_" data-name="&lt;Group&gt;">
+        <g id="_Group_2" data-name="&lt;Group&gt;">
+          <g id="_Group_3" data-name="&lt;Group&gt;">
+            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
+            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
+          </g>
+        </g>
+        <g>
+          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
+          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
+          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
+          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
+          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
+          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
+          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
+          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
+        </g>
+      </g>
+    </g>
+    <g id="_Group_4" data-name="&lt;Group&gt;">
+      <g>
+        <path d="M39.3926,14.69775H35.67092V8.731h.92676V13.8457H39.3926Z" style="fill: #fff"/>
+        <path d="M40.32912,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,40.32912,13.42432Zm2.89453-.38477v-.37646L42.124,12.7334c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,43.22365,13.03955Z" style="fill: #fff"/>
+        <path d="M45.27639,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074H48.6299v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C46,14.772,45.27639,13.87061,45.27639,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C46.64943,10.91846,46.19436,11.49707,46.19436,12.44434Z" style="fill: #fff"/>
+        <path d="M54.74709,13.48193a1.828,1.828,0,0,1-1.95117,1.30273,2.04531,2.04531,0,0,1-2.08008-2.32422A2.07685,2.07685,0,0,1,52.792,10.10791c1.25293,0,2.00879.856,2.00879,2.27V12.688H51.62111v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,51.62111,12.03076Z" style="fill: #fff"/>
+        <path d="M55.99416,10.19482h.85547v.71533H56.916a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M63.51955,8.86328a.57572.57572,0,1,1,.5752.5415A.54735.54735,0,0,1,63.51955,8.86328Zm.13281,1.33154h.88477v4.50293h-.88477Z" style="fill: #fff"/>
+        <path d="M65.97121,10.19482h.85547v.72363h.06641a1.36385,1.36385,0,0,1,2.49316,0h.07031a1.46325,1.46325,0,0,1,1.36914-.81055,1.33821,1.33821,0,0,1,1.43848,1.48828v3.10156h-.88867V11.82813c0-.60791-.29-.90576-.873-.90576a.91167.91167,0,0,0-.9502.94287v2.83252h-.873V11.74121a.78468.78468,0,0,0-.86816-.81885.96854.96854,0,0,0-.95117,1.02148v2.75391h-.88867Z" style="fill: #fff"/>
+      </g>
+    </g>
+  </g>
+</svg>
--- a/assets/Google_Play_Store_badge_EN.svg
+++ b/assets/Google_Play_Store_badge_EN.svg
--- a/bun.lockb
+++ b/bun.lockb
--- a/components/AudioTrackSelector.tsx
+++ b/components/AudioTrackSelector.tsx
@@ -22,12 +22,12 @@ export const AudioTrackSelector: React.FC<Props> = ({
  const audioStreams = useMemo(
    () =>
      item.MediaSources?.[0].MediaStreams?.filter((x) => x.Type === "Audio"),
-    [item],
+    [item]
  );

  const selectedAudioSteam = useMemo(
    () => audioStreams?.find((x) => x.Index === selected),
-    [audioStreams, selected],
+    [audioStreams, selected]
  );

  useEffect(() => {
@@ -42,7 +42,7 @@ export const AudioTrackSelector: React.FC<Props> = ({
          <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">
+              <TouchableOpacity className="bg-neutral-900 max-w-32 h-10 rounded-xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
                <Text className="">
                  {tc(selectedAudioSteam?.DisplayTitle, 13)}
                </Text>
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -52,7 +52,7 @@ export const BitrateSelector: React.FC<Props> = ({
          <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">
+              <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl 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>
--- a/components/ContinueWatchingPoster.tsx
+++ b/components/ContinueWatchingPoster.tsx
@@ -9,10 +9,12 @@ import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";

 type ContinueWatchingPosterProps = {
  item: BaseItemDto;
+  width?: number;
 };

 const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
  item,
+  width = 176,
 }) => {
  const [api] = useAtom(apiAtom);

@@ -21,23 +23,33 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
      getPrimaryImageUrl({
        api,
        item,
-        quality: 70,
-        width: 300,
+        quality: 90,
+        width: 176 * 2,
      }),
-    [item],
+    [item]
  );

  const [progress, setProgress] = useState(
-    item.UserData?.PlayedPercentage || 0,
+    item.UserData?.PlayedPercentage || 0
  );

  if (!url)
    return (
-      <View className="w-48 aspect-video border border-neutral-800"></View>
+      <View
+        className="aspect-video border border-neutral-800"
+        style={{
+          width,
+        }}
+      ></View>
    );

  return (
-    <View className="w-48 relative aspect-video rounded-lg overflow-hidden border border-neutral-800">
+    <View
+      style={{
+        width,
+      }}
+      className="relative aspect-video rounded-lg overflow-hidden border border-neutral-800"
+    >
      <Image
        key={item.Id}
        id={item.Id}
--- a/components/CurrentlyPlayingBar.tsx
+++ b/components/CurrentlyPlayingBar.tsx
@@ -1,50 +1,39 @@
 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 { reportPlaybackProgress } from "@/utils/jellyfin/playstate/reportPlaybackProgress";
-import { reportPlaybackStopped } from "@/utils/jellyfin/playstate/reportPlaybackStopped";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 import { writeToLog } from "@/utils/log";
 import { Ionicons } from "@expo/vector-icons";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { BlurView } from "expo-blur";
 import { useRouter, useSegments } from "expo-router";
-import { atom, useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+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, { OnProgressData, VideoRef } from "react-native-video";
+import Video from "react-native-video";
 import { Text } from "./common/Text";
 import { Loader } from "./Loader";

-export const currentlyPlayingItemAtom = atom<{
-  item: BaseItemDto;
-  playbackUrl: string;
-} | null>(null);
-
-export const playingAtom = atom(false);
-export const fullScreenAtom = atom(false);
-
 export const CurrentlyPlayingBar: React.FC = () => {
-  const queryClient = useQueryClient();
  const segments = useSegments();
+  const {
+    currentlyPlaying,
+    pauseVideo,
+    playVideo,
+    setCurrentlyPlayingState,
+    stopPlayback,
+    setIsPlaying,
+    isPlaying,
+    videoRef,
+    onProgress,
+  } = usePlayback();

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const [playing, setPlaying] = useAtom(playingAtom);
-  const [currentlyPlaying, setCurrentlyPlaying] = useAtom(
-    currentlyPlayingItemAtom
-  );
-  const [fullScreen, setFullScreen] = useAtom(fullScreenAtom);
-
-  const videoRef = useRef<VideoRef | null>(null);
-  const [progress, setProgress] = useState(0);

  const aBottom = useSharedValue(0);
  const aPadding = useSharedValue(0);
@@ -92,108 +81,28 @@ export const CurrentlyPlayingBar: React.FC = () => {
    }
  }, [segments]);

-  const { data: item } = useQuery({
-    queryKey: ["item", currentlyPlaying?.item.Id],
-    queryFn: async () =>
-      await getUserItemData({
-        api,
-        userId: user?.Id,
-        itemId: currentlyPlaying?.item.Id,
-      }),
-    enabled: !!currentlyPlaying?.item.Id && !!api,
-    staleTime: 60,
-  });
-
-  const { data: sessionData } = useQuery({
-    queryKey: ["sessionData", currentlyPlaying?.item.Id],
-    queryFn: async () => {
-      if (!currentlyPlaying?.item.Id) return null;
-      const playbackData = await getMediaInfoApi(api!).getPlaybackInfo({
-        itemId: currentlyPlaying?.item.Id,
-        userId: user?.Id,
-      });
-      return playbackData.data;
-    },
-    enabled: !!currentlyPlaying?.item.Id && !!api && !!user?.Id,
-    staleTime: 0,
-  });
-
-  const onProgress = useCallback(
-    ({ currentTime }: OnProgressData) => {
-      if (
-        !currentTime ||
-        !sessionData?.PlaySessionId ||
-        !playing ||
-        !api ||
-        !currentlyPlaying?.item.Id
-      )
-        return;
-      const newProgress = currentTime * 10000000;
-      setProgress(newProgress);
-      reportPlaybackProgress({
-        api,
-        itemId: currentlyPlaying?.item.Id,
-        positionTicks: newProgress,
-        sessionId: sessionData.PlaySessionId,
-      });
-    },
-    [sessionData?.PlaySessionId, api, playing, currentlyPlaying?.item.Id]
-  );
-
-  useEffect(() => {
-    if (!item || !api) return;
-
-    if (playing) {
-      videoRef.current?.resume();
-    } else {
-      videoRef.current?.pause();
-      if (progress > 0 && sessionData?.PlaySessionId)
-        reportPlaybackStopped({
-          api,
-          itemId: item?.Id,
-          positionTicks: progress,
-          sessionId: sessionData?.PlaySessionId,
-        });
-
-      queryClient.invalidateQueries({
-        queryKey: ["nextUp", item?.SeriesId],
-        refetchType: "all",
-      });
-      queryClient.invalidateQueries({
-        queryKey: ["episodes"],
-        refetchType: "all",
-      });
-    }
-  }, [playing, progress, item, sessionData]);
-
-  useEffect(() => {
-    if (fullScreen === true) {
-      videoRef.current?.presentFullscreenPlayer();
-    } else {
-      videoRef.current?.dismissFullscreenPlayer();
-    }
-  }, [fullScreen]);
-
  const startPosition = useMemo(
    () =>
-      item?.UserData?.PlaybackPositionTicks
-        ? Math.round(item.UserData.PlaybackPositionTicks / 10000)
+      currentlyPlaying?.item?.UserData?.PlaybackPositionTicks
+        ? Math.round(
+            currentlyPlaying?.item.UserData.PlaybackPositionTicks / 10000
+          )
        : 0,
-    [item]
+    [currentlyPlaying?.item]
  );

  const backdropUrl = useMemo(
    () =>
      getBackdropUrl({
        api,
-        item,
+        item: currentlyPlaying?.item,
        quality: 70,
        width: 200,
      }),
-    [item]
+    [currentlyPlaying?.item, api]
  );

-  if (!currentlyPlaying || !api) return null;
+  if (!api || !currentlyPlaying) return null;

  return (
    <Animated.View
@@ -220,10 +129,14 @@ export const CurrentlyPlayingBar: React.FC = () => {
                videoRef.current?.presentFullscreenPlayer();
              }}
              className={`relative h-full bg-neutral-800 rounded-md overflow-hidden
-                ${item?.Type === "Audio" ? "aspect-square" : "aspect-video"}
+                ${
+                  currentlyPlaying.item?.Type === "Audio"
+                    ? "aspect-square"
+                    : "aspect-video"
+                }
                `}
            >
-              {currentlyPlaying.playbackUrl && (
+              {currentlyPlaying?.url && (
                <Video
                  ref={videoRef}
                  allowsExternalPlayback
@@ -235,7 +148,7 @@ export const CurrentlyPlayingBar: React.FC = () => {
                  controls={false}
                  pictureInPicture={true}
                  poster={
-                    backdropUrl && item?.Type === "Audio"
+                    backdropUrl && currentlyPlaying.item?.Type === "Audio"
                      ? backdropUrl
                      : undefined
                  }
@@ -243,13 +156,13 @@ export const CurrentlyPlayingBar: React.FC = () => {
                    enable: true,
                    thread: true,
                  }}
-                  paused={!playing}
+                  paused={!isPlaying}
                  onProgress={(e) => onProgress(e)}
                  subtitleStyle={{
                    fontSize: 16,
                  }}
                  source={{
-                    uri: currentlyPlaying.playbackUrl,
+                    uri: currentlyPlaying.url,
                    isNetwork: true,
                    startPosition,
                    headers: getAuthHeaders(api),
@@ -257,22 +170,18 @@ export const CurrentlyPlayingBar: React.FC = () => {
                  onBuffer={(e) =>
                    e.isBuffering ? console.log("Buffering...") : null
                  }
-                  onFullscreenPlayerDidDismiss={() => {
-                    setFullScreen(false);
-                  }}
-                  onFullscreenPlayerDidPresent={() => {
-                    setFullScreen(true);
-                  }}
+                  onFullscreenPlayerDidDismiss={() => {}}
+                  onFullscreenPlayerDidPresent={() => {}}
                  onPlaybackStateChanged={(e) => {
                    if (e.isPlaying) {
-                      setPlaying(true);
+                      setIsPlaying(true);
                    } else if (e.isSeeking) {
                      return;
                    } else {
-                      setPlaying(false);
+                      setIsPlaying(false);
                    }
                  }}
-                  progressUpdateInterval={1000}
+                  progressUpdateInterval={2000}
                  onError={(e) => {
                    console.log(e);
                    writeToLog(
@@ -280,11 +189,11 @@ export const CurrentlyPlayingBar: React.FC = () => {
                      "Video playback error: " + JSON.stringify(e)
                    );
                    Alert.alert("Error", "Cannot play this video file.");
-                    setPlaying(false);
-                    setCurrentlyPlaying(null);
+                    setIsPlaying(false);
+                    // setCurrentlyPlaying(null);
                  }}
                  renderLoader={
-                    item?.Type !== "Audio" && (
+                    currentlyPlaying.item?.Type !== "Audio" && (
                      <View className="flex flex-col items-center justify-center h-full">
                        <Loader />
                      </View>
@@ -296,37 +205,41 @@ export const CurrentlyPlayingBar: React.FC = () => {
            <View className="shrink text-xs">
              <TouchableOpacity
                onPress={() => {
-                  if (item?.Type === "Audio")
-                    router.push(`/albums/${item?.AlbumId}`);
-                  else router.push(`/items/${item?.Id}`);
+                  if (currentlyPlaying.item?.Type === "Audio")
+                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
+                  else router.push(`/items/${currentlyPlaying.item?.Id}`);
                }}
              >
-                <Text>{item?.Name}</Text>
+                <Text>{currentlyPlaying.item?.Name}</Text>
              </TouchableOpacity>
-              {item?.Type === "Episode" && (
+              {currentlyPlaying.item?.Type === "Episode" && (
                <TouchableOpacity
                  onPress={() => {
-                    router.push(`/(auth)/series/${item.SeriesId}`);
+                    router.push(
+                      `/(auth)/series/${currentlyPlaying.item.SeriesId}`
+                    );
                  }}
                  className="text-xs opacity-50"
                >
-                  <Text>{item.SeriesName}</Text>
+                  <Text>{currentlyPlaying.item.SeriesName}</Text>
                </TouchableOpacity>
              )}
-              {item?.Type === "Movie" && (
+              {currentlyPlaying.item?.Type === "Movie" && (
                <View>
                  <Text className="text-xs opacity-50">
-                    {item?.ProductionYear}
+                    {currentlyPlaying.item?.ProductionYear}
                  </Text>
                </View>
              )}
-              {item?.Type === "Audio" && (
+              {currentlyPlaying.item?.Type === "Audio" && (
                <TouchableOpacity
                  onPress={() => {
-                    router.push(`/albums/${item?.AlbumId}`);
+                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
                  }}
                >
-                  <Text className="text-xs opacity-50">{item?.Album}</Text>
+                  <Text className="text-xs opacity-50">
+                    {currentlyPlaying.item?.Album}
+                  </Text>
                </TouchableOpacity>
              )}
            </View>
@@ -334,12 +247,12 @@ export const CurrentlyPlayingBar: React.FC = () => {
          <View className="flex flex-row items-center space-x-2">
            <TouchableOpacity
              onPress={() => {
-                if (playing) setPlaying(false);
-                else setPlaying(true);
+                if (isPlaying) pauseVideo();
+                else playVideo();
              }}
              className="aspect-square rounded flex flex-col items-center justify-center p-2"
            >
-              {playing ? (
+              {isPlaying ? (
                <Ionicons name="pause" size={24} color="white" />
              ) : (
                <Ionicons name="play" size={24} color="white" />
@@ -347,7 +260,7 @@ export const CurrentlyPlayingBar: React.FC = () => {
            </TouchableOpacity>
            <TouchableOpacity
              onPress={() => {
-                setCurrentlyPlaying(null);
+                stopPlayback();
              }}
              className="aspect-square rounded flex flex-col items-center justify-center p-2"
            >
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -4,37 +4,132 @@ import { runningProcesses } from "@/utils/atoms/downloads";
 import { queueActions, queueAtom } from "@/utils/atoms/queue";
 import { getPlaybackInfo } from "@/utils/jellyfin/media/getPlaybackInfo";
 import Ionicons from "@expo/vector-icons/Ionicons";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import {
+  BaseItemDto,
+  MediaSourceInfo,
+} 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 { TouchableOpacity, View } from "react-native";
+import {
+  TouchableOpacity,
+  TouchableOpacityProps,
+  View,
+  ViewProps,
+} from "react-native";
 import { Loader } from "./Loader";
 import ProgressCircle from "./ProgressCircle";
+import { DownloadQuality, useSettings } from "@/utils/atoms/settings";
+import { useCallback } from "react";
+import ios from "@/utils/profiles/ios";
+import native from "@/utils/profiles/native";
+import old from "@/utils/profiles/old";

-type DownloadProps = {
+interface DownloadProps extends TouchableOpacityProps {
  item: BaseItemDto;
-  playbackUrl: string;
-};
+}

-export const DownloadItem: React.FC<DownloadProps> = ({
-  item,
-  playbackUrl,
-}) => {
+export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const [process] = useAtom(runningProcesses);
  const [queue, setQueue] = useAtom(queueAtom);

-  const { startRemuxing } = useRemuxHlsToMp4(playbackUrl, item);
+  const [settings] = useSettings();

-  const { data: playbackInfo, isLoading } = useQuery({
-    queryKey: ["playbackInfo", item.Id],
-    queryFn: async () => getPlaybackInfo(api, item.Id, user?.Id),
-  });
+  const { startRemuxing } = useRemuxHlsToMp4(item);

-  const { data: downloaded, isLoading: isLoadingDownloaded } = useQuery({
+  const initiateDownload = useCallback(
+    async (qualitySetting: DownloadQuality) => {
+      if (!api || !user?.Id || !item.Id) {
+        throw new Error(
+          "DownloadItem ~ initiateDownload: No api or user or item"
+        );
+      }
+
+      let deviceProfile: any = ios;
+
+      if (settings?.deviceProfile === "Native") {
+        deviceProfile = native;
+      } else if (settings?.deviceProfile === "Old") {
+        deviceProfile = old;
+      }
+
+      let maxStreamingBitrate: number | undefined = undefined;
+
+      if (qualitySetting === "high") {
+        maxStreamingBitrate = 8000000;
+      } else if (qualitySetting === "low") {
+        maxStreamingBitrate = 2000000;
+      }
+
+      const response = await api.axiosInstance.post(
+        `${api.basePath}/Items/${item.Id}/PlaybackInfo`,
+        {
+          DeviceProfile: deviceProfile,
+          UserId: user.Id,
+          MaxStreamingBitrate: maxStreamingBitrate,
+          StartTimeTicks: 0,
+          EnableTranscoding: maxStreamingBitrate ? true : undefined,
+          AutoOpenLiveStream: true,
+          MediaSourceId: item.Id,
+          AllowVideoStreamCopy: maxStreamingBitrate ? false : true,
+        },
+        {
+          headers: {
+            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
+          },
+        }
+      );
+
+      let url: string | undefined = undefined;
+
+      const mediaSource = response.data.MediaSources?.[0] as MediaSourceInfo;
+
+      if (!mediaSource) {
+        throw new Error("No media source");
+      }
+
+      if (mediaSource.SupportsDirectPlay) {
+        if (item.MediaType === "Video") {
+          console.log("Using direct stream for video!");
+          url = `${api.basePath}/Videos/${item.Id}/stream.mp4?mediaSourceId=${item.Id}&static=true`;
+        } 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()}`;
+        }
+      }
+
+      if (mediaSource.TranscodingUrl) {
+        console.log("Using transcoded stream!");
+        url = `${api.basePath}${mediaSource.TranscodingUrl}`;
+      } else {
+        throw new Error("No transcoding url");
+      }
+
+      return await startRemuxing(url);
+    },
+    [api, item, startRemuxing, user?.Id]
+  );
+
+  const { data: downloaded, isFetching } = useQuery({
    queryKey: ["downloaded", item.Id],
    queryFn: async () => {
      if (!item.Id) return false;
@@ -48,7 +143,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({
    enabled: !!item.Id,
  });

-  if (isLoading || isLoadingDownloaded) {
+  if (isFetching) {
    return (
      <View className="rounded h-10 aspect-square flex items-center justify-center">
        <Loader />
@@ -56,20 +151,13 @@ export const DownloadItem: React.FC<DownloadProps> = ({
    );
  }

-  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 (process && process?.item.Id === item.Id) {
    return (
      <TouchableOpacity
        onPress={() => {
          router.push("/downloads");
        }}
+        {...props}
      >
        <View className="rounded h-10 aspect-square flex items-center justify-center">
          {process.progress === 0 ? (
@@ -96,6 +184,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({
        onPress={() => {
          router.push("/downloads");
        }}
+        {...props}
      >
        <View className="rounded h-10 aspect-square flex items-center justify-center opacity-50">
          <Ionicons name="hourglass" size={24} color="white" />
@@ -110,6 +199,7 @@ export const DownloadItem: React.FC<DownloadProps> = ({
        onPress={() => {
          router.push("/downloads");
        }}
+        {...props}
      >
        <View className="rounded h-10 aspect-square flex items-center justify-center">
          <Ionicons name="cloud-download" size={26} color="#9333ea" />
@@ -123,11 +213,16 @@ export const DownloadItem: React.FC<DownloadProps> = ({
          queueActions.enqueue(queue, setQueue, {
            id: item.Id!,
            execute: async () => {
-              await startRemuxing();
+              // await startRemuxing(playbackUrl);
+              if (!settings?.downloadQuality?.value) {
+                throw new Error("No download quality selected");
+              }
+              await initiateDownload(settings?.downloadQuality?.value);
            },
            item,
          });
        }}
+        {...props}
      >
        <View className="rounded h-10 aspect-square flex items-center justify-center">
          <Ionicons name="cloud-download-outline" size={26} color="white" />
--- a/components/ItemCardText.tsx
+++ b/components/ItemCardText.tsx
@@ -8,17 +8,6 @@ type ItemCardProps = {
  item: BaseItemDto;
 };

-function seasonNameToIndex(seasonName: string | null | undefined) {
-  if (!seasonName) return -1;
-  if (seasonName.startsWith("Season")) {
-    return parseInt(seasonName.replace("Season ", ""));
-  }
-  if (seasonName.startsWith("Specials")) {
-    return 0;
-  }
-  return -1;
-}
-
 export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
  return (
    <View className="mt-2 flex flex-col h-12">
@@ -28,9 +17,7 @@ export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
            {item.SeriesName}
          </Text>
          <Text numberOfLines={1} className="text-xs opacity-50">
-            {`S${seasonNameToIndex(
-              item?.SeasonName,
-            )}:E${item.IndexNumber?.toString()}`}{" "}
+            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}{" "}
            {item.Name}
          </Text>
        </>
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -1,27 +1,30 @@
+import { usePlayback } from "@/providers/PlaybackProvider";
 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 { View } from "react-native";
+import CastContext, {
+  PlayServicesState,
+  useRemoteMediaClient,
+} from "react-native-google-cast";
 import { Button } from "./Button";

 interface Props extends React.ComponentProps<typeof Button> {
-  item: BaseItemDto;
-  onPress: (type?: "cast" | "device") => void;
-  chromecastReady: boolean;
+  item?: BaseItemDto | null;
+  url?: string | null;
 }

-export const PlayButton: React.FC<Props> = ({
-  item,
-  onPress,
-  chromecastReady,
-  ...props
-}) => {
+export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
  const { showActionSheetWithOptions } = useActionSheet();
+  const client = useRemoteMediaClient();
+  const { setCurrentlyPlayingState } = usePlayback();

-  const _onPress = () => {
-    if (!chromecastReady) {
-      onPress("device");
+  const onPress = async () => {
+    if (!url || !item) return;
+
+    if (!client) {
+      setCurrentlyPlayingState({ item, url });
      return;
    }

@@ -33,28 +36,45 @@ export const PlayButton: React.FC<Props> = ({
        options,
        cancelButtonIndex,
      },
-      (selectedIndex: number | undefined) => {
+      async (selectedIndex: number | undefined) => {
        switch (selectedIndex) {
          case 0:
-            onPress("cast");
+            await CastContext.getPlayServicesState().then((state) => {
+              if (state && state !== PlayServicesState.SUCCESS)
+                CastContext.showPlayServicesErrorDialog(state);
+              else {
+                client.loadMedia({
+                  mediaInfo: {
+                    contentUrl: url,
+                    contentType: "video/mp4",
+                    metadata: {
+                      type: item.Type === "Episode" ? "tvShow" : "movie",
+                      title: item.Name || "",
+                      subtitle: item.Overview || "",
+                    },
+                  },
+                  startTime: 0,
+                });
+              }
+            });
            break;
          case 1:
-            onPress("device");
+            setCurrentlyPlayingState({ item, url });
            break;
          case cancelButtonIndex:
            break;
        }
-      },
+      }
    );
  };

  return (
    <Button
-      onPress={_onPress}
+      onPress={onPress}
      iconRight={
        <View className="flex flex-row items-center space-x-2">
          <Ionicons name="play-circle" size={24} color="white" />
-          {chromecastReady && <Feather name="cast" size={22} color="white" />}
+          {client && <Feather name="cast" size={22} color="white" />}
        </View>
      }
      {...props}
--- a/components/SubtitleTrackSelector.tsx
+++ b/components/SubtitleTrackSelector.tsx
@@ -22,14 +22,14 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
  const subtitleStreams = useMemo(
    () =>
      item.MediaSources?.[0].MediaStreams?.filter(
-        (x) => x.Type === "Subtitle",
+        (x) => x.Type === "Subtitle"
      ) ?? [],
-    [item],
+    [item]
  );

  const selectedSubtitleSteam = useMemo(
    () => subtitleStreams.find((x) => x.Index === selected),
-    [subtitleStreams, selected],
+    [subtitleStreams, selected]
  );

  useEffect(() => {
@@ -50,7 +50,7 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
          <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">
+              <TouchableOpacity className="bg-neutral-900 max-w-32 h-10 rounded-xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
                <Text className="">
                  {selectedSubtitleSteam
                    ? tc(selectedSubtitleSteam?.DisplayTitle, 13)
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -46,7 +46,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
          return;
        }

-        // Movies and all other cases
        if (item.Type === "BoxSet") {
          router.push(`/collections/${item.Id}`);
          return;
--- a/components/downloads/EpisodeCard.tsx
+++ b/components/downloads/EpisodeCard.tsx
@@ -8,12 +8,8 @@ import { useAtom } from "jotai";

 import { Text } from "../common/Text";
 import { useFiles } from "@/hooks/useFiles";
-import {
-  currentlyPlayingItemAtom,
-  fullScreenAtom,
-  playingAtom,
-} from "../CurrentlyPlayingBar";
 import { useSettings } from "@/utils/atoms/settings";
+import { usePlayback } from "@/providers/PlaybackProvider";

 interface EpisodeCardProps {
  item: BaseItemDto;
@@ -26,23 +22,15 @@ interface EpisodeCardProps {
 */
 export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
  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 { setCurrentlyPlayingState } = usePlayback();
+
  const handleOpenFile = useCallback(async () => {
-    setCurrentlyPlaying({
+    setCurrentlyPlayingState({
      item,
-      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
+      url: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
    });
-    setPlaying(true);
-    if (settings?.openFullScreenVideoPlayerByDefault === true)
-      setFullscreen(true);
-  }, [item, setCurrentlyPlaying, settings]);
+  }, [item, setCurrentlyPlayingState]);

  /**
   * Handles deleting the file with haptic feedback.
--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -9,12 +9,9 @@ import { useAtom } from "jotai";
 import { Text } from "../common/Text";
 import { useFiles } from "@/hooks/useFiles";
 import { runtimeTicksToMinutes } from "@/utils/time";
-import {
-  currentlyPlayingItemAtom,
-  fullScreenAtom,
-  playingAtom,
-} from "../CurrentlyPlayingBar";
+
 import { useSettings } from "@/utils/atoms/settings";
+import { usePlayback } from "@/providers/PlaybackProvider";

 interface MovieCardProps {
  item: BaseItemDto;
@@ -27,25 +24,16 @@ interface MovieCardProps {
 */
 export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
  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 { setCurrentlyPlayingState } = usePlayback();
+
  const handleOpenFile = useCallback(() => {
-    console.log("Open movie file", item.Name);
-    setCurrentlyPlaying({
+    setCurrentlyPlayingState({
      item,
-      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
+      url: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
    });
-    setPlaying(true);
-    if (settings?.openFullScreenVideoPlayerByDefault === true) {
-      setFullscreen(true);
-    }
-  }, [item, setCurrentlyPlaying, setPlaying, settings]);
+  }, [item, setCurrentlyPlayingState]);

  /**
   * Handles deleting the file with haptic feedback.
@@ -81,7 +69,12 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
          </View>
        </TouchableOpacity>
      </ContextMenu.Trigger>
-      <ContextMenu.Content>
+      <ContextMenu.Content
+        loop={false}
+        alignOffset={0}
+        avoidCollisions={false}
+        collisionPadding={0}
+      >
        {contextMenuOptions.map((option) => (
          <ContextMenu.Item
            key={option.label}
--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -1,8 +1,6 @@
 import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { FontAwesome, Ionicons } from "@expo/vector-icons";
 import { useQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
 import { useState } from "react";
 import { TouchableOpacity, View, ViewProps } from "react-native";
 import { FilterSheet } from "./FilterSheet";
@@ -59,7 +57,7 @@ export const FilterButton = <T,>({
        >
          <Text
            className={`
-             ${values.length > 0 ? "text-purple-100" : "text-neutral-100"}
+            ${values.length > 0 ? "text-purple-100" : "text-neutral-100"}
            text-xs font-semibold`}
          >
            {title}
--- a/components/filters/FilterSheet.tsx
+++ b/components/filters/FilterSheet.tsx
@@ -34,6 +34,34 @@ interface Props<T> extends ViewProps {

 const LIMIT = 100;

+/**
+ * FilterSheet Component
+ *
+ * This component creates a bottom sheet modal for filtering and selecting items from a list.
+ *
+ * @template T - The type of items in the list
+ *
+ * @param {Object} props - The component props
+ * @param {boolean} props.open - Whether the bottom sheet is open
+ * @param {function} props.setOpen - Function to set the open state
+ * @param {T[] | null} [props.data] - The full list of items to filter from
+ * @param {T[]} props.values - The currently selected items
+ * @param {function} props.set - Function to update the selected items
+ * @param {string} props.title - The title of the bottom sheet
+ * @param {function} props.searchFilter - Function to filter items based on search query
+ * @param {function} props.renderItemLabel - Function to render the label for each item
+ * @param {boolean} [props.showSearch=true] - Whether to show the search input
+ *
+ * @returns {React.ReactElement} The FilterSheet component
+ *
+ * Features:
+ * - Displays a list of items in a bottom sheet
+ * - Allows searching and filtering of items
+ * - Supports single selection of items
+ * - Loads items in batches for performance optimization
+ * - Customizable item rendering
+ */
+
 export const FilterSheet = <T,>({
  values,
  data: _data,
@@ -65,6 +93,8 @@ export const FilterSheet = <T,>({
    return results.slice(0, 100);
  }, [search, _data, searchFilter]);

+  // Loads data in batches of LIMIT size, starting from offset,
+  // to implement efficient "load more" functionality
  useEffect(() => {
    if (!_data || _data.length === 0) return;
    const tmp = new Set(data);
@@ -146,16 +176,14 @@ export const FilterSheet = <T,>({
              <>
                <TouchableOpacity
                  onPress={() => {
-                    set(
-                      values.includes(item)
-                        ? values.filter((i) => i !== item)
-                        : [item]
-                    );
-                    setTimeout(() => {
-                      setOpen(false);
-                    }, 250);
+                    if (!values.includes(item)) {
+                      set([item]);
+                      setTimeout(() => {
+                        setOpen(false);
+                      }, 250);
+                    }
                  }}
-                  key={index}
+                  key={`${index}`}
                  className=" bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between"
                >
                  <Text>{renderItemLabel(item)}</Text>
--- a/components/home/LargeMovieCarousel.tsx
+++ b/components/home/LargeMovieCarousel.tsx
@@ -31,6 +31,25 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);

+  const { data: sf_carousel, isFetching: l1 } = useQuery({
+    queryKey: ["sf_carousel", user?.Id, settings?.mediaListCollectionIds],
+    queryFn: async () => {
+      if (!api || !user?.Id) return null;
+
+      const response = await getItemsApi(api).getItems({
+        userId: user.Id,
+        tags: ["sf_carousel"],
+        recursive: true,
+        fields: ["Tags"],
+        includeItemTypes: ["BoxSet"],
+      });
+
+      return response.data.Items?.[0].Id || null;
+    },
+    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
+    staleTime: 0,
+  });
+
  const onPressPagination = (index: number) => {
    ref.current?.scrollTo({
      /**
@@ -42,40 +61,20 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
    });
  };

-  const { data: mediaListCollection, isLoading: l1 } = useQuery<string | null>({
-    queryKey: ["mediaListCollection", user?.Id],
-    queryFn: async () => {
-      if (!api || !user?.Id) return null;
-
-      const response = await getItemsApi(api).getItems({
-        userId: user.Id,
-        tags: ["medialist", "promoted"],
-        recursive: true,
-        fields: ["Tags"],
-        includeItemTypes: ["BoxSet"],
-      });
-
-      const id = response.data.Items?.find((c) => c.Name === "sf_carousel")?.Id;
-      return id || null;
-    },
-    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
-    staleTime: 0,
-  });
-
-  const { data: popularItems, isLoading: l2 } = useQuery<BaseItemDto[]>({
+  const { data: popularItems, isFetching: l2 } = useQuery<BaseItemDto[]>({
    queryKey: ["popular", user?.Id],
    queryFn: async () => {
-      if (!api || !user?.Id || !mediaListCollection) return [];
+      if (!api || !user?.Id || !sf_carousel) return [];

      const response = await getItemsApi(api).getItems({
        userId: user.Id,
-        parentId: mediaListCollection,
+        parentId: sf_carousel,
        limit: 10,
      });

      return response.data.Items || [];
    },
-    enabled: !!api && !!user?.Id && !!mediaListCollection,
+    enabled: !!api && !!user?.Id && !!sf_carousel,
    staleTime: 0,
  });

@@ -94,7 +93,7 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
    <View className="flex flex-col items-center" {...props}>
      <Carousel
        autoPlay={true}
-        autoPlayInterval={2000}
+        autoPlayInterval={3000}
        loop={true}
        ref={ref}
        width={width}
--- a/components/home/ScrollingCollectionList.tsx
+++ b/components/home/ScrollingCollectionList.tsx
@@ -41,7 +41,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
            key={index}
            item={item}
            className={`flex flex-col
-              ${orientation === "vertical" ? "w-32" : "w-48"}
+              ${orientation === "vertical" ? "w-28" : "w-44"}
            `}
          >
            <View>
--- a/components/medialists/MediaListSection.tsx
+++ b/components/medialists/MediaListSection.tsx
@@ -13,6 +13,7 @@ import { InfiniteHorizontalScroll } from "../common/InfiniteHorrizontalScroll";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
 import MoviePoster from "../posters/MoviePoster";
 import { useCallback } from "react";
+import { ItemCardText } from "../ItemCardText";

 interface Props extends ViewProps {
  collection: BaseItemDto;
@@ -56,11 +57,12 @@ export const MediaListSection: React.FC<Props> = ({ collection, ...props }) => {
            key={index}
            item={item}
            className={`flex flex-col
-              ${"w-32"}
+              ${"w-28"}
            `}
          >
            <View>
              <MoviePoster item={item} />
+              <ItemCardText item={item} />
            </View>
          </TouchableItemRouter>
        )}
--- a/components/series/CastAndCrew.tsx
+++ b/components/series/CastAndCrew.tsx
@@ -10,11 +10,16 @@ import Poster from "../posters/Poster";
 import { useAtom } from "jotai";
 import { apiAtom } from "@/providers/JellyfinProvider";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { router } from "expo-router";
+import { router, usePathname } from "expo-router";
+import { useSettings } from "@/utils/atoms/settings";

 export const CastAndCrew = ({ item }: { item: BaseItemDto }) => {
  const [api] = useAtom(apiAtom);

+  const [settings] = useSettings();
+
+  const pathname = usePathname();
+
  return (
    <View>
      <Text className="text-lg font-bold mb-2 px-4">Cast & Crew</Text>
@@ -23,7 +28,10 @@ export const CastAndCrew = ({ item }: { item: BaseItemDto }) => {
        renderItem={(item, index) => (
          <TouchableOpacity
            onPress={() => {
-              // TODO: Navigate to person
+              if (settings?.searchEngine === "Marlin")
+                router.push(`/search?q=${item.Name}&prev=${pathname}`);
+              else
+                Linking.openURL(`https://www.google.com/search?q=${item.Name}`);
            }}
            key={item.Id}
            className="flex flex-col w-32"
--- a/components/series/NextUp.tsx
+++ b/components/series/NextUp.tsx
@@ -52,7 +52,7 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
              router.push(`/(auth)/items/${item.Id}`);
            }}
            key={item.Id}
-            className="flex flex-col w-32"
+            className="flex flex-col w-44"
          >
            <ContinueWatchingPoster item={item} />
            <ItemCardText item={item} />
--- a/components/series/SeasonPicker.tsx
+++ b/components/series/SeasonPicker.tsx
@@ -1,26 +1,33 @@
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { runtimeTicksToSeconds } from "@/utils/time";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useQuery } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
 import { atom, useAtom } from "jotai";
-import { useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
-import { ItemCardText } from "../ItemCardText";
-import { HorizontalScroll } from "../common/HorrizontalScroll";
+import { DownloadItem } from "../DownloadItem";
+import { Loader } from "../Loader";
 import { Text } from "../common/Text";

 type Props = {
  item: BaseItemDto;
 };

-export const seasonIndexAtom = atom<number>(1);
+type SeasonIndexState = {
+  [seriesId: string]: number;
+};
+
+export const seasonIndexAtom = atom<SeasonIndexState>({});

 export const SeasonPicker: React.FC<Props> = ({ item }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const [seasonIndex, setSeasonIndex] = useAtom(seasonIndexAtom);
+  const [seasonIndexState, setSeasonIndexState] = useAtom(seasonIndexAtom);
+
+  const seasonIndex = seasonIndexState[item.Id ?? ""];

  const router = useRouter();

@@ -40,7 +47,7 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
          headers: {
            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
          },
-        },
+        }
      );

      return response.data.Items;
@@ -48,13 +55,24 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
    enabled: !!api && !!user?.Id && !!item.Id,
  });

+  useEffect(() => {
+    if (seasons && seasons.length > 0 && seasonIndex === undefined) {
+      const firstSeason = seasons[0];
+      if (firstSeason.IndexNumber !== undefined) {
+        setSeasonIndexState((prev) => ({
+          ...prev,
+          [item.Id ?? ""]: firstSeason.IndexNumber,
+        }));
+      }
+    }
+  }, [seasons, seasonIndex, setSeasonIndexState, item.Id]);
  const selectedSeasonId: string | null = useMemo(
    () =>
      seasons?.find((season: any) => season.IndexNumber === seasonIndex)?.Id,
-    [seasons, seasonIndex],
+    [seasons, seasonIndex]
  );

-  const { data: episodes } = useQuery({
+  const { data: episodes, isFetching } = useQuery({
    queryKey: ["episodes", item.Id, selectedSeasonId],
    queryFn: async () => {
      if (!api || !user?.Id || !item.Id) return [];
@@ -70,7 +88,7 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
          headers: {
            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
          },
-        },
+        }
      );

      return response.data.Items as BaseItemDto[];
@@ -78,8 +96,20 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
    enabled: !!api && !!user?.Id && !!item.Id && !!selectedSeasonId,
  });

+  // Used for height calculation
+  const [nrOfEpisodes, setNrOfEpisodes] = useState(0);
+  useEffect(() => {
+    if (episodes && episodes.length > 0) {
+      setNrOfEpisodes(episodes.length);
+    }
+  }, [episodes]);
+
  return (
-    <View className="mb-2">
+    <View
+      style={{
+        minHeight: 144 * nrOfEpisodes,
+      }}
+    >
      <DropdownMenu.Root>
        <DropdownMenu.Trigger>
          <View className="flex flex-row px-4">
@@ -102,7 +132,10 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
            <DropdownMenu.Item
              key={season.Name}
              onSelect={() => {
-                setSeasonIndex(season.IndexNumber);
+                setSeasonIndexState((prev) => ({
+                  ...prev,
+                  [item.Id ?? ""]: season.IndexNumber,
+                }));
              }}
            >
              <DropdownMenu.ItemTitle>{season.Name}</DropdownMenu.ItemTitle>
@@ -110,7 +143,8 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
          ))}
        </DropdownMenu.Content>
      </DropdownMenu.Root>
-      {episodes && (
+      {/* Old View. Might have a setting later to manually select view. */}
+      {/* {episodes && (
        <View className="mt-4">
          <HorizontalScroll<BaseItemDto>
            data={episodes}
@@ -128,7 +162,56 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
            )}
          />
        </View>
-      )}
+      )} */}
+      <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) => (
+            <TouchableOpacity
+              key={e.Id}
+              onPress={() => {
+                router.push(`/(auth)/items/${e.Id}`);
+              }}
+              className="flex flex-col mb-4"
+            >
+              <View className="flex flex-row items-center mb-2">
+                <View className="w-32 aspect-video overflow-hidden mr-2">
+                  <ContinueWatchingPoster item={e} width={128} />
+                </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">
+                  <DownloadItem item={e} />
+                </View>
+              </View>
+
+              <Text
+                numberOfLines={3}
+                className="text-xs text-neutral-500 shrink"
+              >
+                {e.Overview}
+              </Text>
+            </TouchableOpacity>
+          ))
+        )}
+      </View>
    </View>
  );
 };
--- a/components/settings/SettingToggles.tsx
+++ b/components/settings/SettingToggles.tsx
@@ -1,12 +1,15 @@
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
+import { DownloadOptions, useSettings } from "@/utils/atoms/settings";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom } from "jotai";
 import { Linking, Switch, TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "../common/Text";
 import { Loader } from "../Loader";
+import { Input } from "../common/Input";
+import { useState } from "react";
+import { Button } from "../Button";

 export const SettingToggles: React.FC = () => {
  const [settings, updateSettings] = useSettings();
@@ -14,26 +17,27 @@ export const SettingToggles: React.FC = () => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);

+  const [marlinUrl, setMarlinUrl] = useState<string>("");
+
+  const queryClient = useQueryClient();
+
  const {
    data: mediaListCollections,
    isLoading: isLoadingMediaListCollections,
  } = useQuery({
-    queryKey: ["mediaListCollections", user?.Id],
+    queryKey: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
    queryFn: async () => {
      if (!api || !user?.Id) return [];

      const response = await getItemsApi(api).getItems({
        userId: user.Id,
-        tags: ["medialist", "promoted"],
+        tags: ["sf_promoted"],
        recursive: true,
        fields: ["Tags"],
        includeItemTypes: ["BoxSet"],
      });

-      const ids =
-        response.data.Items?.filter((c) => c.Name !== "sf_carousel") ?? [];
-
-      return ids;
+      return response.data.Items ?? [];
    },
    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
    staleTime: 0,
@@ -54,6 +58,46 @@ export const SettingToggles: React.FC = () => {
          onValueChange={(value) => updateSettings({ autoRotate: value })}
        />
      </View>
+      <View
+        className={`
+            flex flex-row items-center space-x-2 justify-between bg-neutral-900 p-4
+          `}
+      >
+        <View className="flex flex-col shrink">
+          <Text className="font-semibold">Download quality</Text>
+          <Text className="text-xs opacity-50">
+            Choose the search engine you want to use.
+          </Text>
+        </View>
+        <DropdownMenu.Root>
+          <DropdownMenu.Trigger>
+            <TouchableOpacity className="bg-neutral-800 rounded-lg border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
+              <Text>{settings?.downloadQuality?.label}</Text>
+            </TouchableOpacity>
+          </DropdownMenu.Trigger>
+          <DropdownMenu.Content
+            loop={true}
+            side="bottom"
+            align="start"
+            alignOffset={0}
+            avoidCollisions={true}
+            collisionPadding={8}
+            sideOffset={8}
+          >
+            <DropdownMenu.Label>Quality</DropdownMenu.Label>
+            {DownloadOptions.map((option) => (
+              <DropdownMenu.Item
+                key={option.value}
+                onSelect={() => {
+                  updateSettings({ downloadQuality: option });
+                }}
+              >
+                <DropdownMenu.ItemTitle>{option.label}</DropdownMenu.ItemTitle>
+              </DropdownMenu.Item>
+            ))}
+          </DropdownMenu.Content>
+        </DropdownMenu.Root>
+      </View>
      <View className="flex flex-row items-center justify-between bg-neutral-900 p-4">
        <View className="shrink">
          <Text className="font-semibold">Start videos in fullscreen</Text>
@@ -69,6 +113,23 @@ export const SettingToggles: React.FC = () => {
          }
        />
      </View>
+
+      <View className="flex flex-row space-x-2 items-center justify-between bg-neutral-900 p-4">
+        <View className="flex flex-col shrink">
+          <Text className="font-semibold">Use external player (VLC)</Text>
+          <Text className="text-xs opacity-50 shrink">
+            Open all videos in VLC instead of the default player. This requries
+            VLC to be installed on the phone.
+          </Text>
+        </View>
+        <Switch
+          value={settings?.openInVLC}
+          onValueChange={(value) => {
+            updateSettings({ openInVLC: value, forceDirectPlay: value });
+          }}
+        />
+      </View>
+
      <View className="flex flex-col">
        <View className="flex flex-row items-center justify-between bg-neutral-900 p-4">
          <View className="flex flex-col">
@@ -152,6 +213,7 @@ export const SettingToggles: React.FC = () => {
          onValueChange={(value) => updateSettings({ forceDirectPlay: value })}
        />
      </View>
+
      <View
        className={`
        flex flex-row items-center space-x-2 justify-between bg-neutral-900 p-4
@@ -208,6 +270,89 @@ export const SettingToggles: React.FC = () => {
          </DropdownMenu.Content>
        </DropdownMenu.Root>
      </View>
+      <View className="flex flex-col">
+        <View
+          className={`
+            flex flex-row items-center space-x-2 justify-between bg-neutral-900 p-4
+          `}
+        >
+          <View className="flex flex-col shrink">
+            <Text className="font-semibold">Search engine</Text>
+            <Text className="text-xs opacity-50">
+              Choose the search engine you want to use.
+            </Text>
+          </View>
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger>
+              <TouchableOpacity className="bg-neutral-800 rounded-lg border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
+                <Text>{settings?.searchEngine}</Text>
+              </TouchableOpacity>
+            </DropdownMenu.Trigger>
+            <DropdownMenu.Content
+              loop={true}
+              side="bottom"
+              align="start"
+              alignOffset={0}
+              avoidCollisions={true}
+              collisionPadding={8}
+              sideOffset={8}
+            >
+              <DropdownMenu.Label>Profiles</DropdownMenu.Label>
+              <DropdownMenu.Item
+                key="1"
+                onSelect={() => {
+                  updateSettings({ searchEngine: "Jellyfin" });
+                  queryClient.invalidateQueries({ queryKey: ["search"] });
+                }}
+              >
+                <DropdownMenu.ItemTitle>Jellyfin</DropdownMenu.ItemTitle>
+              </DropdownMenu.Item>
+              <DropdownMenu.Item
+                key="2"
+                onSelect={() => {
+                  updateSettings({ searchEngine: "Marlin" });
+                  queryClient.invalidateQueries({ queryKey: ["search"] });
+                }}
+              >
+                <DropdownMenu.ItemTitle>Marlin</DropdownMenu.ItemTitle>
+              </DropdownMenu.Item>
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        </View>
+        {settings?.searchEngine === "Marlin" && (
+          <View className="flex flex-col bg-neutral-900 px-4 pb-4">
+            <>
+              <View className="flex flex-row items-center space-x-2">
+                <View className="grow">
+                  <Input
+                    placeholder="Marlin Server URL..."
+                    defaultValue={settings.marlinServerUrl}
+                    value={marlinUrl}
+                    keyboardType="url"
+                    returnKeyType="done"
+                    autoCapitalize="none"
+                    textContentType="URL"
+                    onChangeText={(text) => setMarlinUrl(text)}
+                  />
+                </View>
+                <Button
+                  color="purple"
+                  className="shrink w-16 h-12"
+                  onPress={() => {
+                    updateSettings({ marlinServerUrl: marlinUrl });
+                  }}
+                >
+                  Save
+                </Button>
+              </View>
+
+              <Text className="text-neutral-500 mt-2">
+                {settings?.marlinServerUrl}
+              </Text>
+            </>
+          </View>
+        )}
+      </View>
    </View>
  );
 };
--- a/eas.json
+++ b/eas.json
@@ -21,13 +21,13 @@
      }
    },
    "production": {
-      "channel": "0.6.1",
+      "channel": "0.8.1",
      "android": {
        "image": "latest"
      }
    },
    "production-apk": {
-      "channel": "0.6.1",
+      "channel": "0.8.1",
      "android": {
        "buildType": "apk",
        "image": "latest"
--- a/hooks/useRemuxHlsToMp4.ts
+++ b/hooks/useRemuxHlsToMp4.ts
@@ -6,6 +6,7 @@ import { FFmpegKit, FFmpegKitConfig } from "ffmpeg-kit-react-native";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { runningProcesses } from "@/utils/atoms/downloads";
 import { writeToLog } from "@/utils/log";
+import { useQueryClient } from "@tanstack/react-query";

 /**
 * Custom hook for remuxing HLS to MP4 using FFmpeg.
@@ -14,8 +15,9 @@ import { writeToLog } from "@/utils/log";
 * @param item - The BaseItemDto object representing the media item
 * @returns An object with remuxing-related functions
 */
-export const useRemuxHlsToMp4 = (url: string, item: BaseItemDto) => {
+export const useRemuxHlsToMp4 = (item: BaseItemDto) => {
  const [_, setProgress] = useAtom(runningProcesses);
+  const queryClient = useQueryClient();

  if (!item.Id || !item.Name) {
    writeToLog("ERROR", "useRemuxHlsToMp4 ~ missing arguments");
@@ -23,87 +25,94 @@ export const useRemuxHlsToMp4 = (url: string, item: BaseItemDto) => {
  }

  const output = `${FileSystem.documentDirectory}${item.Id}.mp4`;
-  const command = `-y -loglevel quiet -thread_queue_size 512 -protocol_whitelist file,http,https,tcp,tls,crypto -multiple_requests 1 -tcp_nodelay 1 -fflags +genpts -i ${url} -c copy -bufsize 50M -max_muxing_queue_size 4096 ${output}`;

-  const startRemuxing = useCallback(async () => {
-    writeToLog(
-      "INFO",
-      `useRemuxHlsToMp4 ~ startRemuxing for item ${item.Name}`,
-    );
+  const startRemuxing = useCallback(
+    async (url: string) => {
+      const command = `-y -loglevel quiet -thread_queue_size 512 -protocol_whitelist file,http,https,tcp,tls,crypto -multiple_requests 1 -tcp_nodelay 1 -fflags +genpts -i ${url} -c copy -bufsize 50M -max_muxing_queue_size 4096 ${output}`;

-    try {
-      setProgress({ item, progress: 0, startTime: new Date(), speed: 0 });
-
-      FFmpegKitConfig.enableStatisticsCallback((statistics) => {
-        const videoLength =
-          (item.MediaSources?.[0]?.RunTimeTicks || 0) / 10000000; // In seconds
-        const fps = item.MediaStreams?.[0]?.RealFrameRate || 25;
-        const totalFrames = videoLength * fps;
-        const processedFrames = statistics.getVideoFrameNumber();
-        const speed = statistics.getSpeed();
-
-        const percentage =
-          totalFrames > 0
-            ? Math.floor((processedFrames / totalFrames) * 100)
-            : 0;
-
-        setProgress((prev) =>
-          prev?.item.Id === item.Id!
-            ? { ...prev, progress: percentage, speed }
-            : prev,
-        );
-      });
-
-      // Await the execution of the FFmpeg command and ensure that the callback is awaited properly.
-      await new Promise<void>((resolve, reject) => {
-        FFmpegKit.executeAsync(command, async (session) => {
-          try {
-            const returnCode = await session.getReturnCode();
-
-            if (returnCode.isValueSuccess()) {
-              await updateDownloadedFiles(item);
-              writeToLog(
-                "INFO",
-                `useRemuxHlsToMp4 ~ remuxing completed successfully for item: ${item.Name}`,
-              );
-              resolve();
-            } else if (returnCode.isValueError()) {
-              writeToLog(
-                "ERROR",
-                `useRemuxHlsToMp4 ~ remuxing failed for item: ${item.Name}`,
-              );
-              reject(new Error("Remuxing failed")); // Reject the promise on error
-            } else if (returnCode.isValueCancel()) {
-              writeToLog(
-                "INFO",
-                `useRemuxHlsToMp4 ~ remuxing was canceled for item: ${item.Name}`,
-              );
-              resolve();
-            }
-
-            setProgress(null);
-          } catch (error) {
-            reject(error);
-          }
-        });
-      });
-    } catch (error) {
-      console.error("Failed to remux:", error);
      writeToLog(
-        "ERROR",
-        `useRemuxHlsToMp4 ~ remuxing failed for item: ${item.Name}`,
+        "INFO",
+        `useRemuxHlsToMp4 ~ startRemuxing for item ${item.Name}`
      );
-      setProgress(null);
-      throw error; // Re-throw the error to propagate it to the caller
-    }
-  }, [output, item, command, setProgress]);
+
+      try {
+        setProgress({ item, progress: 0, startTime: new Date(), speed: 0 });
+
+        FFmpegKitConfig.enableStatisticsCallback((statistics) => {
+          const videoLength =
+            (item.MediaSources?.[0]?.RunTimeTicks || 0) / 10000000; // In seconds
+          const fps = item.MediaStreams?.[0]?.RealFrameRate || 25;
+          const totalFrames = videoLength * fps;
+          const processedFrames = statistics.getVideoFrameNumber();
+          const speed = statistics.getSpeed();
+
+          const percentage =
+            totalFrames > 0
+              ? Math.floor((processedFrames / totalFrames) * 100)
+              : 0;
+
+          setProgress((prev) =>
+            prev?.item.Id === item.Id!
+              ? { ...prev, progress: percentage, speed }
+              : prev
+          );
+        });
+
+        // Await the execution of the FFmpeg command and ensure that the callback is awaited properly.
+        await new Promise<void>((resolve, reject) => {
+          FFmpegKit.executeAsync(command, async (session) => {
+            try {
+              const returnCode = await session.getReturnCode();
+
+              if (returnCode.isValueSuccess()) {
+                await updateDownloadedFiles(item);
+                writeToLog(
+                  "INFO",
+                  `useRemuxHlsToMp4 ~ remuxing completed successfully for item: ${item.Name}`
+                );
+                resolve();
+              } else if (returnCode.isValueError()) {
+                writeToLog(
+                  "ERROR",
+                  `useRemuxHlsToMp4 ~ remuxing failed for item: ${item.Name}`
+                );
+                reject(new Error("Remuxing failed")); // Reject the promise on error
+              } else if (returnCode.isValueCancel()) {
+                writeToLog(
+                  "INFO",
+                  `useRemuxHlsToMp4 ~ remuxing was canceled for item: ${item.Name}`
+                );
+                resolve();
+              }
+
+              setProgress(null);
+            } catch (error) {
+              reject(error);
+            }
+          });
+        });
+
+        await queryClient.invalidateQueries({ queryKey: ["downloaded_files"] });
+        await queryClient.invalidateQueries({ queryKey: ["downloaded"] });
+      } catch (error) {
+        console.error("Failed to remux:", error);
+        writeToLog(
+          "ERROR",
+          `useRemuxHlsToMp4 ~ remuxing failed for item: ${item.Name}`
+        );
+        setProgress(null);
+        throw error; // Re-throw the error to propagate it to the caller
+      }
+    },
+    [output, item, setProgress]
+  );

  const cancelRemuxing = useCallback(() => {
    FFmpegKit.cancel();
    setProgress(null);
    writeToLog(
      "INFO",
-      `useRemuxHlsToMp4 ~ remuxing cancelled for item: ${item.Name}`,
+      `useRemuxHlsToMp4 ~ remuxing cancelled for item: ${item.Name}`
    );
  }, [item.Name, setProgress]);

@@ -118,7 +127,7 @@ export const useRemuxHlsToMp4 = (url: string, item: BaseItemDto) => {
 async function updateDownloadedFiles(item: BaseItemDto): Promise<void> {
  try {
    const currentFiles: BaseItemDto[] = JSON.parse(
-      (await AsyncStorage.getItem("downloaded_files")) || "[]",
+      (await AsyncStorage.getItem("downloaded_files")) || "[]"
    );
    const updatedFiles = [
      ...currentFiles.filter((i) => i.Id !== item.Id),
@@ -126,13 +135,13 @@ async function updateDownloadedFiles(item: BaseItemDto): Promise<void> {
    ];
    await AsyncStorage.setItem(
      "downloaded_files",
-      JSON.stringify(updatedFiles),
+      JSON.stringify(updatedFiles)
    );
  } catch (error) {
    console.error("Error updating downloaded files:", error);
    writeToLog(
      "ERROR",
-      `Failed to update downloaded files for item: ${item.Name}`,
+      `Failed to update downloaded files for item: ${item.Name}`
    );
  }
 }
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
    "expo-device": "~6.0.2",
    "expo-font": "~12.0.9",
    "expo-haptics": "~13.0.1",
-    "expo-image": "~1.12.13",
+    "expo-image": "~1.12.14",
    "expo-keep-awake": "~13.0.2",
    "expo-linking": "~6.3.1",
    "expo-navigation-bar": "~3.0.7",
@@ -85,7 +85,7 @@
    "@types/react": "~18.2.45",
    "@types/react-test-renderer": "^18.0.7",
    "jest": "^29.2.1",
-    "jest-expo": "~51.0.3",
+    "jest-expo": "~51.0.4",
    "react-test-renderer": "18.2.0",
    "typescript": "~5.3.3"
  },
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -1,8 +1,13 @@
+import {
+  currentlyPlayingItemAtom,
+  playingAtom,
+  showCurrentlyPlayingBarAtom,
+} from "@/utils/atoms/playState";
 import { Api, Jellyfin } from "@jellyfin/sdk";
 import { UserDto } from "@jellyfin/sdk/lib/generated-client/models";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { isLoaded } from "expo-font";
+import axios from "axios";
 import { router, useSegments } from "expo-router";
 import { atom, useAtom } from "jotai";
 import React, {
@@ -21,6 +26,7 @@ interface Server {

 export const apiAtom = atom<Api | null>(null);
 export const userAtom = atom<UserDto | null>(null);
+export const wsAtom = atom<WebSocket | null>(null);

 interface JellyfinContextValue {
  discoverServers: (url: string) => Promise<Server[]>;
@@ -31,7 +37,7 @@ interface JellyfinContextValue {
 }

 const JellyfinContext = createContext<JellyfinContextValue | undefined>(
-  undefined,
+  undefined
 );

 const getOrSetDeviceId = async () => {
@@ -49,6 +55,8 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
  children,
 }) => {
  const [jellyfin, setJellyfin] = useState<Jellyfin | undefined>(undefined);
+  const [deviceId, setDeviceId] = useState<string | undefined>(undefined);
+  const [isConnected, setIsConnected] = useState<boolean>(false);

  useEffect(() => {
    (async () => {
@@ -56,10 +64,11 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      setJellyfin(
        () =>
          new Jellyfin({
-            clientInfo: { name: "Streamyfin", version: "0.6.1" },
+            clientInfo: { name: "Streamyfin", version: "0.8.1" },
            deviceInfo: { name: Platform.OS === "ios" ? "iOS" : "Android", id },
-          }),
+          })
      );
+      setDeviceId(id);
    })();
  }, []);

@@ -67,8 +76,9 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
  const [user, setUser] = useAtom(userAtom);

  const discoverServers = async (url: string): Promise<Server[]> => {
-    const servers =
-      await jellyfin?.discovery.getRecommendedServerCandidates(url);
+    const servers = await jellyfin?.discovery.getRecommendedServerCandidates(
+      url
+    );
    return servers?.map((server) => ({ address: server.address })) || [];
  };

@@ -106,15 +116,40 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    }) => {
      if (!api || !jellyfin) throw new Error("API not initialized");

-      const auth = await api.authenticateUserByName(username, password);
+      try {
+        const auth = await api.authenticateUserByName(username, password);

-      if (auth.data.AccessToken && auth.data.User) {
-        setUser(auth.data.User);
-        await AsyncStorage.setItem("user", JSON.stringify(auth.data.User));
-        setApi(jellyfin.createApi(api?.basePath, auth.data?.AccessToken));
-        await AsyncStorage.setItem("token", auth.data?.AccessToken);
-      } else {
-        throw new Error("Invalid username or password");
+        if (auth.data.AccessToken && auth.data.User) {
+          setUser(auth.data.User);
+          await AsyncStorage.setItem("user", JSON.stringify(auth.data.User));
+          setApi(jellyfin.createApi(api?.basePath, auth.data?.AccessToken));
+          await AsyncStorage.setItem("token", auth.data?.AccessToken);
+        }
+      } catch (error) {
+        if (axios.isAxiosError(error)) {
+          console.log("Axios error", error.response?.status);
+          switch (error.response?.status) {
+            case 401:
+              throw new Error("Invalid username or password");
+            case 403:
+              throw new Error("User does not have permission to log in");
+            case 408:
+              throw new Error(
+                "Server is taking too long to respond, try again later"
+              );
+            case 429:
+              throw new Error(
+                "Server received too many requests, try again later"
+              );
+            case 500:
+              throw new Error("There is a server error");
+            default:
+              throw new Error(
+                "An unexpected error occurred. Did you enter the server URL correctly?"
+              );
+          }
+        }
+        throw error;
      }
    },
    onError: (error) => {
@@ -144,7 +179,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
        const token = await AsyncStorage.getItem("token");
        const serverUrl = await AsyncStorage.getItem("serverUrl");
        const user = JSON.parse(
-          (await AsyncStorage.getItem("user")) as string,
+          (await AsyncStorage.getItem("user")) as string
        ) as UserDto;

        if (serverUrl && token && user.Id && jellyfin) {
--- a/providers/PlaybackProvider.tsx
+++ b/providers/PlaybackProvider.tsx
@@ -0,0 +1,281 @@
+import { useQuery } from "@tanstack/react-query";
+import React, {
+  createContext,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
+
+import { useSettings } from "@/utils/atoms/settings";
+import { reportPlaybackProgress } from "@/utils/jellyfin/playstate/reportPlaybackProgress";
+import { reportPlaybackStopped } from "@/utils/jellyfin/playstate/reportPlaybackStopped";
+import {
+  BaseItemDto,
+  PlaybackInfoResponse,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
+import { useAtom } from "jotai";
+import { OnProgressData, type VideoRef } from "react-native-video";
+import { apiAtom, userAtom } from "./JellyfinProvider";
+import { getDeviceId } from "@/utils/device";
+import * as Linking from "expo-linking";
+import { Platform } from "react-native";
+
+type CurrentlyPlayingState = {
+  url: string;
+  item: BaseItemDto;
+};
+
+interface PlaybackContextType {
+  sessionData: PlaybackInfoResponse | null | undefined;
+  currentlyPlaying: CurrentlyPlayingState | null;
+  videoRef: React.MutableRefObject<VideoRef | null>;
+  isPlaying: boolean;
+  isFullscreen: boolean;
+  progressTicks: number | null;
+  playVideo: () => void;
+  pauseVideo: () => void;
+  stopPlayback: () => void;
+  presentFullscreenPlayer: () => void;
+  dismissFullscreenPlayer: () => void;
+  setIsFullscreen: (isFullscreen: boolean) => void;
+  setIsPlaying: (isPlaying: boolean) => void;
+  onProgress: (data: OnProgressData) => void;
+  setCurrentlyPlayingState: (
+    currentlyPlaying: CurrentlyPlayingState | null
+  ) => void;
+}
+
+const PlaybackContext = createContext<PlaybackContextType | null>(null);
+
+export const PlaybackProvider: React.FC<{ children: ReactNode }> = ({
+  children,
+}) => {
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const videoRef = useRef<VideoRef | null>(null);
+
+  const [settings] = useSettings();
+
+  const [isPlaying, setIsPlaying] = useState<boolean>(false);
+  const [isFullscreen, setIsFullscreen] = useState<boolean>(false);
+  const [progressTicks, setProgressTicks] = useState<number | null>(0);
+  const [currentlyPlaying, setCurrentlyPlaying] =
+    useState<CurrentlyPlayingState | null>(null);
+
+  // WS
+  const [ws, setWs] = useState<WebSocket | null>(null);
+  const [isConnected, setIsConnected] = useState(false);
+
+  const { data: sessionData } = useQuery({
+    queryKey: ["sessionData", currentlyPlaying?.item.Id, user?.Id, api],
+    queryFn: async () => {
+      if (!currentlyPlaying?.item.Id) return null;
+      const playbackData = await getMediaInfoApi(api!).getPlaybackInfo({
+        itemId: currentlyPlaying?.item.Id,
+        userId: user?.Id,
+      });
+      return playbackData.data;
+    },
+    enabled: !!currentlyPlaying?.item.Id && !!api && !!user?.Id,
+  });
+
+  const { data: deviceId } = useQuery({
+    queryKey: ["deviceId", api],
+    queryFn: getDeviceId,
+  });
+
+  const setCurrentlyPlayingState = useCallback(
+    (state: CurrentlyPlayingState | null) => {
+      const vlcLink = "vlc://" + state?.url;
+      console.log(vlcLink, settings?.openInVLC, Platform.OS === "ios");
+      if (vlcLink && settings?.openInVLC) {
+        Linking.openURL("vlc://" + state?.url || "");
+        return;
+      }
+
+      if (state) {
+        setCurrentlyPlaying(state);
+        setIsPlaying(true);
+
+        if (settings?.openFullScreenVideoPlayerByDefault)
+          presentFullscreenPlayer();
+      } else {
+        setCurrentlyPlaying(null);
+        setIsFullscreen(false);
+        setIsPlaying(false);
+      }
+    },
+    [settings]
+  );
+
+  // Define control methods
+  const playVideo = useCallback(() => {
+    videoRef.current?.resume();
+    setIsPlaying(true);
+    reportPlaybackProgress({
+      api,
+      itemId: currentlyPlaying?.item.Id,
+      positionTicks: progressTicks ? progressTicks : 0,
+      sessionId: sessionData?.PlaySessionId,
+      IsPaused: true,
+    });
+  }, [
+    api,
+    currentlyPlaying?.item.Id,
+    sessionData?.PlaySessionId,
+    progressTicks,
+  ]);
+
+  const pauseVideo = useCallback(() => {
+    videoRef.current?.pause();
+    setIsPlaying(false);
+    reportPlaybackProgress({
+      api,
+      itemId: currentlyPlaying?.item.Id,
+      positionTicks: progressTicks ? progressTicks : 0,
+      sessionId: sessionData?.PlaySessionId,
+      IsPaused: false,
+    });
+  }, [sessionData?.PlaySessionId, currentlyPlaying?.item.Id, progressTicks]);
+
+  const stopPlayback = useCallback(async () => {
+    await reportPlaybackStopped({
+      api,
+      itemId: currentlyPlaying?.item?.Id,
+      sessionId: sessionData?.PlaySessionId,
+      positionTicks: progressTicks ? progressTicks : 0,
+    });
+    setCurrentlyPlayingState(null);
+  }, [currentlyPlaying, sessionData, progressTicks]);
+
+  const onProgress = useCallback(
+    ({ currentTime }: OnProgressData) => {
+      const ticks = currentTime * 10000000;
+      setProgressTicks(ticks);
+      reportPlaybackProgress({
+        api,
+        itemId: currentlyPlaying?.item.Id,
+        positionTicks: ticks,
+        sessionId: sessionData?.PlaySessionId,
+        IsPaused: !isPlaying,
+      });
+    },
+    [sessionData?.PlaySessionId, currentlyPlaying?.item.Id, isPlaying]
+  );
+
+  const presentFullscreenPlayer = useCallback(() => {
+    videoRef.current?.presentFullscreenPlayer();
+    setIsFullscreen(true);
+  }, []);
+
+  const dismissFullscreenPlayer = useCallback(() => {
+    videoRef.current?.dismissFullscreenPlayer();
+    setIsFullscreen(false);
+  }, []);
+
+  useEffect(() => {
+    if (!deviceId || !api?.accessToken) return;
+
+    const url = `wss://${api?.basePath
+      .replace("https://", "")
+      .replace("http://", "")}/socket?api_key=${
+      api?.accessToken
+    }&deviceId=${deviceId}`;
+
+    console.log("WS", url);
+
+    const newWebSocket = new WebSocket(url);
+
+    let keepAliveInterval: NodeJS.Timeout | null = null;
+
+    newWebSocket.onopen = () => {
+      setIsConnected(true);
+      // Start sending "KeepAlive" message every 30 seconds
+      keepAliveInterval = setInterval(() => {
+        if (newWebSocket.readyState === WebSocket.OPEN) {
+          newWebSocket.send(JSON.stringify({ MessageType: "KeepAlive" }));
+          console.log("KeepAlive message sent");
+        }
+      }, 30000);
+    };
+
+    newWebSocket.onerror = (e) => {
+      console.error("WebSocket error:", e);
+      setIsConnected(false);
+    };
+
+    newWebSocket.onclose = (e) => {
+      console.log("WebSocket connection closed:", e.reason);
+      if (keepAliveInterval) {
+        clearInterval(keepAliveInterval);
+      }
+    };
+
+    setWs(newWebSocket);
+
+    return () => {
+      if (keepAliveInterval) {
+        clearInterval(keepAliveInterval);
+      }
+      newWebSocket.close();
+    };
+  }, [api, deviceId, user]);
+
+  useEffect(() => {
+    if (!ws) return;
+
+    ws.onmessage = (e) => {
+      const json = JSON.parse(e.data);
+      const command = json?.Data?.Command;
+
+      // On PlayPause
+      if (command === "PlayPause") {
+        console.log("Command ~ PlayPause");
+        if (isPlaying) pauseVideo();
+        else playVideo();
+      } else if (command === "Stop") {
+        console.log("Command ~ Stop");
+        stopPlayback();
+      }
+    };
+  }, [ws, stopPlayback, playVideo, pauseVideo]);
+
+  return (
+    <PlaybackContext.Provider
+      value={{
+        onProgress,
+        progressTicks,
+        setIsPlaying,
+        setIsFullscreen,
+        isFullscreen,
+        isPlaying,
+        currentlyPlaying,
+        sessionData,
+        videoRef,
+        playVideo,
+        setCurrentlyPlayingState,
+        pauseVideo,
+        stopPlayback,
+        presentFullscreenPlayer,
+        dismissFullscreenPlayer,
+      }}
+    >
+      {children}
+    </PlaybackContext.Provider>
+  );
+};
+
+export const usePlayback = () => {
+  const context = useContext(PlaybackContext);
+
+  if (!context) {
+    throw new Error("usePlayback must be used within a PlaybackProvider");
+  }
+
+  return context;
+};
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -13,7 +13,9 @@ export const sortOptions: {
  { key: "SortName", value: "Name" },
  { key: "CommunityRating", value: "Community Rating" },
  { key: "CriticRating", value: "Critics Rating" },
-  { key: "DateLastContentAdded", value: "Content Added" },
+  { key: "DateCreated", value: "Date Added" },
+  // Only works for shows (last episode added) keeping for future ref.
+  // { key: "DateLastContentAdded", value: "Content Added" },
  { key: "DatePlayed", value: "Date Played" },
  { key: "PlayCount", value: "Play Count" },
  { key: "ProductionYear", value: "Production Year" },
@@ -23,7 +25,8 @@ export const sortOptions: {
  { key: "StartDate", value: "Start Date" },
  { key: "IsUnplayed", value: "Is Unplayed" },
  { key: "IsPlayed", value: "Is Played" },
-  { key: "VideoBitRate", value: "Video Bit Rate" },
+  // Broken in JF
+  // { key: "VideoBitRate", value: "Video Bit Rate" },
  { key: "AirTime", value: "Air Time" },
  { key: "Studio", value: "Studio" },
  { key: "IsFavoriteOrLiked", value: "Is Favorite Or Liked" },
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -2,6 +2,28 @@ import { atom, useAtom } from "jotai";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useEffect } from "react";

+export type DownloadQuality = "original" | "high" | "low";
+
+export type DownloadOption = {
+  label: string;
+  value: DownloadQuality;
+};
+
+export const DownloadOptions: DownloadOption[] = [
+  {
+    label: "Original quality",
+    value: "original",
+  },
+  {
+    label: "High quality",
+    value: "high",
+  },
+  {
+    label: "Small file size",
+    value: "low",
+  },
+];
+
 type Settings = {
  autoRotate?: boolean;
  forceLandscapeInVideoPlayer?: boolean;
@@ -10,6 +32,10 @@ type Settings = {
  deviceProfile?: "Expo" | "Native" | "Old";
  forceDirectPlay?: boolean;
  mediaListCollectionIds?: string[];
+  searchEngine: "Marlin" | "Jellyfin";
+  marlinServerUrl?: string;
+  openInVLC?: boolean;
+  downloadQuality?: DownloadOption;
 };

 /**
@@ -20,20 +46,31 @@ type Settings = {
 *
 */

-// Utility function to load settings from AsyncStorage
 const loadSettings = async (): Promise<Settings> => {
-  const jsonValue = await AsyncStorage.getItem("settings");
-  return jsonValue != null
-    ? JSON.parse(jsonValue)
-    : {
-        autoRotate: true,
-        forceLandscapeInVideoPlayer: false,
-        openFullScreenVideoPlayerByDefault: false,
-        usePopularPlugin: false,
-        deviceProfile: "Expo",
-        forceDirectPlay: false,
-        mediaListCollectionIds: [],
-      };
+  const defaultValues: Settings = {
+    autoRotate: true,
+    forceLandscapeInVideoPlayer: false,
+    openFullScreenVideoPlayerByDefault: false,
+    usePopularPlugin: false,
+    deviceProfile: "Expo",
+    forceDirectPlay: false,
+    mediaListCollectionIds: [],
+    searchEngine: "Jellyfin",
+    marlinServerUrl: "",
+    openInVLC: false,
+    downloadQuality: DownloadOptions[0],
+  };
+
+  try {
+    const jsonValue = await AsyncStorage.getItem("settings");
+    const loadedValues: Partial<Settings> =
+      jsonValue != null ? JSON.parse(jsonValue) : {};
+
+    return { ...defaultValues, ...loadedValues };
+  } catch (error) {
+    console.error("Failed to load settings:", error);
+    return defaultValues;
+  }
 };

 // Utility function to save settings to AsyncStorage
--- a/utils/device.ts
+++ b/utils/device.ts
@@ -0,0 +1,19 @@
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import uuid from "react-native-uuid";
+
+export const getOrSetDeviceId = async () => {
+  let deviceId = await AsyncStorage.getItem("deviceId");
+
+  if (!deviceId) {
+    deviceId = uuid.v4() as string;
+    await AsyncStorage.setItem("deviceId", deviceId);
+  }
+
+  return deviceId;
+};
+
+export const getDeviceId = async () => {
+  let deviceId = await AsyncStorage.getItem("deviceId");
+
+  return deviceId || null;
+};
--- a/utils/jellyfin/playstate/reportPlaybackProgress.ts
+++ b/utils/jellyfin/playstate/reportPlaybackProgress.ts
@@ -1,12 +1,13 @@
 import { Api } from "@jellyfin/sdk";
-import { AxiosError } from "axios";
 import { getAuthHeaders } from "../jellyfin";
+import { postCapabilities } from "../session/capabilities";

 interface ReportPlaybackProgressParams {
-  api: Api;
-  sessionId: string;
-  itemId: string;
-  positionTicks: number;
+  api?: Api | null;
+  sessionId?: string | null;
+  itemId?: string | null;
+  positionTicks?: number | null;
+  IsPaused?: boolean;
 }

 /**
@@ -20,25 +21,44 @@ export const reportPlaybackProgress = async ({
  sessionId,
  itemId,
  positionTicks,
+  IsPaused = false,
 }: ReportPlaybackProgressParams): Promise<void> => {
-  console.info(
-    "Reporting playback progress:",
-    sessionId,
-    itemId,
-    positionTicks,
-  );
+  if (!api || !sessionId || !itemId || !positionTicks) {
+    console.error(
+      "Missing required parameter",
+      sessionId,
+      itemId,
+      positionTicks
+    );
+    return;
+  }
+
+  console.info("reportPlaybackProgress ~ IsPaused", IsPaused);
+
+  try {
+    await postCapabilities({
+      api,
+      itemId,
+      sessionId,
+    });
+  } catch (error) {
+    console.error("Failed to post capabilities.", error);
+    throw new Error("Failed to post capabilities.");
+  }
+
  try {
    await api.axiosInstance.post(
      `${api.basePath}/Sessions/Playing/Progress`,
      {
        ItemId: itemId,
        PlaySessionId: sessionId,
-        IsPaused: false,
+        IsPaused,
        PositionTicks: Math.round(positionTicks),
        CanSeek: true,
        MediaSourceId: itemId,
+        EventName: "timeupdate",
      },
-      { headers: getAuthHeaders(api) },
+      { headers: getAuthHeaders(api) }
    );
  } catch (error) {
    console.error(error);
--- a/utils/jellyfin/playstate/reportPlaybackStopped.ts
+++ b/utils/jellyfin/playstate/reportPlaybackStopped.ts
@@ -41,12 +41,15 @@ export const reportPlaybackStopped = async ({
    return;
  }

+  console.log("reportPlaybackStopped ~", { sessionId, itemId });
+
  try {
    const url = `${api.basePath}/PlayingItems/${itemId}`;
    const params = {
      playSessionId: sessionId,
      positionTicks: Math.round(positionTicks),
-      mediaSourceId: itemId,
+      MediaSourceId: itemId,
+      IsPaused: true,
    };
    const headers = getAuthHeaders(api);

@@ -58,7 +61,7 @@ export const reportPlaybackStopped = async ({
      console.error(
        "Failed to report playback progress",
        error.message,
-        error.response?.data,
+        error.response?.data
      );
    } else {
      console.error("Failed to report playback progress", error);
--- a/utils/jellyfin/session/capabilities.ts
+++ b/utils/jellyfin/session/capabilities.ts
@@ -0,0 +1,48 @@
+import { Api } from "@jellyfin/sdk";
+import {
+  SessionApi,
+  SessionApiPostCapabilitiesRequest,
+} from "@jellyfin/sdk/lib/generated-client/api/session-api";
+import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
+import { AxiosError } from "axios";
+import { getAuthHeaders } from "../jellyfin";
+
+interface PostCapabilitiesParams {
+  api: Api | null | undefined;
+  itemId: string | null | undefined;
+  sessionId: string | null | undefined;
+}
+
+/**
+ * Marks a media item as not played for a specific user.
+ *
+ * @param params - The parameters for marking an item as not played
+ * @returns A promise that resolves to true if the operation was successful, false otherwise
+ */
+export const postCapabilities = async ({
+  api,
+  itemId,
+  sessionId,
+}: PostCapabilitiesParams): Promise<void> => {
+  if (!api || !itemId || !sessionId) {
+    throw new Error("Missing required parameters");
+  }
+
+  try {
+    const r = await api.axiosInstance.post(
+      api.basePath + "/Sessions/Capabilities/Full",
+      {
+        playableMediaTypes: ["Audio", "Video", "Audio"],
+        supportedCommands: ["PlayState", "Play"],
+        supportsMediaControl: true,
+        id: sessionId,
+      },
+      {
+        headers: getAuthHeaders(api),
+      }
+    );
+  } catch (error: any | AxiosError) {
+    console.log("Failed to mark as not played", error);
+    throw new Error("Failed to mark as not played");
+  }
+};
Author	SHA1	Message	Date
Fredrik Burmester	2e563bcbe0	chore	2024-08-21 23:21:59 +02:00
Fredrik Burmester	b1062628d9	fix: can't play local media bug appeared after playback rewrite	2024-08-21 23:21:53 +02:00
Fredrik Burmester	e216c8392f	fix: jellysearch + chromecast	2024-08-21 23:20:40 +02:00
Fredrik Burmester	1a47ade4dc	chore: version	2024-08-21 21:05:53 +02:00
Fredrik Burmester	a54da1c3dc	fix: open google search for actor if Marlin turned off	2024-08-21 20:37:50 +02:00
Fredrik Burmester	874364fcde	feat: new list view for seasons with persistent season state	2024-08-21 20:34:52 +02:00
Fredrik Burmester	9059f33538	fix: smaller height for dropdown menus	2024-08-21 20:34:24 +02:00
Fredrik Burmester	27785e7d18	feat: new download quality options	2024-08-21 20:34:07 +02:00
Fredrik Burmester	9a621cab4e	fix: add option for height	2024-08-21 20:21:21 +02:00
Fredrik Burmester	a37ac74e9f	chore	2024-08-21 20:21:06 +02:00
Fredrik Burmester	4d4bb0f6a4	chore	2024-08-21 20:21:00 +02:00
Fredrik Burmester	6bd60b2ec6	fix: #78	2024-08-21 20:20:52 +02:00
Fredrik Burmester	696a2a4780	Merge branch 'master' of https://github.com/fredrikburmester/streamyfin	2024-08-21 18:43:56 +02:00
Fredrik Burmester	13ac9b0443	chore	2024-08-21 18:43:54 +02:00
Fredrik Burmester	83407674be	fix: slow down	2024-08-21 18:43:38 +02:00
Fredrik Burmester	53bb1751c2	fix: websocket should not try to connect without token	2024-08-21 18:43:27 +02:00
Fredrik Burmester	fa31ff8f2b	Merge pull request #92 from lostb1t/master Add DateCreated sort option an disable bit rate sort	2024-08-21 18:35:31 +02:00
lostb1t	f863c95f70	Disable bitrate filter	2024-08-21 18:00:06 +02:00
lostb1t	f227565dbf	Use DateCreate for sorting last added	2024-08-21 17:58:42 +02:00
Fredrik Burmester	7abc629a10	fix: #87	2024-08-21 08:01:46 +02:00
Fredrik Burmester	70a250df5b	fix: #86 and add docsting	2024-08-21 07:48:45 +02:00
Fredrik Burmester	dbdf56b990	Merge branch 'master' of https://github.com/fredrikburmester/streamyfin	2024-08-21 07:33:33 +02:00
Fredrik Burmester	8b2204896a	chore	2024-08-21 07:33:22 +02:00
Fredrik Burmester	89729a95cd	Merge pull request #85 from yihaolee85/master Update [collectionId].tsx to fix sort order	2024-08-21 07:31:38 +02:00
yihaolee85	57dd3b8446	Update [collectionId].tsx to fix sort order Update [collectionId].tsx to fix sort order	2024-08-21 10:02:15 +08:00
Fredrik Burmester	8d2a0378ca	fix: correct sf collection use	2024-08-20 22:39:36 +02:00
Fredrik Burmester	cbe01a0012	feat: use external player (vlc)	2024-08-20 21:51:16 +02:00
Fredrik Burmester	eed4df6a8a	fix: make posters a bit smaller	2024-08-20 19:18:51 +02:00
retardgerman	5e081751a4	updated discord invite link	2024-08-20 11:47:40 +02:00
Fredrik Burmester	09f953ebba	fix: ws now works as expexted	2024-08-20 08:42:52 +02:00
Fredrik Burmester	4873aaf3df	chore	2024-08-20 08:26:02 +02:00
Fredrik Burmester	9bbab4f46f	chore	2024-08-20 08:25:05 +02:00
Fredrik Burmester	469e8b3f01	refactor: playing state	2024-08-20 08:24:05 +02:00
Fredrik Burmester	1c31458dd4	chore	2024-08-19 22:52:30 +02:00
Fredrik Burmester	4c097c557f	fix: #79	2024-08-19 22:52:27 +02:00
Fredrik Burmester	c23ca905c8	fix: bug after refactor	2024-08-19 22:26:33 +02:00
Fredrik Burmester	ed3170af76	fix: invalid query	2024-08-19 22:05:23 +02:00
Fredrik Burmester	e22dd759c7	fix: #71	2024-08-19 22:05:17 +02:00
Fredrik Burmester	aa44caa161	chore	2024-08-19 21:55:40 +02:00
Fredrik Burmester	27260faea8	fix: #75	2024-08-19 21:55:32 +02:00
Fredrik Burmester	ec7e5f869d	feat: first implementation of ws	2024-08-19 21:45:15 +02:00
Fredrik Burmester	8e1a07e819	chore	2024-08-19 21:44:00 +02:00
Fredrik Burmester	250c1968f3	chore	2024-08-19 21:43:56 +02:00
Fredrik Burmester	caeedfbc52	fix: separate item and show bar state	2024-08-19 21:43:48 +02:00
Fredrik Burmester	66ce6b2cfa	fix: refactor to work like other inf scrolling pages	2024-08-19 21:43:14 +02:00
Fredrik Burmester	388480adef	feat: use Marlin	2024-08-19 21:42:45 +02:00
Fredrik Burmester	e911f99b26	chore: rename to libraries	2024-08-19 21:42:16 +02:00
retardgerman	73ff0aa66a	Moved reference to APKs to the download section	2024-08-19 17:10:10 +02:00
retardgerman	29ae6747c4	Merge pull request #68 from vicegold/master fix marketplace logo alignment	2024-08-19 17:05:12 +02:00
Laurids Düllmann	44444e3b37	fix marketplace logo alignment	2024-08-19 17:02:27 +02:00
retardgerman	0e3f289d43	alternative apple App Store badge	2024-08-19 16:48:11 +02:00
retardgerman	a66648c67c	Merge pull request #65 from FintasticMan/fix-season-numbers	2024-08-18 19:43:49 +02:00
retardgerman	6dc9538483	Merge pull request #62 from lostb1t/master Update README.md with collection info	2024-08-18 18:04:54 +02:00
FintasticMan	cb7c018cf4	fix: season number for named seasons	2024-08-18 16:15:19 +02:00
lostb1t	a01217b8ac	Update README.md with collection info	2024-08-18 15:40:40 +02:00