wip

2024-08-18 13:30:12 +02:00 · 2024-08-18 13:07:08 +02:00 · 2024-08-18 11:53:40 +02:00 · 2024-08-18 11:46:31 +02:00 · 2024-08-18 11:33:26 +02:00 · 2024-08-18 11:12:40 +02:00
62 changed files with 9980 additions and 3098 deletions
--- a/README.md
+++ b/README.md
@@ -26,30 +26,17 @@ 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.

-### 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.
-
-## 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; 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>
+<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>

-Or download the APKs [here on GitHub](https://github.com/fredrikburmester/streamyfin/releases) for Android.
+  <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>

 ### Beta testing

@@ -59,6 +46,8 @@ 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
@@ -113,7 +102,7 @@ Key points of the MPL-2.0:

 ## 🌐 Connect with Us

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

 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.7.0",
+    "version": "0.6.1",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
@@ -30,7 +30,7 @@
    },
    "android": {
      "jsEngine": "hermes",
-      "versionCode": 19,
+      "versionCode": 17,
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/icon.png"
      },
@@ -46,15 +46,9 @@
      "favicon": "./assets/images/favicon.png"
    },
    "plugins": [
+      "@react-native-tvos/config-tv",
      "expo-router",
      "expo-font",
-      "@config-plugins/ffmpeg-kit-react-native",
-      [
-        "react-native-google-cast",
-        {
-          "useDefaultExpandedMediaControls": true
-        }
-      ],
      [
        "react-native-video",
        {
@@ -67,35 +61,6 @@
            "useExoplayerDash": false
          }
        }
-      ],
-      [
-        "expo-build-properties",
-        {
-          "ios": {
-            "deploymentTarget": "14.0"
-          },
-          "android": {
-            "minSdkVersion": 24,
-            "usesCleartextTraffic": true,
-            "packagingOptions": {
-              "jniLibs": {
-                "useLegacyPackaging": true
-              }
-            }
-          }
-        }
-      ],
-      [
-        "expo-screen-orientation",
-        {
-          "initialOrientation": "DEFAULT"
-        }
-      ],
-      [
-        "expo-sensors",
-        {
-          "motionPermission": "Allow Streamyfin to access your device motion for landscape video watching."
-        }
      ]
    ],
    "experiments": {
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -1,13 +1,10 @@
-import { router, Tabs } from "expo-router";
-import React, { useEffect } from "react";
-import * as NavigationBar from "expo-navigation-bar";
 import { TabBarIcon } from "@/components/navigation/TabBarIcon";
 import { Colors } from "@/constants/Colors";
-import { Platform, TouchableOpacity, View } from "react-native";
-import { Feather } from "@expo/vector-icons";
-import { Chromecast } from "@/components/Chromecast";
 import { BlurView } from "expo-blur";
-import { StyleSheet } from "react-native";
+import * as NavigationBar from "expo-navigation-bar";
+import { Tabs } from "expo-router";
+import React, { useEffect } from "react";
+import { Platform, StyleSheet } from "react-native";

 export default function TabLayout() {
  useEffect(() => {
@@ -73,7 +70,7 @@ export default function TabLayout() {
        }}
      />
      <Tabs.Screen
-        name="libraries"
+        name="library"
        options={{
          headerShown: false,
          title: "Library",
--- a/app/(auth)/(tabs)/home/_layout.tsx
+++ b/app/(auth)/(tabs)/home/_layout.tsx
@@ -1,4 +1,3 @@
-import { Chromecast } from "@/components/Chromecast";
 import { Feather } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { Platform, View } from "react-native";
@@ -17,21 +16,8 @@ export default function IndexLayout() {
          headerBlurEffect: "prominent",
          headerTransparent: Platform.OS === "ios" ? true : false,
          headerShadowVisible: false,
-          headerLeft: () => (
-            <TouchableOpacity
-              style={{
-                marginRight: Platform.OS === "android" ? 17 : 0,
-              }}
-              onPress={() => {
-                router.push("/(auth)/downloads");
-              }}
-            >
-              <Feather name="download" color={"white"} size={22} />
-            </TouchableOpacity>
-          ),
          headerRight: () => (
            <View className="flex flex-row items-center space-x-2">
-              <Chromecast />
              <TouchableOpacity
                onPress={() => {
                  router.push("/(auth)/settings");
--- a/app/(auth)/(tabs)/home/index.tsx
+++ b/app/(auth)/(tabs)/home/index.tsx
@@ -5,7 +5,6 @@ import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionLi
 import { Loader } from "@/components/Loader";
 import { MediaListSection } from "@/components/medialists/MediaListSection";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import {
@@ -30,7 +29,6 @@ export default function index() {
  const [user] = useAtom(userAtom);

  const [loading, setLoading] = useState(false);
-  const [settings, _] = useSettings();

  const [isConnected, setIsConnected] = useState<boolean | null>(null);

@@ -171,21 +169,21 @@ export default function index() {
  });

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

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

-      return response.data.Items || [];
+      return [];
    },
-    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
+    enabled: !!api && !!user?.Id && false,
    staleTime: 0,
  });

@@ -197,10 +195,7 @@ export default function index() {
    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInTVShows"] });
    await queryClient.refetchQueries({ queryKey: ["suggestions"] });
    await queryClient.refetchQueries({
-      queryKey: ["sf_promoted"],
-    });
-    await queryClient.refetchQueries({
-      queryKey: ["sf_carousel"],
+      queryKey: ["mediaListCollections-home"],
    });
    setLoading(false);
  }, [queryClient, user?.Id]);
@@ -209,21 +204,6 @@ export default function index() {
    return (
      <View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
        <Text className="text-3xl font-bold mb-2">No Internet</Text>
-        <Text className="text-center opacity-70">
-          No worries, you can still watch{"\n"}downloaded content.
-        </Text>
-        <View className="mt-4">
-          <Button
-            color="purple"
-            onPress={() => router.push("/(auth)/downloads")}
-            justify="center"
-            iconRight={
-              <Ionicons name="arrow-forward" size={20} color="white" />
-            }
-          >
-            Go to downloads
-          </Button>
-        </View>
      </View>
    );
  }
@@ -270,10 +250,6 @@ export default function index() {
          orientation="horizontal"
        />

-        {mediaListCollections?.map((ml) => (
-          <MediaListSection key={ml.Id} collection={ml} />
-        ))}
-
        <ScrollingCollectionList
          title="Recently Added in Movies"
          data={recentlyAddedInMovies}
--- 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="[libraryId]"
+        name="collections/[collectionId]"
        options={{
          title: "",
          headerShown: true,
--- a/app/(auth)/(tabs)/library/collections/[collectionId].tsx
+++ b/app/(auth)/(tabs)/library/collections/[collectionId].tsx
@@ -1,3 +1,4 @@
+import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
 import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
@@ -6,10 +7,9 @@ import { Loader } from "@/components/Loader";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import {
-  currentCollectionIdAtom,
  genreFilterAtom,
  sortByAtom,
-  sortByOptions,
+  sortOptions,
  sortOrderAtom,
  sortOrderOptions,
  tagsFilterAtom,
@@ -19,13 +19,9 @@ import {
  BaseItemDtoQueryResult,
  BaseItemKind,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  getFilterApi,
-  getItemsApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
+import { getFilterApi, getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { useLocalSearchParams } from "expo-router";
+import { Stack, useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo } from "react";
 import { NativeScrollEvent, ScrollView, View } from "react-native";
@@ -44,16 +40,11 @@ const isCloseToBottom = ({

 const page: React.FC = () => {
  const searchParams = useLocalSearchParams();
-  const { libraryId } = searchParams as { libraryId: string };
-
-  const [, setCurrentCollectionId] = useAtom(currentCollectionIdAtom);
-
-  useEffect(() => {
-    setCurrentCollectionId(libraryId);
-  }, [libraryId]);
+  const { collectionId } = searchParams as { collectionId: string };

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
+  const navigation = useNavigation();

  const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
  const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
@@ -61,18 +52,18 @@ const page: React.FC = () => {
  const [sortBy, setSortBy] = useAtom(sortByAtom);
  const [sortOrder, setSortOrder] = useAtom(sortOrderAtom);

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

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

      const includeItemTypes: BaseItemKind[] = [];

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

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

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

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

  return (
    <ScrollView
@@ -196,7 +187,7 @@ const page: React.FC = () => {
            <View className="flex flex-row space-x-1 px-3">
              <ResetFiltersButton />
              <FilterButton
-                collectionId={libraryId}
+                collectionId={collectionId}
                queryKey="genreFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -205,11 +196,11 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: libraryId,
+                    parentId: collectionId,
                  });
                  return response.data.Genres || [];
                }}
-                set={(value) => setSelectedGenres(value, libraryId)}
+                set={setSelectedGenres}
                values={selectedGenres}
                title="Genres"
                renderItemLabel={(item) => item.toString()}
@@ -218,7 +209,7 @@ const page: React.FC = () => {
                }
              />
              <FilterButton
-                collectionId={libraryId}
+                collectionId={collectionId}
                queryKey="tagsFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -227,11 +218,11 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: libraryId,
+                    parentId: collectionId,
                  });
                  return response.data.Tags || [];
                }}
-                set={(value) => setSelectedTags(value, libraryId)}
+                set={setSelectedTags}
                values={selectedTags}
                title="Tags"
                renderItemLabel={(item) => item.toString()}
@@ -240,7 +231,7 @@ const page: React.FC = () => {
                }
              />
              <FilterButton
-                collectionId={libraryId}
+                collectionId={collectionId}
                queryKey="yearFilter"
                queryFn={async () => {
                  if (!api) return null;
@@ -249,7 +240,7 @@ const page: React.FC = () => {
                  ).getQueryFiltersLegacy({
                    userId: user?.Id,
                    includeItemTypes: type ? [type] : [],
-                    parentId: libraryId,
+                    parentId: collectionId,
                  });
                  return (
                    response.data.Years?.sort((a, b) => b - a).map((y) =>
@@ -257,7 +248,7 @@ const page: React.FC = () => {
                    ) || []
                  );
                }}
-                set={(value) => setSelectedYears(value, libraryId)}
+                set={setSelectedYears}
                values={selectedYears}
                title="Years"
                renderItemLabel={(item) => item.toString()}
@@ -267,12 +258,12 @@ const page: React.FC = () => {
              />
              <FilterButton
                icon="sort"
-                collectionId={libraryId}
+                collectionId={collectionId}
                queryKey="sortByFilter"
                queryFn={async () => {
-                  return sortByOptions;
+                  return sortOptions;
                }}
-                set={(value) => setSortBy(value, libraryId)}
+                set={setSortBy}
                values={sortBy}
                title="Sort by"
                renderItemLabel={(item) => item.value}
@@ -285,12 +276,12 @@ const page: React.FC = () => {
              <FilterButton
                icon="sort"
                showSearch={false}
-                collectionId={libraryId}
+                collectionId={collectionId}
                queryKey="orderByFilter"
                queryFn={async () => {
                  return sortOrderOptions;
                }}
-                set={(value) => setSortOrder(value, libraryId)}
+                set={setSortOrder}
                values={sortOrder}
                title="Order by"
                renderItemLabel={(item) => item.value}
@@ -314,7 +305,7 @@ const page: React.FC = () => {
            (item, index) =>
              item && (
                <TouchableItemRouter
-                  key={`${item.Id}-${index}`}
+                  key={`${item.Id}`}
                  style={{
                    width: "32%",
                    marginBottom: 4,
--- a/app/(auth)/(tabs)/libraries/index.tsx
+++ b/app/(auth)/(tabs)/libraries/index.tsx
@@ -1,7 +1,6 @@
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { currentCollectionIdAtom } from "@/utils/atoms/filters";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
@@ -50,7 +49,7 @@ export default function index() {
        paddingBottom: 150,
      }}
      data={data}
-      renderItem={({ item }) => <LibraryItemCard library={item} />}
+      renderItem={({ item }) => <CollectionCard collection={item} />}
      keyExtractor={(item) => item.Id || ""}
      ItemSeparatorComponent={() => <View className="h-4" />}
      estimatedItemSize={200}
@@ -59,25 +58,21 @@ export default function index() {
 }

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

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

  const [api] = useAtom(apiAtom);

-  const [currentCollection, setCurrentCollection] = useAtom(
-    currentCollectionIdAtom
-  );
-
  const url = useMemo(
    () =>
      getPrimaryImageUrl({
        api,
-        item: library,
+        item: collection,
      }),
-    [library]
+    [collection]
  );

  if (!url) return null;
@@ -85,9 +80,7 @@ const LibraryItemCard: React.FC<Props> = ({ library }) => {
  return (
    <TouchableOpacity
      onPress={() => {
-        if (!library.Id) return;
-        setCurrentCollection(library.Id);
-        router.push(`/libraries/${library.Id}`);
+        router.push(`/library/collections/${collection.Id}`);
      }}
    >
      <View className="flex justify-center rounded-xl w-full relative border border-neutral-900 h-20 ">
@@ -103,7 +96,7 @@ const LibraryItemCard: React.FC<Props> = ({ library }) => {
          }}
        />
        <Text className="font-bold text-xl text-start px-4">
-          {library.Name}
+          {collection.Name}
        </Text>
      </View>
    </TouchableOpacity>
--- a/app/(auth)/(tabs)/search/index.tsx
+++ b/app/(auth)/(tabs)/search/index.tsx
@@ -1,4 +1,3 @@
-import { Button } from "@/components/Button";
 import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
@@ -10,32 +9,13 @@ 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 { 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 { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getSearchApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
-import axios from "axios";
-import {
-  Href,
-  router,
-  useLocalSearchParams,
-  useNavigation,
-  usePathname,
-} from "expo-router";
+import { router, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import React, {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useState,
-} from "react";
+import React, { useLayoutEffect, useMemo, useState } from "react";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useDebounce } from "use-debounce";

@@ -49,10 +29,6 @@ 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);
@@ -60,131 +36,107 @@ 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) => {
-            router.setParams({ q: "" });
-            setSearch(e.nativeEvent.text);
-          },
+          onChangeText: (e: any) => setSearch(e.nativeEvent.text),
          hideWhenScrolling: false,
          autoFocus: true,
        },
      });
  }, [navigation]);

-  const { data: movies, isFetching: l1 } = useQuery({
-    queryKey: ["search", "movies", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["Movie"],
-      }),
-    enabled: debouncedSearch.length > 0,
+  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: series, isFetching: l2 } = useQuery({
-    queryKey: ["search", "series", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["Series"],
-      }),
-    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: episodes, isFetching: l3 } = useQuery({
-    queryKey: ["search", "episodes", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["Episode"],
-      }),
-    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: artists, isFetching: l4 } = useQuery({
-    queryKey: ["search", "artists", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["MusicArtist"],
-      }),
-    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: albums, isFetching: l5 } = useQuery({
-    queryKey: ["search", "albums", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["MusicAlbum"],
-      }),
-    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: songs, isFetching: l6 } = useQuery({
-    queryKey: ["search", "songs", debouncedSearch],
-    queryFn: () =>
-      searchFn({
-        query: debouncedSearch,
-        types: ["Audio"],
-      }),
-    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 noResults = useMemo(() => {
@@ -221,13 +173,6 @@ 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!)}
@@ -237,7 +182,7 @@ export default function search() {
                renderItem={(item) => (
                  <TouchableOpacity
                    key={item.Id}
-                    className="flex flex-col w-28"
+                    className="flex flex-col w-32"
                    onPress={() => router.push(`/items/${item.Id}`)}
                  >
                    <MoviePoster item={item} key={item.Id} />
@@ -262,7 +207,7 @@ export default function search() {
                  <TouchableOpacity
                    key={item.Id}
                    onPress={() => router.push(`/series/${item.Id}`)}
-                    className="flex flex-col w-28"
+                    className="flex flex-col w-32"
                  >
                    <SeriesPoster item={item} key={item.Id} />
                    <Text numberOfLines={2} className="mt-2">
@@ -286,7 +231,7 @@ export default function search() {
                  <TouchableOpacity
                    key={item.Id}
                    onPress={() => router.push(`/items/${item.Id}`)}
-                    className="flex flex-col w-44"
+                    className="flex flex-col w-48"
                  >
                    <ContinueWatchingPoster item={item} />
                    <ItemCardText item={item} />
@@ -305,7 +250,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-28"
+                    className="flex flex-col w-32"
                  >
                    <AlbumCover id={item.Id} />
                    <ItemCardText item={item} />
@@ -324,7 +269,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-28"
+                    className="flex flex-col w-32"
                  >
                    <AlbumCover id={item.Id} />
                    <ItemCardText item={item} />
@@ -343,7 +288,7 @@ export default function search() {
                  <TouchableItemRouter
                    item={item}
                    key={item.Id}
-                    className="flex flex-col w-28"
+                    className="flex flex-col w-32"
                  >
                    <AlbumCover id={item.AlbumId} />
                    <ItemCardText item={item} />
--- a/app/(auth)/albums/[albumId].tsx
+++ b/app/(auth)/albums/[albumId].tsx
@@ -1,4 +1,3 @@
-import { Chromecast } from "@/components/Chromecast";
 import { Text } from "@/components/common/Text";
 import { SongsList } from "@/components/music/SongsList";
 import ArtistPoster from "@/components/posters/ArtistPoster";
@@ -24,16 +23,6 @@ export default function page() {

  const navigation = useNavigation();

-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <View className="">
-          <Chromecast />
-        </View>
-      ),
-    });
-  });
-
  const { data: album } = useQuery({
    queryKey: ["album", albumId, artistId],
    queryFn: async () => {
--- a/app/(auth)/collections/[collectionId].tsx
+++ b/app/(auth)/collections/[collectionId].tsx
@@ -1,47 +1,20 @@
 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 {
-  currentCollectionIdAtom,
-  genreFilterAtom,
-  sortByAtom,
-  sortByOptions,
-  sortOrderAtom,
-  sortOrderOptions,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
-import {
-  BaseItemDtoQueryResult,
+  BaseItemDto,
  BaseItemKind,
+  ItemSortBy,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  getFilterApi,
-  getItemsApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { Stack, useLocalSearchParams, useNavigation } from "expo-router";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo } from "react";
-import { NativeScrollEvent, ScrollView, View } from "react-native";
-
-const isCloseToBottom = ({
-  layoutMeasurement,
-  contentOffset,
-  contentSize,
-}: NativeScrollEvent) => {
-  const paddingToBottom = 200;
-  return (
-    layoutMeasurement.height + contentOffset.y >=
-    contentSize.height - paddingToBottom
-  );
-};
+import { useMemo, useState } from "react";
+import { ScrollView, TouchableOpacity, View } from "react-native";

 const page: React.FC = () => {
  const searchParams = useLocalSearchParams();
@@ -49,303 +22,200 @@ 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);
-  const [currentCollection, setCurrentCollection] = useAtom(
-    currentCollectionIdAtom
-  );
-
-  useEffect(() => {
-    setSortBy(
-      [
-        {
-          key: "PremiereDate",
-          value: "Premiere Date",
-        },
-      ],
-      collectionId
-    );
-    setSortOrder(
-      [
-        {
-          key: "Ascending",
-          value: "Ascending",
-        },
-      ],
-      collectionId
-    );
-  }, []);

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

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

-  const fetchItems = useCallback(
-    async ({
-      pageParam,
-    }: {
-      pageParam: number;
-    }): Promise<BaseItemDtoQueryResult | null> => {
-      if (!api || !collection) return null;
+  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 response = await getItemsApi(api).getItems({
        userId: user?.Id,
        parentId: collectionId,
-        limit: 18,
-        startIndex: pageParam,
-        sortBy: [sortBy[0].key, "SortName", "ProductionYear"],
-        sortOrder: [sortOrder[0].key],
-        fields: [
-          "ItemCounts",
-          "PrimaryImageAspectRatio",
-          "CanDelete",
-          "MediaSourceCount",
-        ],
-        genres: selectedGenres,
-        tags: selectedTags,
-        years: selectedYears.map((year) => parseInt(year)),
+        limit: 100,
+        startIndex,
+        sortBy,
+        sortOrder: ["Ascending"],
+        includeItemTypes,
+        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
+        recursive: true,
+        imageTypeLimit: 1,
+        fields: ["PrimaryImageAspectRatio", "SortName"],
      });

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

-  useEffect(() => {
-    console.log("Data: ", data);
+  const totalItems = useMemo(() => {
+    return data?.TotalRecordCount;
  }, [data]);

-  const type = useMemo(() => {
-    return data?.pages.flatMap((page) => page?.Items)[0]?.Type || null;
-  }, [data]);
-
-  const flatData = useMemo(() => {
-    return data?.pages.flatMap((p) => p?.Items) || [];
-  }, [data]);
-
-  if (!collection) return null;
-
  return (
-    <ScrollView
-      contentInsetAdjustmentBehavior="automatic"
-      onScroll={({ nativeEvent }) => {
-        if (isCloseToBottom(nativeEvent)) {
-          fetchNextPage();
-        }
-      }}
-      scrollEventThrottle={400}
-    >
-      <View className="mt-4 mb-24">
-        <View className="mb-4">
-          <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-            <View className="flex flex-row space-x-1 px-3">
-              <ResetFiltersButton />
-              <FilterButton
-                collectionId={collectionId}
-                queryKey="genreFilter"
-                queryFn={async () => {
-                  if (!api) return null;
-                  const response = await getFilterApi(
-                    api
-                  ).getQueryFiltersLegacy({
-                    userId: user?.Id,
-                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
-                  });
-                  return response.data.Genres || [];
+    <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));
                }}
-                set={(value) => setSelectedGenres(value, collectionId)}
-                values={selectedGenres}
-                title="Genres"
-                renderItemLabel={(item) => item.toString()}
-                searchFilter={(item, search) =>
-                  item.toLowerCase().includes(search.toLowerCase())
-                }
-              />
-              <FilterButton
-                collectionId={collectionId}
-                queryKey="tagsFilter"
-                queryFn={async () => {
-                  if (!api) return null;
-                  const response = await getFilterApi(
-                    api
-                  ).getQueryFiltersLegacy({
-                    userId: user?.Id,
-                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
-                  });
-                  return response.data.Tags || [];
+              >
+                <Ionicons
+                  name="arrow-back-circle-outline"
+                  size={32}
+                  color="white"
+                />
+              </TouchableOpacity>
+              <TouchableOpacity
+                onPress={() => {
+                  setStartIndex((prev) => prev + 100);
                }}
-                set={(value) => setSelectedTags(value, collectionId)}
-                values={selectedTags}
-                title="Tags"
-                renderItemLabel={(item) => item.toString()}
-                searchFilter={(item, search) =>
-                  item.toLowerCase().includes(search.toLowerCase())
-                }
-              />
-              <FilterButton
-                collectionId={collectionId}
-                queryKey="yearFilter"
-                queryFn={async () => {
-                  if (!api) return null;
-                  const response = await getFilterApi(
-                    api
-                  ).getQueryFiltersLegacy({
-                    userId: user?.Id,
-                    includeItemTypes: type ? [type] : [],
-                    parentId: collectionId,
-                  });
-                  return (
-                    response.data.Years?.sort((a, b) => b - a).map((y) =>
-                      y.toString()
-                    ) || []
-                  );
-                }}
-                set={(value) => setSelectedYears(value, collectionId)}
-                values={selectedYears}
-                title="Years"
-                renderItemLabel={(item) => item.toString()}
-                searchFilter={(item, search) =>
-                  item.toLowerCase().includes(search.toLowerCase())
-                }
-              />
-              <FilterButton
-                icon="sort"
-                collectionId={collectionId}
-                queryKey="sortByFilter"
-                queryFn={async () => {
-                  return sortByOptions;
-                }}
-                set={(value) => setSortBy(value, collectionId)}
-                values={sortBy}
-                title="Sort by"
-                renderItemLabel={(item) => item.value}
-                searchFilter={(item, search) =>
-                  item.value.toLowerCase().includes(search.toLowerCase()) ||
-                  item.value.toLowerCase().includes(search.toLowerCase())
-                }
-                showSearch={false}
-              />
-              <FilterButton
-                icon="sort"
-                showSearch={false}
-                collectionId={collectionId}
-                queryKey="orderByFilter"
-                queryFn={async () => {
-                  return sortOrderOptions;
-                }}
-                set={(value) => setSortOrder(value, collectionId)}
-                values={sortOrder}
-                title="Order by"
-                renderItemLabel={(item) => item.value}
-                searchFilter={(item, search) =>
-                  item.value.toLowerCase().includes(search.toLowerCase()) ||
-                  item.value.toLowerCase().includes(search.toLowerCase())
-                }
-              />
+              >
+                <Ionicons
+                  name="arrow-forward-circle-outline"
+                  size={32}
+                  color="white"
+                />
+              </TouchableOpacity>
            </View>
-          </ScrollView>
-          {!type && isFetching && (
-            <Loader
-              style={{
-                marginTop: 300,
-              }}
-            />
-          )}
-        </View>
-        <View className="flex flex-row flex-wrap px-4 justify-between after:content-['']">
-          {flatData.map(
-            (item, index) =>
-              item && (
-                <TouchableItemRouter
-                  key={`${item.Id}`}
-                  style={{
-                    width: "32%",
-                    marginBottom: 4,
-                  }}
-                  item={item}
-                  className={`
-                    `}
-                >
-                  <MoviePoster item={item} />
-                  <ItemCardText item={item} />
-                </TouchableItemRouter>
-              )
-          )}
-          {flatData.length % 3 !== 0 && (
-            <View
-              style={{
-                width: "33%",
-              }}
-            ></View>
-          )}
+          </View>
        </View>
+        {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)/downloads.tsx
+++ b/app/(auth)/downloads.tsx
@@ -1,179 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { MovieCard } from "@/components/downloads/MovieCard";
-import { SeriesCard } from "@/components/downloads/SeriesCard";
-import { Loader } from "@/components/Loader";
-import { runningProcesses } from "@/utils/atoms/downloads";
-import { queueAtom } from "@/utils/atoms/queue";
-import { Ionicons } from "@expo/vector-icons";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useQuery } from "@tanstack/react-query";
-import { router } from "expo-router";
-import { FFmpegKit } from "ffmpeg-kit-react-native";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { ScrollView, TouchableOpacity, View } from "react-native";
-
-const downloads: React.FC = () => {
-  const [process, setProcess] = useAtom(runningProcesses);
-  const [queue, setQueue] = useAtom(queueAtom);
-
-  const { data: downloadedFiles, isLoading } = useQuery({
-    queryKey: ["downloaded_files", process?.item.Id],
-    queryFn: async () =>
-      JSON.parse(
-        (await AsyncStorage.getItem("downloaded_files")) || "[]"
-      ) as BaseItemDto[],
-    staleTime: 0,
-  });
-
-  const movies = useMemo(
-    () => downloadedFiles?.filter((f) => f.Type === "Movie") || [],
-    [downloadedFiles]
-  );
-
-  const groupedBySeries = useMemo(() => {
-    const episodes = downloadedFiles?.filter((f) => f.Type === "Episode");
-    const series: { [key: string]: BaseItemDto[] } = {};
-    episodes?.forEach((e) => {
-      if (!series[e.SeriesName!]) series[e.SeriesName!] = [];
-      series[e.SeriesName!].push(e);
-    });
-    return Object.values(series);
-  }, [downloadedFiles]);
-
-  const eta = useMemo(() => {
-    const length = process?.item?.RunTimeTicks || 0;
-
-    if (!process?.speed || !process?.progress) return "";
-
-    const timeLeft =
-      (length - length * (process.progress / 100)) / process.speed;
-
-    return formatNumber(timeLeft / 10000);
-  }, [process]);
-
-  if (isLoading) {
-    return (
-      <View className="h-full flex flex-col items-center justify-center -mt-6">
-        <Loader />
-      </View>
-    );
-  }
-
-  return (
-    <ScrollView>
-      <View className="px-4 py-4">
-        <View className="mb-4 flex flex-col space-y-4">
-          <View>
-            <Text className="text-2xl font-bold mb-2">Queue</Text>
-            <View className="flex flex-col space-y-2">
-              {queue.map((q) => (
-                <TouchableOpacity
-                  onPress={() => router.push(`/(auth)/items/${q.item.Id}`)}
-                  className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
-                >
-                  <View>
-                    <Text className="font-semibold">{q.item.Name}</Text>
-                    <Text className="text-xs opacity-50">{q.item.Type}</Text>
-                  </View>
-                  <TouchableOpacity
-                    onPress={() => {
-                      setQueue((prev) => prev.filter((i) => i.id !== q.id));
-                    }}
-                  >
-                    <Ionicons name="close" size={24} color="red" />
-                  </TouchableOpacity>
-                </TouchableOpacity>
-              ))}
-            </View>
-
-            {queue.length === 0 && (
-              <Text className="opacity-50">No items in queue</Text>
-            )}
-          </View>
-
-          <View>
-            <Text className="text-2xl font-bold mb-2">Active download</Text>
-            {process?.item ? (
-              <TouchableOpacity
-                onPress={() => router.push(`/(auth)/items/${process.item.Id}`)}
-                className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
-              >
-                <View>
-                  <Text className="font-semibold">{process.item.Name}</Text>
-                  <Text className="text-xs opacity-50">
-                    {process.item.Type}
-                  </Text>
-                  <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
-                    <Text className="text-xs">
-                      {process.progress.toFixed(0)}%
-                    </Text>
-                    <Text className="text-xs">
-                      {process.speed?.toFixed(2)}x
-                    </Text>
-                    <View>
-                      <Text className="text-xs">ETA {eta}</Text>
-                    </View>
-                  </View>
-                </View>
-                <TouchableOpacity
-                  onPress={() => {
-                    FFmpegKit.cancel();
-                    setProcess(null);
-                  }}
-                >
-                  <Ionicons name="close" size={24} color="red" />
-                </TouchableOpacity>
-                <View
-                  className={`
-                  absolute bottom-0 left-0 h-1 bg-purple-600
-                `}
-                  style={{
-                    width: process.progress
-                      ? `${Math.max(5, process.progress)}%`
-                      : "5%",
-                  }}
-                ></View>
-              </TouchableOpacity>
-            ) : (
-              <Text className="opacity-50">No active downloads</Text>
-            )}
-          </View>
-        </View>
-        {movies.length > 0 && (
-          <View className="mb-4">
-            <View className="flex flex-row items-center justify-between mb-2">
-              <Text className="text-2xl font-bold">Movies</Text>
-              <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
-                <Text className="text-xs font-bold">{movies?.length}</Text>
-              </View>
-            </View>
-            {movies?.map((item: BaseItemDto) => (
-              <View className="mb-2 last:mb-0" key={item.Id}>
-                <MovieCard item={item} />
-              </View>
-            ))}
-          </View>
-        )}
-        {groupedBySeries?.map((items: BaseItemDto[], index: number) => (
-          <SeriesCard items={items} key={items[0].SeriesId} />
-        ))}
-      </View>
-    </ScrollView>
-  );
-};
-
-export default downloads;
-
-/*
- * Format a number (Date.getTime) to a human readable string ex. 2m 34s
- * @param {number} num - The number to format
- *
- * @returns {string} - The formatted string
- */
-const formatNumber = (num: number) => {
-  const minutes = Math.floor(num / 60000);
-  const seconds = ((num % 60000) / 1000).toFixed(0);
-  return `${minutes}m ${seconds}s`;
-};
--- a/app/(auth)/items/[id].tsx
+++ b/app/(auth)/items/[id].tsx
@@ -1,6 +1,10 @@
 import { AudioTrackSelector } from "@/components/AudioTrackSelector";
 import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import { DownloadItem } from "@/components/DownloadItem";
+import {
+  currentlyPlayingItemAtom,
+  fullScreenAtom,
+  playingAtom,
+} from "@/components/CurrentlyPlayingBar";
 import { Loader } from "@/components/Loader";
 import { OverviewText } from "@/components/OverviewText";
 import { PlayButton } from "@/components/PlayButton";
@@ -15,18 +19,11 @@ import { CurrentSeries } from "@/components/series/CurrentSeries";
 import { NextEpisodeButton } from "@/components/series/NextEpisodeButton";
 import { SeriesTitleHeader } from "@/components/series/SeriesTitleHeader";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  currentlyPlayingItemAtom,
-  fullScreenAtom,
-  playingAtom,
-  showCurrentlyPlayingBarAtom,
-} from "@/utils/atoms/playState";
 import { useSettings } from "@/utils/atoms/settings";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { chromecastProfile } from "@/utils/profiles/chromecast";
 import ios from "@/utils/profiles/ios";
 import native from "@/utils/profiles/native";
 import old from "@/utils/profiles/old";
@@ -37,11 +34,6 @@ import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
 import { useCallback, useMemo, useState } from "react";
 import { View } from "react-native";
-import CastContext, {
-  PlayServicesState,
-  useCastDevice,
-  useRemoteMediaClient,
-} from "react-native-google-cast";
 import { ParallaxScrollView } from "../../../components/ParallaxPage";

 const page: React.FC = () => {
@@ -53,15 +45,10 @@ const page: React.FC = () => {

  const [settings] = useSettings();

-  const castDevice = useCastDevice();
-
  const [, setCurrentlyPlying] = useAtom(currentlyPlayingItemAtom);
-  const [, setShowCurrentlyPlayingBar] = useAtom(showCurrentlyPlayingBarAtom);
  const [, setPlaying] = useAtom(playingAtom);
  const [, setFullscreen] = useAtom(fullScreenAtom);

-  const client = useRemoteMediaClient();
-  const chromecastReady = useMemo(() => !!castDevice?.deviceId, [castDevice]);
  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
  const [selectedSubtitleStream, setSelectedSubtitleStream] =
    useState<number>(0);
@@ -102,7 +89,6 @@ const page: React.FC = () => {
      "playbackUrl",
      item?.Id,
      maxBitrate,
-      castDevice,
      selectedAudioStream,
      selectedSubtitleStream,
      settings,
@@ -112,9 +98,7 @@ const page: React.FC = () => {

      let deviceProfile: any = ios;

-      if (castDevice?.deviceId) {
-        deviceProfile = chromecastProfile;
-      } else if (settings?.deviceProfile === "Native") {
+      if (settings?.deviceProfile === "Native") {
        deviceProfile = native;
      } else if (settings?.deviceProfile === "Old") {
        deviceProfile = old;
@@ -145,38 +129,13 @@ const page: React.FC = () => {
    async (type: "device" | "cast" = "device") => {
      if (!playbackUrl || !item) return;

-      if (type === "cast" && client) {
-        await CastContext.getPlayServicesState().then((state) => {
-          if (state && state !== PlayServicesState.SUCCESS)
-            CastContext.showPlayServicesErrorDialog(state);
-          else {
-            client.loadMedia({
-              mediaInfo: {
-                contentUrl: playbackUrl,
-                contentType: "video/mp4",
-                metadata: {
-                  type: item.Type === "Episode" ? "tvShow" : "movie",
-                  title: item.Name || "",
-                  subtitle: item.Overview || "",
-                },
-              },
-              startTime: 0,
-            });
-          }
-        });
-      } else {
-        setCurrentlyPlying({
-          item,
-          playbackUrl,
-        });
-        setPlaying(true);
-        setShowCurrentlyPlayingBar(true);
-
-        if (settings?.openFullScreenVideoPlayerByDefault === true) {
-          setTimeout(() => {
-            setFullscreen(true);
-          }, 100);
-        }
+      setCurrentlyPlying({
+        item,
+        playbackUrl,
+      });
+      setPlaying(true);
+      if (settings?.openFullScreenVideoPlayerByDefault === true) {
+        setFullscreen(true);
      }
    },
    [playbackUrl, item, settings]
@@ -251,11 +210,6 @@ const page: React.FC = () => {
        </View>

        <View className="flex flex-row justify-between items-center mb-2">
-          {playbackUrl ? (
-            <DownloadItem item={item} playbackUrl={playbackUrl} />
-          ) : (
-            <View className="h-12 aspect-square flex items-center justify-center"></View>
-          )}
          <PlayedStatus item={item} />
        </View>

@@ -280,7 +234,12 @@ 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} url={playbackUrl} className="grow" />
+          <PlayButton
+            item={item}
+            chromecastReady={false}
+            onPress={onPressPlay}
+            className="grow"
+          />
          <NextEpisodeButton item={item} className="ml-2" />
        </View>
      </View>
--- a/app/(auth)/settings.tsx
+++ b/app/(auth)/settings.tsx
@@ -6,14 +6,9 @@ import { clearLogs, readFromLog } from "@/utils/log";
 import { useQuery } from "@tanstack/react-query";
 import { useAtom } from "jotai";
 import { ScrollView, View } from "react-native";
-import * as Haptics from "expo-haptics";
-import { useFiles } from "@/hooks/useFiles";
-import { SettingToggles } from "@/components/settings/SettingToggles";
-import { WebSocketsTest } from "@/components/settings/WebsocketsText";

 export default function settings() {
  const { logout } = useJellyfin();
-  const { deleteAllFiles } = useFiles();

  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -34,30 +29,14 @@ export default function settings() {
          <ListItem title="Server" subTitle={api?.basePath} />
        </View>

-        <SettingToggles />
-
        <View className="flex flex-col space-y-2">
          <Button color="black" onPress={logout}>
            Log out
          </Button>
-          <Button
-            color="red"
-            onPress={async () => {
-              await deleteAllFiles();
-              Haptics.notificationAsync(
-                Haptics.NotificationFeedbackType.Success
-              );
-            }}
-          >
-            Delete all downloaded files
-          </Button>
          <Button
            color="red"
            onPress={async () => {
              await clearLogs();
-              Haptics.notificationAsync(
-                Haptics.NotificationFeedbackType.Success
-              );
            }}
          >
            Delete all logs
--- a/app/(auth)/songs/[songId].tsx
+++ b/app/(auth)/songs/[songId].tsx
@@ -1,12 +1,10 @@
 import { AudioTrackSelector } from "@/components/AudioTrackSelector";
 import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
-import { Chromecast } from "@/components/Chromecast";
 import { Text } from "@/components/common/Text";
 import {
  currentlyPlayingItemAtom,
  playingAtom,
 } from "@/components/CurrentlyPlayingBar";
-import { DownloadItem } from "@/components/DownloadItem";
 import { Loader } from "@/components/Loader";
 import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
@@ -19,20 +17,14 @@ import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { chromecastProfile } from "@/utils/profiles/chromecast";
 import ios from "@/utils/profiles/ios";
 import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { ScrollView, View } from "react-native";
-import CastContext, {
-  PlayServicesState,
-  useCastDevice,
-  useRemoteMediaClient,
-} from "react-native-google-cast";

 const page: React.FC = () => {
  const local = useLocalSearchParams();
@@ -43,20 +35,8 @@ const page: React.FC = () => {

  const [, setPlaying] = useAtom(playingAtom);

-  const castDevice = useCastDevice();
  const navigation = useNavigation();

-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <View className="">
-          <Chromecast />
-        </View>
-      ),
-    });
-  });
-
-  const chromecastReady = useMemo(() => !!castDevice?.deviceId, [castDevice]);
  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
  const [selectedSubtitleStream, setSelectedSubtitleStream] =
    useState<number>(0);
@@ -113,7 +93,6 @@ const page: React.FC = () => {
      "playbackUrl",
      item?.Id,
      maxBitrate,
-      castDevice,
      selectedAudioStream,
      selectedSubtitleStream,
    ],
@@ -127,7 +106,7 @@ const page: React.FC = () => {
        startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
        maxStreamingBitrate: maxBitrate.value,
        sessionData,
-        deviceProfile: castDevice?.deviceId ? chromecastProfile : ios,
+        deviceProfile: ios,
        audioStreamIndex: selectedAudioStream,
        subtitleStreamIndex: selectedSubtitleStream,
      });
@@ -141,38 +120,16 @@ const page: React.FC = () => {
  });

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

  const onPressPlay = useCallback(
    async (type: "device" | "cast" = "device") => {
      if (!playbackUrl || !item) return;

-      if (type === "cast" && client) {
-        await CastContext.getPlayServicesState().then((state) => {
-          if (state && state !== PlayServicesState.SUCCESS)
-            CastContext.showPlayServicesErrorDialog(state);
-          else {
-            client.loadMedia({
-              mediaInfo: {
-                contentUrl: playbackUrl,
-                contentType: "video/mp4",
-                metadata: {
-                  type: item.Type === "Episode" ? "tvShow" : "movie",
-                  title: item.Name || "",
-                  subtitle: item.Overview || "",
-                },
-              },
-              startTime: 0,
-            });
-          }
-        });
-      } else {
-        setCp({
-          item,
-          playbackUrl,
-        });
-        setPlaying(true);
-      }
+      setCp({
+        item,
+        playbackUrl,
+      });
+      setPlaying(true);
    },
    [playbackUrl, item]
  );
@@ -221,14 +178,6 @@ const page: React.FC = () => {
          <MoviesTitleHeader item={item} />
          <Text className="text-center opacity-50">{item?.ProductionYear}</Text>
        </View>
-
-        <View className="flex flex-row justify-between items-center w-full my-4">
-          {playbackUrl ? (
-            <DownloadItem item={item} playbackUrl={playbackUrl} />
-          ) : (
-            <View className="h-12 aspect-square flex items-center justify-center"></View>
-          )}
-        </View>
      </View>
      <View className="flex flex-col p-4 w-full">
        <View className="flex flex-row items-center space-x-2 w-full">
@@ -251,7 +200,7 @@ const page: React.FC = () => {
          <NextEpisodeButton item={item} type="previous" className="mr-2" />
          <PlayButton
            item={item}
-            chromecastReady={chromecastReady}
+            chromecastReady={false}
            onPress={onPressPlay}
            className="grow"
          />
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -1,7 +1,5 @@
 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";
@@ -10,7 +8,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useFonts } from "expo-font";
 import { useKeepAwake } from "expo-keep-awake";
 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";
@@ -48,8 +45,6 @@ export default function RootLayout() {
 }

 function Layout() {
-  const [settings, updateSettings] = useSettings();
-
  useKeepAwake();

  const queryClientRef = useRef<QueryClient>(
@@ -66,121 +61,99 @@ function Layout() {
    })
  );

-  useEffect(() => {
-    if (settings?.autoRotate === true)
-      ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.DEFAULT);
-    else
-      ScreenOrientation.lockAsync(
-        ScreenOrientation.OrientationLock.PORTRAIT_UP
-      );
-  }, [settings]);
-
  return (
    <GestureHandlerRootView style={{ flex: 1 }}>
      <QueryClientProvider client={queryClientRef.current}>
-        <JobQueueProvider>
-          <ActionSheetProvider>
-            <BottomSheetModalProvider>
-              <JellyfinProvider>
-                <PlaybackProvider>
-                  <StatusBar style="light" backgroundColor="#000" />
-                  <ThemeProvider value={DarkTheme}>
-                    <Stack initialRouteName="/home">
-                      <Stack.Screen
-                        name="(auth)/(tabs)"
-                        options={{
-                          headerShown: false,
-                          title: "",
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/settings"
-                        options={{
-                          headerShown: true,
-                          title: "Settings",
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/downloads"
-                        options={{
-                          headerShown: true,
-                          title: "Downloads",
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/items/[id]"
-                        options={{
-                          title: "",
-                          headerShown: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/collections/[collectionId]"
-                        options={{
-                          title: "",
-                          headerShown: true,
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/artists/page"
-                        options={{
-                          title: "",
-                          headerShown: true,
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/artists/[artistId]/page"
-                        options={{
-                          title: "",
-                          headerShown: true,
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/albums/[albumId]"
-                        options={{
-                          title: "",
-                          headerShown: true,
-                          headerStyle: { backgroundColor: "black" },
-                          headerShadowVisible: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/songs/[songId]"
-                        options={{
-                          title: "",
-                          headerShown: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="(auth)/series/[id]"
-                        options={{
-                          title: "",
-                          headerShown: false,
-                        }}
-                      />
-                      <Stack.Screen
-                        name="login"
-                        options={{ headerShown: false, title: "Login" }}
-                      />
-                      <Stack.Screen name="+not-found" />
-                    </Stack>
-                    <CurrentlyPlayingBar />
-                  </ThemeProvider>
-                </PlaybackProvider>
-              </JellyfinProvider>
-            </BottomSheetModalProvider>
-          </ActionSheetProvider>
-        </JobQueueProvider>
+        <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)/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>
+            </JellyfinProvider>
+          </BottomSheetModalProvider>
+        </ActionSheetProvider>
      </QueryClientProvider>
    </GestureHandlerRootView>
  );
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -44,11 +44,8 @@ const Login: React.FC = () => {
        await login(credentials.username, credentials.password);
      }
    } catch (error) {
-      if (error instanceof Error) {
-        setError(error.message);
-      } else {
-        setError("An unexpected error occurred");
-      }
+      const e = error as AxiosError;
+      setError(e.message);
    } 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
@@ -1,40 +0,0 @@
-<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
@@ -1,5 +1,4 @@
 import { TouchableOpacity, View } from "react-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { atom, useAtom } from "jotai";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
@@ -22,12 +21,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(() => {
@@ -36,45 +35,9 @@ export const AudioTrackSelector: React.FC<Props> = ({
  }, []);

  return (
-    <View className="flex flex-row items-center justify-between" {...props}>
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className="flex flex-col mb-2">
-            <Text className="opacity-50 mb-1 text-xs">Audio streams</Text>
-            <View className="flex flex-row">
-              <TouchableOpacity className="bg-neutral-900 max-w-32 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
-                <Text className="">
-                  {tc(selectedAudioSteam?.DisplayTitle, 13)}
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side="bottom"
-          align="start"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Audio streams</DropdownMenu.Label>
-          {audioStreams?.map((audio, idx: number) => (
-            <DropdownMenu.Item
-              key={idx.toString()}
-              onSelect={() => {
-                if (audio.Index !== null && audio.Index !== undefined)
-                  onChange(audio.Index);
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {audio.DisplayTitle}
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
+    <View
+      className="flex flex-row items-center justify-between"
+      {...props}
+    ></View>
  );
 };
--- a/components/BitrateSelector.tsx
+++ b/components/BitrateSelector.tsx
@@ -1,5 +1,4 @@
 import { TouchableOpacity, View } from "react-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { atom, useAtom } from "jotai";

@@ -46,42 +45,9 @@ export const BitrateSelector: React.FC<Props> = ({
  ...props
 }) => {
  return (
-    <View className="flex flex-row items-center justify-between" {...props}>
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className="flex flex-col mb-2">
-            <Text className="opacity-50 mb-1 text-xs">Bitrate</Text>
-            <View className="flex flex-row">
-              <TouchableOpacity className="bg-neutral-900 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
-                <Text>
-                  {BITRATES.find((b) => b.value === selected.value)?.key}
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side="bottom"
-          align="start"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Bitrates</DropdownMenu.Label>
-          {BITRATES?.map((b, index: number) => (
-            <DropdownMenu.Item
-              key={index.toString()}
-              onSelect={() => {
-                onChange(b);
-              }}
-            >
-              <DropdownMenu.ItemTitle>{b.key}</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
+    <View
+      className="flex flex-row items-center justify-between"
+      {...props}
+    ></View>
  );
 };
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -1,4 +1,3 @@
-import * as Haptics from "expo-haptics";
 import React, { PropsWithChildren, ReactNode, useMemo } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";
@@ -51,7 +50,6 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      onPress={() => {
        if (!loading && !disabled && onPress) {
          onPress();
-          Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
        }
      }}
      disabled={disabled || loading}
--- a/components/ContinueWatchingPoster.tsx
+++ b/components/ContinueWatchingPoster.tsx
@@ -21,23 +21,23 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
      getPrimaryImageUrl({
        api,
        item,
-        quality: 90,
-        width: 176 * 2,
+        quality: 70,
+        width: 300,
      }),
-    [item]
+    [item],
  );

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

  if (!url)
    return (
-      <View className="w-44 aspect-video border border-neutral-800"></View>
+      <View className="w-48 aspect-video border border-neutral-800"></View>
    );

  return (
-    <View className="w-44 relative aspect-video rounded-lg overflow-hidden border border-neutral-800">
+    <View className="w-48 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,39 +1,50 @@
 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 { useAtom } from "jotai";
-import { useEffect, useMemo } from "react";
+import { atom, useAtom } from "jotai";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Alert, Platform, TouchableOpacity, View } from "react-native";
 import Animated, {
  useAnimatedStyle,
  useSharedValue,
  withTiming,
 } from "react-native-reanimated";
-import Video from "react-native-video";
+import Video, { OnProgressData, VideoRef } 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);
@@ -81,28 +92,108 @@ 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(
    () =>
-      currentlyPlaying?.item?.UserData?.PlaybackPositionTicks
-        ? Math.round(
-            currentlyPlaying?.item.UserData.PlaybackPositionTicks / 10000
-          )
+      item?.UserData?.PlaybackPositionTicks
+        ? Math.round(item.UserData.PlaybackPositionTicks / 10000)
        : 0,
-    [currentlyPlaying?.item]
+    [item]
  );

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

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

  return (
    <Animated.View
@@ -129,14 +220,10 @@ export const CurrentlyPlayingBar: React.FC = () => {
                videoRef.current?.presentFullscreenPlayer();
              }}
              className={`relative h-full bg-neutral-800 rounded-md overflow-hidden
-                ${
-                  currentlyPlaying.item?.Type === "Audio"
-                    ? "aspect-square"
-                    : "aspect-video"
-                }
+                ${item?.Type === "Audio" ? "aspect-square" : "aspect-video"}
                `}
            >
-              {currentlyPlaying?.url && (
+              {currentlyPlaying.playbackUrl && (
                <Video
                  ref={videoRef}
                  allowsExternalPlayback
@@ -148,7 +235,7 @@ export const CurrentlyPlayingBar: React.FC = () => {
                  controls={false}
                  pictureInPicture={true}
                  poster={
-                    backdropUrl && currentlyPlaying.item?.Type === "Audio"
+                    backdropUrl && item?.Type === "Audio"
                      ? backdropUrl
                      : undefined
                  }
@@ -156,13 +243,13 @@ export const CurrentlyPlayingBar: React.FC = () => {
                    enable: true,
                    thread: true,
                  }}
-                  paused={!isPlaying}
+                  paused={!playing}
                  onProgress={(e) => onProgress(e)}
                  subtitleStyle={{
                    fontSize: 16,
                  }}
                  source={{
-                    uri: currentlyPlaying.url,
+                    uri: currentlyPlaying.playbackUrl,
                    isNetwork: true,
                    startPosition,
                    headers: getAuthHeaders(api),
@@ -170,18 +257,22 @@ export const CurrentlyPlayingBar: React.FC = () => {
                  onBuffer={(e) =>
                    e.isBuffering ? console.log("Buffering...") : null
                  }
-                  onFullscreenPlayerDidDismiss={() => {}}
-                  onFullscreenPlayerDidPresent={() => {}}
+                  onFullscreenPlayerDidDismiss={() => {
+                    setFullScreen(false);
+                  }}
+                  onFullscreenPlayerDidPresent={() => {
+                    setFullScreen(true);
+                  }}
                  onPlaybackStateChanged={(e) => {
                    if (e.isPlaying) {
-                      setIsPlaying(true);
+                      setPlaying(true);
                    } else if (e.isSeeking) {
                      return;
                    } else {
-                      setIsPlaying(false);
+                      setPlaying(false);
                    }
                  }}
-                  progressUpdateInterval={2000}
+                  progressUpdateInterval={1000}
                  onError={(e) => {
                    console.log(e);
                    writeToLog(
@@ -189,11 +280,11 @@ export const CurrentlyPlayingBar: React.FC = () => {
                      "Video playback error: " + JSON.stringify(e)
                    );
                    Alert.alert("Error", "Cannot play this video file.");
-                    setIsPlaying(false);
-                    // setCurrentlyPlaying(null);
+                    setPlaying(false);
+                    setCurrentlyPlaying(null);
                  }}
                  renderLoader={
-                    currentlyPlaying.item?.Type !== "Audio" && (
+                    item?.Type !== "Audio" && (
                      <View className="flex flex-col items-center justify-center h-full">
                        <Loader />
                      </View>
@@ -205,41 +296,37 @@ export const CurrentlyPlayingBar: React.FC = () => {
            <View className="shrink text-xs">
              <TouchableOpacity
                onPress={() => {
-                  if (currentlyPlaying.item?.Type === "Audio")
-                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
-                  else router.push(`/items/${currentlyPlaying.item?.Id}`);
+                  if (item?.Type === "Audio")
+                    router.push(`/albums/${item?.AlbumId}`);
+                  else router.push(`/items/${item?.Id}`);
                }}
              >
-                <Text>{currentlyPlaying.item?.Name}</Text>
+                <Text>{item?.Name}</Text>
              </TouchableOpacity>
-              {currentlyPlaying.item?.Type === "Episode" && (
+              {item?.Type === "Episode" && (
                <TouchableOpacity
                  onPress={() => {
-                    router.push(
-                      `/(auth)/series/${currentlyPlaying.item.SeriesId}`
-                    );
+                    router.push(`/(auth)/series/${item.SeriesId}`);
                  }}
                  className="text-xs opacity-50"
                >
-                  <Text>{currentlyPlaying.item.SeriesName}</Text>
+                  <Text>{item.SeriesName}</Text>
                </TouchableOpacity>
              )}
-              {currentlyPlaying.item?.Type === "Movie" && (
+              {item?.Type === "Movie" && (
                <View>
                  <Text className="text-xs opacity-50">
-                    {currentlyPlaying.item?.ProductionYear}
+                    {item?.ProductionYear}
                  </Text>
                </View>
              )}
-              {currentlyPlaying.item?.Type === "Audio" && (
+              {item?.Type === "Audio" && (
                <TouchableOpacity
                  onPress={() => {
-                    router.push(`/albums/${currentlyPlaying.item?.AlbumId}`);
+                    router.push(`/albums/${item?.AlbumId}`);
                  }}
                >
-                  <Text className="text-xs opacity-50">
-                    {currentlyPlaying.item?.Album}
-                  </Text>
+                  <Text className="text-xs opacity-50">{item?.Album}</Text>
                </TouchableOpacity>
              )}
            </View>
@@ -247,12 +334,12 @@ export const CurrentlyPlayingBar: React.FC = () => {
          <View className="flex flex-row items-center space-x-2">
            <TouchableOpacity
              onPress={() => {
-                if (isPlaying) pauseVideo();
-                else playVideo();
+                if (playing) setPlaying(false);
+                else setPlaying(true);
              }}
              className="aspect-square rounded flex flex-col items-center justify-center p-2"
            >
-              {isPlaying ? (
+              {playing ? (
                <Ionicons name="pause" size={24} color="white" />
              ) : (
                <Ionicons name="play" size={24} color="white" />
@@ -260,7 +347,7 @@ export const CurrentlyPlayingBar: React.FC = () => {
            </TouchableOpacity>
            <TouchableOpacity
              onPress={() => {
-                stopPlayback();
+                setCurrentlyPlaying(null);
              }}
              className="aspect-square rounded flex flex-col items-center justify-center p-2"
            >
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -1,138 +0,0 @@
-import { useRemuxHlsToMp4 } from "@/hooks/useRemuxHlsToMp4";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-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 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 { Loader } from "./Loader";
-import ProgressCircle from "./ProgressCircle";
-
-type DownloadProps = {
-  item: BaseItemDto;
-  playbackUrl: string;
-};
-
-export const DownloadItem: React.FC<DownloadProps> = ({
-  item,
-  playbackUrl,
-}) => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const [process] = useAtom(runningProcesses);
-  const [queue, setQueue] = useAtom(queueAtom);
-
-  const { startRemuxing } = useRemuxHlsToMp4(playbackUrl, item);
-
-  const { data: playbackInfo, isLoading } = useQuery({
-    queryKey: ["playbackInfo", item.Id],
-    queryFn: async () => getPlaybackInfo(api, item.Id, user?.Id),
-  });
-
-  const { data: downloaded, isLoading: isLoadingDownloaded } = useQuery({
-    queryKey: ["downloaded", item.Id],
-    queryFn: async () => {
-      if (!item.Id) return false;
-
-      const data: BaseItemDto[] = JSON.parse(
-        (await AsyncStorage.getItem("downloaded_files")) || "[]"
-      );
-
-      return data.some((d) => d.Id === item.Id);
-    },
-    enabled: !!item.Id,
-  });
-
-  if (isLoading || isLoadingDownloaded) {
-    return (
-      <View className="rounded h-10 aspect-square flex items-center justify-center">
-        <Loader />
-      </View>
-    );
-  }
-
-  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");
-        }}
-      >
-        <View className="rounded h-10 aspect-square flex items-center justify-center">
-          {process.progress === 0 ? (
-            <Loader />
-          ) : (
-            <View className="-rotate-45">
-              <ProgressCircle
-                size={24}
-                fill={process.progress}
-                width={4}
-                tintColor="#9334E9"
-                backgroundColor="#bdc3c7"
-              />
-            </View>
-          )}
-        </View>
-      </TouchableOpacity>
-    );
-  }
-
-  if (queue.some((i) => i.id === item.Id)) {
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          router.push("/downloads");
-        }}
-      >
-        <View className="rounded h-10 aspect-square flex items-center justify-center opacity-50">
-          <Ionicons name="hourglass" size={24} color="white" />
-        </View>
-      </TouchableOpacity>
-    );
-  }
-
-  if (downloaded) {
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          router.push("/downloads");
-        }}
-      >
-        <View className="rounded h-10 aspect-square flex items-center justify-center">
-          <Ionicons name="cloud-download" size={26} color="#9333ea" />
-        </View>
-      </TouchableOpacity>
-    );
-  } else {
-    return (
-      <TouchableOpacity
-        onPress={() => {
-          queueActions.enqueue(queue, setQueue, {
-            id: item.Id!,
-            execute: async () => {
-              await startRemuxing();
-            },
-            item,
-          });
-        }}
-      >
-        <View className="rounded h-10 aspect-square flex items-center justify-center">
-          <Ionicons name="cloud-download-outline" size={26} color="white" />
-        </View>
-      </TouchableOpacity>
-    );
-  }
-};
--- a/components/ItemCardText.tsx
+++ b/components/ItemCardText.tsx
@@ -8,6 +8,17 @@ 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">
@@ -17,7 +28,9 @@ export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
            {item.SeriesName}
          </Text>
          <Text numberOfLines={1} className="text-xs opacity-50">
-            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}{" "}
+            {`S${seasonNameToIndex(
+              item?.SeasonName,
+            )}:E${item.IndexNumber?.toString()}`}{" "}
            {item.Name}
          </Text>
        </>
--- a/components/ParallaxPage.tsx
+++ b/components/ParallaxPage.tsx
@@ -9,7 +9,6 @@ import Animated, {
  useScrollViewOffset,
 } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Chromecast } from "./Chromecast";

 const HEADER_HEIGHT = 400;

@@ -33,14 +32,14 @@ export const ParallaxScrollView: React.FC<Props> = ({
          translateY: interpolate(
            scrollOffset.value,
            [-HEADER_HEIGHT, 0, HEADER_HEIGHT],
-            [-HEADER_HEIGHT / 2, 0, HEADER_HEIGHT * 0.75],
+            [-HEADER_HEIGHT / 2, 0, HEADER_HEIGHT * 0.75]
          ),
        },
        {
          scale: interpolate(
            scrollOffset.value,
            [-HEADER_HEIGHT, 0, HEADER_HEIGHT],
-            [2, 1, 1],
+            [2, 1, 1]
          ),
        },
      ],
@@ -73,15 +72,6 @@ export const ParallaxScrollView: React.FC<Props> = ({
          />
        </TouchableOpacity>

-        <View
-          className="absolute right-4 z-50 bg-black rounded-full p-0.5"
-          style={{
-            top: inset.top + 17,
-          }}
-        >
-          <Chromecast width={22} height={22} />
-        </View>
-
        {logo && (
          <View className="absolute top-[250px] h-[130px] left-0 w-full z-40 px-4 flex justify-center items-center">
            {logo}
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -1,30 +1,27 @@
-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 | null;
-  url?: string | null;
+  item: BaseItemDto;
+  onPress: (type?: "cast" | "device") => void;
+  chromecastReady: boolean;
 }

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

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

@@ -36,45 +33,28 @@ export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
        options,
        cancelButtonIndex,
      },
-      async (selectedIndex: number | undefined) => {
+      (selectedIndex: number | undefined) => {
        switch (selectedIndex) {
          case 0:
-            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,
-                });
-              }
-            });
+            onPress("cast");
            break;
          case 1:
-            setCurrentlyPlayingState({ item, url });
+            onPress("device");
            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" />
-          {client && <Feather name="cast" size={22} color="white" />}
+          {chromecastReady && <Feather name="cast" size={22} color="white" />}
        </View>
      }
      {...props}
--- a/components/PlayedStatus.tsx
+++ b/components/PlayedStatus.tsx
@@ -4,7 +4,6 @@ import { markAsPlayed } from "@/utils/jellyfin/playstate/markAsPlayed";
 import { Ionicons } from "@expo/vector-icons";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useQueryClient } from "@tanstack/react-query";
-import * as Haptics from "expo-haptics";
 import { useAtom } from "jotai";
 import React from "react";
 import { TouchableOpacity, View } from "react-native";
@@ -41,7 +40,6 @@ export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
      {item.UserData?.Played ? (
        <TouchableOpacity
          onPress={async () => {
-            Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
            await markAsNotPlayed({
              api: api,
              itemId: item?.Id,
@@ -57,7 +55,6 @@ export const PlayedStatus: React.FC<{ item: BaseItemDto }> = ({ item }) => {
      ) : (
        <TouchableOpacity
          onPress={async () => {
-            Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
            await markAsPlayed({
              api: api,
              item: item,
--- a/components/SubtitleTrackSelector.tsx
+++ b/components/SubtitleTrackSelector.tsx
@@ -1,5 +1,4 @@
 import { TouchableOpacity, View } from "react-native";
-import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { atom, useAtom } from "jotai";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
@@ -22,14 +21,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(() => {
@@ -44,55 +43,9 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
  if (subtitleStreams.length === 0) return null;

  return (
-    <View className="flex flex-row items-center justify-between" {...props}>
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className="flex flex-col mb-2">
-            <Text className="opacity-50 mb-1 text-xs">Subtitles</Text>
-            <View className="flex flex-row">
-              <TouchableOpacity className="bg-neutral-900 max-w-32 h-12 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
-                <Text className="">
-                  {selectedSubtitleSteam
-                    ? tc(selectedSubtitleSteam?.DisplayTitle, 13)
-                    : "None"}
-                </Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side="bottom"
-          align="start"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Subtitles</DropdownMenu.Label>
-          <DropdownMenu.Item
-            key={"-1"}
-            onSelect={() => {
-              onChange(-1);
-            }}
-          >
-            <DropdownMenu.ItemTitle>None</DropdownMenu.ItemTitle>
-          </DropdownMenu.Item>
-          {subtitleStreams?.map((subtitle, idx: number) => (
-            <DropdownMenu.Item
-              key={idx.toString()}
-              onSelect={() => {
-                if (subtitle.Index !== undefined && subtitle.Index !== null)
-                  onChange(subtitle.Index);
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {subtitle.DisplayTitle}
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
-    </View>
+    <View
+      className="flex flex-row items-center justify-between"
+      {...props}
+    ></View>
  );
 };
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -8,7 +8,6 @@ import { Text } from "@/components/common/Text";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { PropsWithChildren } from "react";
 import { useRouter } from "expo-router";
-import * as Haptics from "expo-haptics";

 interface Props extends TouchableOpacityProps {
  item: BaseItemDto;
@@ -23,8 +22,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
  return (
    <TouchableOpacity
      onPress={() => {
-        Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-
        if (item.Type === "Series") {
          router.push(`/series/${item.Id}`);
          return;
@@ -46,6 +43,7 @@ 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
@@ -1,96 +0,0 @@
-import React, { useCallback } from "react";
-import { TouchableOpacity } from "react-native";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import * as ContextMenu from "zeego/context-menu";
-import * as Haptics from "expo-haptics";
-import * as FileSystem from "expo-file-system";
-import { useAtom } from "jotai";
-
-import { Text } from "../common/Text";
-import { useFiles } from "@/hooks/useFiles";
-import { useSettings } from "@/utils/atoms/settings";
-import {
-  currentlyPlayingItemAtom,
-  fullScreenAtom,
-  playingAtom,
-} from "@/utils/atoms/playState";
-
-interface EpisodeCardProps {
-  item: BaseItemDto;
-}
-
-/**
- * EpisodeCard component displays an episode with context menu options.
- * @param {EpisodeCardProps} props - The component props.
- * @returns {React.ReactElement} The rendered EpisodeCard component.
- */
-export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
-  const { deleteFile } = useFiles();
-  const [, setCurrentlyPlaying] = useAtom(currentlyPlayingItemAtom);
-  const [, setPlaying] = useAtom(playingAtom);
-  const [, setFullscreen] = useAtom(fullScreenAtom);
-  const [settings] = useSettings();
-
-  /**
-   * Handles opening the file for playback.
-   */
-  const handleOpenFile = useCallback(async () => {
-    setCurrentlyPlaying({
-      item,
-      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
-    });
-    setPlaying(true);
-    if (settings?.openFullScreenVideoPlayerByDefault === true)
-      setFullscreen(true);
-  }, [item, setCurrentlyPlaying, settings]);
-
-  /**
-   * Handles deleting the file with haptic feedback.
-   */
-  const handleDeleteFile = useCallback(() => {
-    if (item.Id) {
-      deleteFile(item.Id);
-      Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
-    }
-  }, [deleteFile, item.Id]);
-
-  const contextMenuOptions = [
-    {
-      label: "Delete",
-      onSelect: handleDeleteFile,
-      destructive: true,
-    },
-  ];
-
-  return (
-    <ContextMenu.Root>
-      <ContextMenu.Trigger>
-        <TouchableOpacity
-          onPress={handleOpenFile}
-          className="bg-neutral-900 border border-neutral-800 rounded-2xl p-4"
-        >
-          <Text className="font-bold">{item.Name}</Text>
-          <Text className="text-xs opacity-50">Episode {item.IndexNumber}</Text>
-        </TouchableOpacity>
-      </ContextMenu.Trigger>
-      <ContextMenu.Content
-        alignOffset={0}
-        avoidCollisions
-        collisionPadding={10}
-        loop={false}
-      >
-        {contextMenuOptions.map((option) => (
-          <ContextMenu.Item
-            key={option.label}
-            onSelect={option.onSelect}
-            destructive={option.destructive}
-          >
-            <ContextMenu.ItemTitle style={{ color: "red" }}>
-              {option.label}
-            </ContextMenu.ItemTitle>
-          </ContextMenu.Item>
-        ))}
-      </ContextMenu.Content>
-    </ContextMenu.Root>
-  );
-};
--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -1,105 +0,0 @@
-import React, { useCallback } from "react";
-import { TouchableOpacity, View } from "react-native";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import * as ContextMenu from "zeego/context-menu";
-import * as FileSystem from "expo-file-system";
-import * as Haptics from "expo-haptics";
-import { useAtom } from "jotai";
-
-import { Text } from "../common/Text";
-import { useFiles } from "@/hooks/useFiles";
-import { runtimeTicksToMinutes } from "@/utils/time";
-
-import { useSettings } from "@/utils/atoms/settings";
-import {
-  currentlyPlayingItemAtom,
-  playingAtom,
-  fullScreenAtom,
-} from "@/utils/atoms/playState";
-
-interface MovieCardProps {
-  item: BaseItemDto;
-}
-
-/**
- * MovieCard component displays a movie with context menu options.
- * @param {MovieCardProps} props - The component props.
- * @returns {React.ReactElement} The rendered MovieCard component.
- */
-export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
-  const { deleteFile } = useFiles();
-  const [, setCurrentlyPlaying] = useAtom(currentlyPlayingItemAtom);
-  const [, setPlaying] = useAtom(playingAtom);
-  const [, setFullscreen] = useAtom(fullScreenAtom);
-  const [settings] = useSettings();
-
-  /**
-   * Handles opening the file for playback.
-   */
-  const handleOpenFile = useCallback(() => {
-    console.log("Open movie file", item.Name);
-    setCurrentlyPlaying({
-      item,
-      playbackUrl: `${FileSystem.documentDirectory}/${item.Id}.mp4`,
-    });
-    setPlaying(true);
-    if (settings?.openFullScreenVideoPlayerByDefault === true) {
-      setFullscreen(true);
-    }
-  }, [item, setCurrentlyPlaying, setPlaying, settings]);
-
-  /**
-   * Handles deleting the file with haptic feedback.
-   */
-  const handleDeleteFile = useCallback(() => {
-    if (item.Id) {
-      deleteFile(item.Id);
-      Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
-    }
-  }, [deleteFile, item.Id]);
-
-  const contextMenuOptions = [
-    {
-      label: "Delete",
-      onSelect: handleDeleteFile,
-      destructive: true,
-    },
-  ];
-
-  return (
-    <ContextMenu.Root>
-      <ContextMenu.Trigger>
-        <TouchableOpacity
-          onPress={handleOpenFile}
-          className="bg-neutral-900 border border-neutral-800 rounded-2xl p-4"
-        >
-          <Text className="font-bold">{item.Name}</Text>
-          <View className="flex flex-col">
-            <Text className="text-xs opacity-50">{item.ProductionYear}</Text>
-            <Text className="text-xs opacity-50">
-              {runtimeTicksToMinutes(item.RunTimeTicks)}
-            </Text>
-          </View>
-        </TouchableOpacity>
-      </ContextMenu.Trigger>
-      <ContextMenu.Content
-        loop={false}
-        alignOffset={0}
-        avoidCollisions={false}
-        collisionPadding={0}
-      >
-        {contextMenuOptions.map((option) => (
-          <ContextMenu.Item
-            key={option.label}
-            onSelect={option.onSelect}
-            destructive={option.destructive}
-          >
-            <ContextMenu.ItemTitle style={{ color: "red" }}>
-              {option.label}
-            </ContextMenu.ItemTitle>
-          </ContextMenu.Item>
-        ))}
-      </ContextMenu.Content>
-    </ContextMenu.Root>
-  );
-};
--- a/components/downloads/SeriesCard.tsx
+++ b/components/downloads/SeriesCard.tsx
@@ -1,49 +0,0 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { View } from "react-native";
-import { EpisodeCard } from "./EpisodeCard";
-import { Text } from "../common/Text";
-import { useMemo } from "react";
-import { SeasonPicker } from "../series/SeasonPicker";
-
-export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
-  const groupBySeason = useMemo(() => {
-    const seasons: Record<string, BaseItemDto[]> = {};
-
-    items.forEach((item) => {
-      if (!seasons[item.SeasonName!]) {
-        seasons[item.SeasonName!] = [];
-      }
-
-      seasons[item.SeasonName!].push(item);
-    });
-
-    return Object.values(seasons).sort(
-      (a, b) => a[0].IndexNumber! - b[0].IndexNumber!
-    );
-  }, [items]);
-
-  return (
-    <View>
-      <View className="flex flex-row items-center justify-between">
-        <Text className="text-2xl font-bold">{items[0].SeriesName}</Text>
-        <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
-          <Text className="text-xs font-bold">{items.length}</Text>
-        </View>
-      </View>
-
-      <Text className="opacity-50 mb-2">TV-Series</Text>
-      {groupBySeason.map((seasonItems, seasonIndex) => (
-        <View key={seasonIndex}>
-          <Text className="mb-2 font-semibold">
-            {seasonItems[0].SeasonName}
-          </Text>
-          {seasonItems.map((item, index) => (
-            <View className="mb-2" key={index}>
-              <EpisodeCard item={item} />
-            </View>
-          ))}
-        </View>
-      ))}
-    </View>
-  );
-};
--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -1,6 +1,8 @@
 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";
@@ -57,7 +59,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,34 +34,6 @@ 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,
@@ -93,8 +65,6 @@ 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);
@@ -176,14 +146,16 @@ export const FilterSheet = <T,>({
              <>
                <TouchableOpacity
                  onPress={() => {
-                    if (!values.includes(item)) {
-                      set([item]);
-                      setTimeout(() => {
-                        setOpen(false);
-                      }, 250);
-                    }
+                    set(
+                      values.includes(item)
+                        ? values.filter((i) => i !== item)
+                        : [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,25 +31,6 @@ 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({
      /**
@@ -61,20 +42,40 @@ export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
    });
  };

-  const { data: popularItems, isFetching: l2 } = useQuery<BaseItemDto[]>({
-    queryKey: ["popular", user?.Id],
+  const { data: mediaListCollection, isLoading: l1 } = useQuery<string | null>({
+    queryKey: ["mediaListCollection", user?.Id],
    queryFn: async () => {
-      if (!api || !user?.Id || !sf_carousel) return [];
+      if (!api || !user?.Id) return null;

      const response = await getItemsApi(api).getItems({
        userId: user.Id,
-        parentId: sf_carousel,
+        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[]>({
+    queryKey: ["popular", user?.Id],
+    queryFn: async () => {
+      if (!api || !user?.Id || !mediaListCollection) return [];
+
+      const response = await getItemsApi(api).getItems({
+        userId: user.Id,
+        parentId: mediaListCollection,
        limit: 10,
      });

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

--- 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-28" : "w-44"}
+              ${orientation === "vertical" ? "w-32" : "w-48"}
            `}
          >
            <View>
--- a/components/medialists/MediaListSection.tsx
+++ b/components/medialists/MediaListSection.tsx
@@ -13,7 +13,6 @@ 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;
@@ -57,12 +56,11 @@ export const MediaListSection: React.FC<Props> = ({ collection, ...props }) => {
            key={index}
            item={item}
            className={`flex flex-col
-              ${"w-28"}
+              ${"w-32"}
            `}
          >
            <View>
              <MoviePoster item={item} />
-              <ItemCardText item={item} />
            </View>
          </TouchableItemRouter>
        )}
--- a/components/music/SongsListItem.tsx
+++ b/components/music/SongsListItem.tsx
@@ -12,13 +12,7 @@ import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { useAtom } from "jotai";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { chromecastProfile } from "@/utils/profiles/chromecast";
 import { getMediaInfoApi } from "@jellyfin/sdk/lib/utils/api";
-import CastContext, {
-  PlayServicesState,
-  useCastDevice,
-  useRemoteMediaClient,
-} from "react-native-google-cast";
 import { currentlyPlayingItemAtom, playingAtom } from "../CurrentlyPlayingBar";
 import { useActionSheet } from "@expo/react-native-action-sheet";
 import ios from "@/utils/profiles/ios";
@@ -41,40 +35,14 @@ export const SongsListItem: React.FC<Props> = ({
 }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const castDevice = useCastDevice();
  const [, setCp] = useAtom(currentlyPlayingItemAtom);
  const [, setPlaying] = useAtom(playingAtom);

-  const client = useRemoteMediaClient();
  const { showActionSheetWithOptions } = useActionSheet();

  const openSelect = () => {
-    if (!castDevice?.deviceId) {
-      play("device");
-      return;
-    }
-
-    const options = ["Chromecast", "Device", "Cancel"];
-    const cancelButtonIndex = 2;
-
-    showActionSheetWithOptions(
-      {
-        options,
-        cancelButtonIndex,
-      },
-      (selectedIndex: number | undefined) => {
-        switch (selectedIndex) {
-          case 0:
-            play("cast");
-            break;
-          case 1:
-            play("device");
-            break;
-          case cancelButtonIndex:
-            break;
-        }
-      },
-    );
+    play("device");
+    return;
  };

  const play = async (type: "device" | "cast") => {
@@ -93,37 +61,16 @@ export const SongsListItem: React.FC<Props> = ({
      item,
      startTimeTicks: item?.UserData?.PlaybackPositionTicks || 0,
      sessionData,
-      deviceProfile: castDevice?.deviceId ? chromecastProfile : ios,
+      deviceProfile: ios,
    });

    if (!url || !item) return;

-    if (type === "cast" && client) {
-      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,
-          });
-        }
-      });
-    } else {
-      setCp({
-        item,
-        playbackUrl: url,
-      });
-      setPlaying(true);
-    }
+    setCp({
+      item,
+      playbackUrl: url,
+    });
+    setPlaying(true);
  };

  return (
--- a/components/series/CastAndCrew.tsx
+++ b/components/series/CastAndCrew.tsx
@@ -10,13 +10,11 @@ import Poster from "../posters/Poster";
 import { useAtom } from "jotai";
 import { apiAtom } from "@/providers/JellyfinProvider";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { router, usePathname } from "expo-router";
+import { router } from "expo-router";

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

-  const pathname = usePathname();
-
  return (
    <View>
      <Text className="text-lg font-bold mb-2 px-4">Cast & Crew</Text>
@@ -25,7 +23,7 @@ export const CastAndCrew = ({ item }: { item: BaseItemDto }) => {
        renderItem={(item, index) => (
          <TouchableOpacity
            onPress={() => {
-              router.push(`/search?q=${item.Name}&prev=${pathname}`);
+              // TODO: Navigate to person
            }}
            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-44"
+            className="flex flex-col w-32"
          >
            <ContinueWatchingPoster item={item} />
            <ItemCardText item={item} />
--- a/components/series/SeasonPicker.tsx
+++ b/components/series/SeasonPicker.tsx
@@ -5,7 +5,6 @@ import { useRouter } from "expo-router";
 import { atom, useAtom } from "jotai";
 import { useMemo } 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";
@@ -40,7 +39,7 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
          headers: {
            Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
          },
-        },
+        }
      );

      return response.data.Items;
@@ -51,7 +50,7 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
  const selectedSeasonId: string | null = useMemo(
    () =>
      seasons?.find((season: any) => season.IndexNumber === seasonIndex)?.Id,
-    [seasons, seasonIndex],
+    [seasons, seasonIndex]
  );

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

      return response.data.Items as BaseItemDto[];
@@ -80,36 +79,6 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {

  return (
    <View className="mb-2">
-      <DropdownMenu.Root>
-        <DropdownMenu.Trigger>
-          <View className="flex flex-row px-4">
-            <TouchableOpacity className="bg-neutral-900 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between">
-              <Text>Season {seasonIndex}</Text>
-            </TouchableOpacity>
-          </View>
-        </DropdownMenu.Trigger>
-        <DropdownMenu.Content
-          loop={true}
-          side="bottom"
-          align="start"
-          alignOffset={0}
-          avoidCollisions={true}
-          collisionPadding={8}
-          sideOffset={8}
-        >
-          <DropdownMenu.Label>Seasons</DropdownMenu.Label>
-          {seasons?.map((season: any) => (
-            <DropdownMenu.Item
-              key={season.Name}
-              onSelect={() => {
-                setSeasonIndex(season.IndexNumber);
-              }}
-            >
-              <DropdownMenu.ItemTitle>{season.Name}</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          ))}
-        </DropdownMenu.Content>
-      </DropdownMenu.Root>
      {episodes && (
        <View className="mt-4">
          <HorizontalScroll<BaseItemDto>
--- a/components/settings/SettingToggles.tsx
+++ b/components/settings/SettingToggles.tsx
@@ -1,15 +1,11 @@
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } 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();
@@ -17,27 +13,26 @@ 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: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
+    queryKey: ["mediaListCollections", user?.Id],
    queryFn: async () => {
      if (!api || !user?.Id) return [];

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

-      return response.data.Items ?? [];
+      const ids =
+        response.data.Items?.filter((c) => c.Name !== "sf_carousel") ?? [];
+
+      return ids;
    },
    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
    staleTime: 0,
@@ -156,23 +151,6 @@ export const SettingToggles: React.FC = () => {
          onValueChange={(value) => updateSettings({ forceDirectPlay: value })}
        />
      </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-row items-center space-x-2 justify-between bg-neutral-900 p-4
@@ -186,131 +164,6 @@ export const SettingToggles: React.FC = () => {
            supports.
          </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?.deviceProfile}</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({ deviceProfile: "Expo" });
-              }}
-            >
-              <DropdownMenu.ItemTitle>Expo</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="2"
-              onSelect={() => {
-                updateSettings({ deviceProfile: "Native" });
-              }}
-            >
-              <DropdownMenu.ItemTitle>Native</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="3"
-              onSelect={() => {
-                updateSettings({ deviceProfile: "Old" });
-              }}
-            >
-              <DropdownMenu.ItemTitle>Old</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          </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.7.0",
+      "channel": "0.6.1",
      "android": {
        "image": "latest"
      }
    },
    "production-apk": {
-      "channel": "0.7.0",
+      "channel": "0.6.1",
      "android": {
        "buildType": "apk",
        "image": "latest"
--- a/hooks/useDownloadMedia.ts
+++ b/hooks/useDownloadMedia.ts
@@ -1,117 +0,0 @@
-import { useCallback, useRef, useState } from "react";
-import { useAtom } from "jotai";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import * as FileSystem from "expo-file-system";
-import { Api } from "@jellyfin/sdk";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { runningProcesses } from "@/utils/atoms/downloads";
-
-/**
- * Custom hook for downloading media using the Jellyfin API.
- *
- * @param api - The Jellyfin API instance
- * @param userId - The user ID
- * @returns An object with download-related functions and state
- */
-export const useDownloadMedia = (api: Api | null, userId?: string | null) => {
-  const [isDownloading, setIsDownloading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [_, setProgress] = useAtom(runningProcesses);
-  const downloadResumableRef = useRef<FileSystem.DownloadResumable | null>(
-    null,
-  );
-
-  const downloadMedia = useCallback(
-    async (item: BaseItemDto | null): Promise<boolean> => {
-      if (!item?.Id || !api || !userId) {
-        setError("Invalid item or API");
-        return false;
-      }
-
-      setIsDownloading(true);
-      setError(null);
-      setProgress({ item, progress: 0 });
-
-      try {
-        const filename = item.Id;
-        const fileUri = `${FileSystem.documentDirectory}${filename}`;
-        const url = `${api.basePath}/Items/${item.Id}/File`;
-
-        downloadResumableRef.current = FileSystem.createDownloadResumable(
-          url,
-          fileUri,
-          {
-            headers: {
-              Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
-            },
-          },
-          (downloadProgress) => {
-            const currentProgress =
-              downloadProgress.totalBytesWritten /
-              downloadProgress.totalBytesExpectedToWrite;
-            setProgress({ item, progress: currentProgress * 100 });
-          },
-        );
-
-        const res = await downloadResumableRef.current.downloadAsync();
-
-        if (!res?.uri) {
-          throw new Error("Download failed: No URI returned");
-        }
-
-        await updateDownloadedFiles(item);
-
-        setIsDownloading(false);
-        setProgress(null);
-        return true;
-      } catch (error) {
-        console.error("Error downloading media:", error);
-        setError("Failed to download media");
-        setIsDownloading(false);
-        setProgress(null);
-        return false;
-      }
-    },
-    [api, userId, setProgress],
-  );
-
-  const cancelDownload = useCallback(async (): Promise<void> => {
-    if (!downloadResumableRef.current) return;
-
-    try {
-      await downloadResumableRef.current.pauseAsync();
-      setIsDownloading(false);
-      setError("Download cancelled");
-      setProgress(null);
-      downloadResumableRef.current = null;
-    } catch (error) {
-      console.error("Error cancelling download:", error);
-      setError("Failed to cancel download");
-    }
-  }, [setProgress]);
-
-  return { downloadMedia, isDownloading, error, cancelDownload };
-};
-
-/**
- * Updates the list of downloaded files in AsyncStorage.
- *
- * @param item - The item to add to the downloaded files list
- */
-async function updateDownloadedFiles(item: BaseItemDto): Promise<void> {
-  try {
-    const currentFiles: BaseItemDto[] = JSON.parse(
-      (await AsyncStorage.getItem("downloaded_files")) ?? "[]",
-    );
-    const updatedFiles = [
-      ...currentFiles.filter((file) => file.Id !== item.Id),
-      item,
-    ];
-    await AsyncStorage.setItem(
-      "downloaded_files",
-      JSON.stringify(updatedFiles),
-    );
-  } catch (error) {
-    console.error("Error updating downloaded files:", error);
-  }
-}
--- a/hooks/useFiles.ts
+++ b/hooks/useFiles.ts
@@ -1,84 +0,0 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useQueryClient } from "@tanstack/react-query";
-import * as FileSystem from "expo-file-system";
-
-/**
- * Custom hook for managing downloaded files.
- * @returns An object with functions to delete individual files and all files.
- */
-export const useFiles = () => {
-  const queryClient = useQueryClient();
-
-  /**
-   * Deletes all downloaded files and clears the download record.
-   */
-  const deleteAllFiles = async (): Promise<void> => {
-    const directoryUri = FileSystem.documentDirectory;
-    if (!directoryUri) {
-      console.error("Document directory is undefined");
-      return;
-    }
-
-    try {
-      const fileNames = await FileSystem.readDirectoryAsync(directoryUri);
-      await Promise.all(
-        fileNames.map((item) =>
-          FileSystem.deleteAsync(`${directoryUri}/${item}`, {
-            idempotent: true,
-          }),
-        ),
-      );
-      await AsyncStorage.removeItem("downloaded_files");
-      queryClient.invalidateQueries({ queryKey: ["downloaded_files"] });
-    } catch (error) {
-      console.error("Failed to delete all files:", error);
-    }
-  };
-
-  /**
-   * Deletes a specific file and updates the download record.
-   * @param id - The ID of the file to delete.
-   */
-  const deleteFile = async (id: string): Promise<void> => {
-    if (!id) {
-      console.error("Invalid file ID");
-      return;
-    }
-
-    try {
-      await FileSystem.deleteAsync(
-        `${FileSystem.documentDirectory}/${id}.mp4`,
-        { idempotent: true },
-      );
-
-      const currentFiles = await getDownloadedFiles();
-      const updatedFiles = currentFiles.filter((f) => f.Id !== id);
-
-      await AsyncStorage.setItem(
-        "downloaded_files",
-        JSON.stringify(updatedFiles),
-      );
-
-      queryClient.invalidateQueries({ queryKey: ["downloaded_files"] });
-    } catch (error) {
-      console.error(`Failed to delete file with ID ${id}:`, error);
-    }
-  };
-
-  return { deleteFile, deleteAllFiles };
-};
-
-/**
- * Retrieves the list of downloaded files from AsyncStorage.
- * @returns An array of BaseItemDto objects representing downloaded files.
- */
-async function getDownloadedFiles(): Promise<BaseItemDto[]> {
-  try {
-    const filesJson = await AsyncStorage.getItem("downloaded_files");
-    return filesJson ? JSON.parse(filesJson) : [];
-  } catch (error) {
-    console.error("Failed to retrieve downloaded files:", error);
-    return [];
-  }
-}
--- a/hooks/useRemuxHlsToMp4.ts
+++ b/hooks/useRemuxHlsToMp4.ts
@@ -1,138 +0,0 @@
-import { useCallback } from "react";
-import { useAtom } from "jotai";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import * as FileSystem from "expo-file-system";
-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";
-
-/**
- * Custom hook for remuxing HLS to MP4 using FFmpeg.
- *
- * @param url - The URL of the HLS stream
- * @param item - The BaseItemDto object representing the media item
- * @returns An object with remuxing-related functions
- */
-export const useRemuxHlsToMp4 = (url: string, item: BaseItemDto) => {
-  const [_, setProgress] = useAtom(runningProcesses);
-
-  if (!item.Id || !item.Name) {
-    writeToLog("ERROR", "useRemuxHlsToMp4 ~ missing arguments");
-    throw new Error("Item must have an Id and Name");
-  }
-
-  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}`,
-    );
-
-    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}`,
-      );
-      setProgress(null);
-      throw error; // Re-throw the error to propagate it to the caller
-    }
-  }, [output, item, command, setProgress]);
-
-  const cancelRemuxing = useCallback(() => {
-    FFmpegKit.cancel();
-    setProgress(null);
-    writeToLog(
-      "INFO",
-      `useRemuxHlsToMp4 ~ remuxing cancelled for item: ${item.Name}`,
-    );
-  }, [item.Name, setProgress]);
-
-  return { startRemuxing, cancelRemuxing };
-};
-
-/**
- * Updates the list of downloaded files in AsyncStorage.
- *
- * @param item - The item to add to the downloaded files list
- */
-async function updateDownloadedFiles(item: BaseItemDto): Promise<void> {
-  try {
-    const currentFiles: BaseItemDto[] = JSON.parse(
-      (await AsyncStorage.getItem("downloaded_files")) || "[]",
-    );
-    const updatedFiles = [
-      ...currentFiles.filter((i) => i.Id !== item.Id),
-      item,
-    ];
-    await AsyncStorage.setItem(
-      "downloaded_files",
-      JSON.stringify(updatedFiles),
-    );
-  } catch (error) {
-    console.error("Error updating downloaded files:", error);
-    writeToLog(
-      "ERROR",
-      `Failed to update downloaded files for item: ${item.Name}`,
-    );
-  }
-}
--- a/package.json
+++ b/package.json
@@ -15,15 +15,14 @@
    "preset": "jest-expo"
  },
  "dependencies": {
-    "@config-plugins/ffmpeg-kit-react-native": "^8.0.0",
    "@expo/react-native-action-sheet": "^4.1.0",
    "@expo/vector-icons": "^14.0.2",
    "@gorhom/bottom-sheet": "^4",
    "@jellyfin/sdk": "^0.10.0",
    "@kesha-antonov/react-native-background-downloader": "^3.2.0",
-    "@react-native-async-storage/async-storage": "1.23.1",
    "@react-native-community/netinfo": "11.3.1",
    "@react-native-menu/menu": "^1.1.2",
+    "@react-native-tvos/config-tv": "^0.0.10",
    "@react-navigation/native": "^6.0.2",
    "@shopify/flash-list": "1.6.4",
    "@tanstack/react-query": "^5.51.16",
@@ -37,33 +36,27 @@
    "expo-dev-client": "~4.0.23",
    "expo-device": "~6.0.2",
    "expo-font": "~12.0.9",
-    "expo-haptics": "~13.0.1",
-    "expo-image": "~1.12.14",
+    "expo-image": "~1.12.13",
    "expo-keep-awake": "~13.0.2",
    "expo-linking": "~6.3.1",
    "expo-navigation-bar": "~3.0.7",
    "expo-router": "~3.5.23",
-    "expo-screen-orientation": "~7.0.5",
-    "expo-sensors": "~13.0.9",
    "expo-splash-screen": "~0.27.5",
    "expo-status-bar": "~1.12.1",
    "expo-system-ui": "~3.0.7",
    "expo-updates": "~0.25.22",
    "expo-web-browser": "~13.0.3",
-    "ffmpeg-kit-react-native": "^6.0.2",
    "jotai": "^2.9.1",
    "lodash": "^4.17.21",
    "nativewind": "^2.0.11",
    "react": "18.2.0",
    "react-dom": "18.2.0",
-    "react-native": "0.74.5",
+    "react-native": "npm:react-native-tvos@latest",
    "react-native-circular-progress": "^1.4.0",
    "react-native-compressor": "^1.8.25",
    "react-native-gesture-handler": "~2.16.1",
    "react-native-get-random-values": "^1.11.0",
-    "react-native-google-cast": "^4.8.2",
-    "react-native-ios-context-menu": "^2.5.1",
-    "react-native-ios-utilities": "^4.4.5",
+    "react-native-ios-utilities": "^4.5.0",
    "react-native-reanimated": "~3.10.1",
    "react-native-reanimated-carousel": "4.0.0-alpha.12",
    "react-native-safe-area-context": "4.10.5",
@@ -76,7 +69,6 @@
    "tailwindcss": "3.3.2",
    "use-debounce": "^10.0.3",
    "uuid": "^10.0.0",
-    "zeego": "^1.10.0",
    "zod": "^3.23.8"
  },
  "devDependencies": {
@@ -85,9 +77,16 @@
    "@types/react": "~18.2.45",
    "@types/react-test-renderer": "^18.0.7",
    "jest": "^29.2.1",
-    "jest-expo": "~51.0.4",
+    "jest-expo": "~51.0.3",
    "react-test-renderer": "18.2.0",
    "typescript": "~5.3.3"
  },
+  "expo": {
+    "install": {
+      "exclude": [
+        "react-native"
+      ]
+    }
+  },
  "private": true
 }
--- a/providers/JellyfinProvider.tsx
+++ b/providers/JellyfinProvider.tsx
@@ -1,13 +1,6 @@
-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 axios from "axios";
+import { useMutation } from "@tanstack/react-query";
 import { router, useSegments } from "expo-router";
 import { atom, useAtom } from "jotai";
 import React, {
@@ -26,7 +19,6 @@ 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[]>;
@@ -41,11 +33,10 @@ const JellyfinContext = createContext<JellyfinContextValue | undefined>(
 );

 const getOrSetDeviceId = async () => {
-  let deviceId = await AsyncStorage.getItem("deviceId");
+  let deviceId = null;

  if (!deviceId) {
    deviceId = uuid.v4() as string;
-    await AsyncStorage.setItem("deviceId", deviceId);
  }

  return deviceId;
@@ -55,8 +46,6 @@ 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 () => {
@@ -64,11 +53,10 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      setJellyfin(
        () =>
          new Jellyfin({
-            clientInfo: { name: "Streamyfin", version: "0.7.0" },
+            clientInfo: { name: "Streamyfin", version: "0.6.1" },
            deviceInfo: { name: Platform.OS === "ios" ? "iOS" : "Android", id },
          })
      );
-      setDeviceId(id);
    })();
  }, []);

@@ -89,7 +77,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
      if (!apiInstance?.basePath) throw new Error("Failed to connect");

      setApi(apiInstance);
-      await AsyncStorage.setItem("serverUrl", server.address);
    },
    onError: (error) => {
      console.error("Failed to set server:", error);
@@ -98,7 +85,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({

  const removeServerMutation = useMutation({
    mutationFn: async () => {
-      await AsyncStorage.removeItem("serverUrl");
      setApi(null);
    },
    onError: (error) => {
@@ -116,40 +102,13 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    }) => {
      if (!api || !jellyfin) throw new Error("API not initialized");

-      try {
-        const auth = await api.authenticateUserByName(username, password);
+      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);
-        }
-      } 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;
+      if (auth.data.AccessToken && auth.data.User) {
+        setUser(auth.data.User);
+        setApi(jellyfin.createApi(api?.basePath, auth.data?.AccessToken));
+      } else {
+        throw new Error("Invalid username or password");
      }
    },
    onError: (error) => {
@@ -159,7 +118,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({

  const logoutMutation = useMutation({
    mutationFn: async () => {
-      await AsyncStorage.removeItem("token");
      setUser(null);
    },
    onError: (error) => {
@@ -167,36 +125,6 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    },
  });

-  const { isLoading, isFetching } = useQuery({
-    queryKey: [
-      "initializeJellyfin",
-      user?.Id,
-      api?.basePath,
-      jellyfin?.clientInfo,
-    ],
-    queryFn: async () => {
-      try {
-        const token = await AsyncStorage.getItem("token");
-        const serverUrl = await AsyncStorage.getItem("serverUrl");
-        const user = JSON.parse(
-          (await AsyncStorage.getItem("user")) as string
-        ) as UserDto;
-
-        if (serverUrl && token && user.Id && jellyfin) {
-          const apiInstance = jellyfin.createApi(serverUrl, token);
-          setApi(apiInstance);
-          setUser(user);
-        }
-
-        return true;
-      } catch (e) {
-        console.error(e);
-      }
-    },
-    staleTime: 0,
-    enabled: !user?.Id || !api || !jellyfin,
-  });
-
  const contextValue: JellyfinContextValue = {
    discoverServers,
    setServer: (server) => setServerMutation.mutateAsync(server),
@@ -206,7 +134,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
    logout: () => logoutMutation.mutateAsync(),
  };

-  useProtectedRoute(user, isLoading || isFetching);
+  useProtectedRoute(user);

  return (
    <JellyfinContext.Provider value={contextValue}>
--- a/providers/JobQueueProvider.tsx
+++ b/providers/JobQueueProvider.tsx
@@ -1,14 +0,0 @@
-import React, { createContext } from "react";
-import { useJobProcessor } from "@/utils/atoms/queue";
-
-const JobQueueContext = createContext(null);
-
-export const JobQueueProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
-  useJobProcessor();
-
-  return (
-    <JobQueueContext.Provider value={null}>{children}</JobQueueContext.Provider>
-  );
-};
--- a/providers/PlaybackProvider.tsx
+++ b/providers/PlaybackProvider.tsx
@@ -1,281 +0,0 @@
-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 || !user) 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
@@ -5,9 +5,8 @@ import {
  SortOrder,
 } from "@jellyfin/sdk/lib/generated-client/models";
 import { atom, useAtom } from "jotai";
-import { atomWithStorage } from "jotai/utils";

-export const sortByOptions: {
+export const sortOptions: {
  key: ItemSortBy;
  value: string;
 }[] = [
@@ -39,111 +38,10 @@ export const sortOrderOptions: {
  { key: "Descending", value: "Descending" },
 ];

-// Define the keys for our preferences
-type PreferenceKey =
-  | "genreFilter"
-  | "tagsFilter"
-  | "yearFilter"
-  | "sortBy"
-  | "sortOrder";
-
-// Define the type for a single collection's preferences
-type CollectionPreference = {
-  genreFilter: string[];
-  tagsFilter: string[];
-  yearFilter: string[];
-  sortBy: [typeof sortByOptions][number];
-  sortOrder: [typeof sortOrderOptions][number];
-};
-
-// Define the type for all sort preferences
-type SortPreference = {
-  [collectionId: string]: CollectionPreference;
-};
-
-// Create a base atom with storage
-const baseSortPreferenceAtom = atomWithStorage<SortPreference>(
-  "sortPreferences",
-  {}
-);
-
-// Create a derived atom with logging
-export const sortPreferenceAtom = atom(
-  (get) => {
-    const value = get(baseSortPreferenceAtom);
-    console.log("Getting sortPreferences:", value);
-    return value;
-  },
-  (get, set, newValue: SortPreference) => {
-    console.log("Setting sortPreferences:", newValue);
-    set(baseSortPreferenceAtom, newValue);
-  }
-);
-
-export const currentCollectionIdAtom = atomWithStorage<string | null>(
-  "currentCollectionId",
-  null
-);
-
-// Helper function to create an atom with custom getter and setter
-const createFilterAtom = <T extends CollectionPreference[PreferenceKey]>(
-  key: PreferenceKey,
-  initialValue: T
-) => {
-  const baseAtom = atom<T>(initialValue);
-
-  return atom(
-    (get): T => {
-      const preferences = get(sortPreferenceAtom);
-      const currentCollectionId = get(currentCollectionIdAtom);
-      if (currentCollectionId && preferences[currentCollectionId]) {
-        const preferenceValue = preferences[currentCollectionId][key];
-
-        // Ensure the returned value matches the expected type T
-        if (Array.isArray(initialValue) && Array.isArray(preferenceValue)) {
-          return preferenceValue as T;
-        } else if (
-          typeof initialValue === "object" &&
-          typeof preferenceValue === "object"
-        ) {
-          return preferenceValue as T;
-        } else if (typeof initialValue === typeof preferenceValue) {
-          return preferenceValue as T;
-        }
-      }
-      return get(baseAtom);
-    },
-    (get, set, newValue: T, collectionId: string) => {
-      set(baseAtom, newValue);
-      const preferences = get(sortPreferenceAtom);
-      console.log("Set", preferences);
-      set(sortPreferenceAtom, {
-        ...preferences,
-        [collectionId]: {
-          ...preferences[collectionId],
-          [key]: newValue,
-        },
-      });
-    }
-  );
-};
-
-type SortByOption = ItemSortBy | { key: ItemSortBy; value: string };
-type SortOrderOption = SortOrder | { key: SortOrder; value: string };
-
-function getSortKey(
-  option: SortByOption | SortOrderOption
-): ItemSortBy | SortOrder {
-  return typeof option === "string" ? option : option.key;
-}
-
-export const genreFilterAtom = createFilterAtom<string[]>("genreFilter", []);
-export const tagsFilterAtom = createFilterAtom<string[]>("tagsFilter", []);
-export const yearFilterAtom = createFilterAtom<string[]>("yearFilter", []);
-export const sortByAtom = createFilterAtom<[typeof sortByOptions][number]>(
-  "sortBy",
-  [sortByOptions[0]]
-);
-export const sortOrderAtom = createFilterAtom<
-  [typeof sortOrderOptions][number]
->("sortOrder", [sortOrderOptions[0]]);
+export const genreFilterAtom = atom<string[]>([]);
+export const tagsFilterAtom = atom<string[]>([]);
+export const yearFilterAtom = atom<string[]>([]);
+export const sortByAtom = atom<[typeof sortOptions][number]>([sortOptions[0]]);
+export const sortOrderAtom = atom<[typeof sortOrderOptions][number]>([
+  sortOrderOptions[0],
+]);
--- a/utils/atoms/playState.ts
+++ b/utils/atoms/playState.ts
@@ -1,10 +0,0 @@
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { atom } from "jotai";
-
-export const playingAtom = atom(false);
-export const fullScreenAtom = atom(false);
-export const showCurrentlyPlayingBarAtom = atom(false);
-export const currentlyPlayingItemAtom = atom<{
-  item: BaseItemDto;
-  playbackUrl: string;
-} | null>(null);
--- a/utils/atoms/settings.ts
+++ b/utils/atoms/settings.ts
@@ -1,6 +1,4 @@
 import { atom, useAtom } from "jotai";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useEffect } from "react";

 type Settings = {
  autoRotate?: boolean;
@@ -10,63 +8,29 @@ type Settings = {
  deviceProfile?: "Expo" | "Native" | "Old";
  forceDirectPlay?: boolean;
  mediaListCollectionIds?: string[];
-  searchEngine: "Marlin" | "Jellyfin";
-  marlinServerUrl?: string;
-  openInVLC?: boolean;
 };

-/**
- *
- * The settings atom is a Jotai atom that stores the user's settings.
- * It is initialized with a default value of null, which indicates that the settings have not been loaded yet.
- * The settings are loaded from AsyncStorage when the atom is read for the first time.
- *
- */
-
-// 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: [],
-        searchEngine: "Jellyfin",
-        marlinServerUrl: "",
-        openInVLC: false,
-      };
+// Default settings
+const defaultSettings: Settings = {
+  autoRotate: true,
+  forceLandscapeInVideoPlayer: false,
+  openFullScreenVideoPlayerByDefault: true,
+  usePopularPlugin: false,
+  deviceProfile: "Expo",
+  forceDirectPlay: false,
+  mediaListCollectionIds: [],
 };

-// Utility function to save settings to AsyncStorage
-const saveSettings = async (settings: Settings) => {
-  const jsonValue = JSON.stringify(settings);
-  await AsyncStorage.setItem("settings", jsonValue);
-};
+// Create an atom to store the settings in memory, initialized with default settings
+const settingsAtom = atom<Settings>(defaultSettings);

-// Create an atom to store the settings in memory
-const settingsAtom = atom<Settings | null>(null);
-
-// A hook to manage settings, loading them on initial mount and providing a way to update them
+// A hook to manage settings, providing a way to update them
 export const useSettings = () => {
  const [settings, setSettings] = useAtom(settingsAtom);

-  useEffect(() => {
-    if (settings === null) {
-      loadSettings().then(setSettings);
-    }
-  }, [settings, setSettings]);
-
-  const updateSettings = async (update: Partial<Settings>) => {
-    if (settings) {
-      const newSettings = { ...settings, ...update };
-      setSettings(newSettings);
-      await saveSettings(newSettings);
-    }
+  const updateSettings = (update: Partial<Settings>) => {
+    const newSettings = { ...settings, ...update };
+    setSettings(newSettings);
  };

  return [settings, updateSettings] as const;
--- a/utils/device.ts
+++ b/utils/device.ts
@@ -1,19 +0,0 @@
-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,13 +1,12 @@
 import { Api } from "@jellyfin/sdk";
+import { AxiosError } from "axios";
 import { getAuthHeaders } from "../jellyfin";
-import { postCapabilities } from "../session/capabilities";

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

 /**
@@ -21,44 +20,25 @@ export const reportPlaybackProgress = async ({
  sessionId,
  itemId,
  positionTicks,
-  IsPaused = false,
 }: ReportPlaybackProgressParams): Promise<void> => {
-  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.");
-  }
-
+  console.info(
+    "Reporting playback progress:",
+    sessionId,
+    itemId,
+    positionTicks,
+  );
  try {
    await api.axiosInstance.post(
      `${api.basePath}/Sessions/Playing/Progress`,
      {
        ItemId: itemId,
        PlaySessionId: sessionId,
-        IsPaused,
+        IsPaused: false,
        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,15 +41,12 @@ 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,
-      IsPaused: true,
+      mediaSourceId: itemId,
    };
    const headers = getAuthHeaders(api);

@@ -61,7 +58,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
@@ -1,48 +0,0 @@
-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");
-  }
-};
--- a/utils/log.ts
+++ b/utils/log.ts
@@ -1,4 +1,4 @@
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import { atom } from "jotai";
 import { atomWithStorage, createJSONStorage } from "jotai/utils";

 type LogLevel = "INFO" | "WARN" | "ERROR";
@@ -10,8 +10,7 @@ interface LogEntry {
  data?: any;
 }

-const asyncStorage = createJSONStorage(() => AsyncStorage);
-const logsAtom = atomWithStorage("logs", [], asyncStorage);
+const logsAtom = atom([]);

 export const writeToLog = async (
  level: LogLevel,
@@ -25,23 +24,16 @@ export const writeToLog = async (
    data: data,
  };

-  const currentLogs = await AsyncStorage.getItem("logs");
-  const logs: LogEntry[] = currentLogs ? JSON.parse(currentLogs) : [];
+  const logs: LogEntry[] = [];
  logs.push(newEntry);

  const maxLogs = 100;
-  const recentLogs = logs.slice(Math.max(logs.length - maxLogs, 0));
-
-  await AsyncStorage.setItem("logs", JSON.stringify(recentLogs));
 };

 export const readFromLog = async (): Promise<LogEntry[]> => {
-  const logs = await AsyncStorage.getItem("logs");
-  return logs ? JSON.parse(logs) : [];
+  return [];
 };

-export const clearLogs = async () => {
-  await AsyncStorage.removeItem("logs");
-};
+export const clearLogs = async () => {};

 export default logsAtom;
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Fredrik Burmester	ca7fd382f2	wip	2024-08-18 13:30:12 +02:00
Fredrik Burmester	d8201aa1fc	wip	2024-08-18 13:07:08 +02:00
Fredrik Burmester	dec45056f3	wip	2024-08-18 11:53:40 +02:00
Fredrik Burmester	1d41b7080f	wip	2024-08-18 11:46:31 +02:00
Fredrik Burmester	83a09ad74a	wip	2024-08-18 11:33:26 +02:00
Fredrik Burmester	65ac147441	wip	2024-08-18 11:12:40 +02:00
Fredrik Burmester	6a070cfbe0	wip	2024-08-18 11:07:32 +02:00
Fredrik Burmester	9d1a03a5f2	wip	2024-08-18 11:06:31 +02:00
Fredrik Burmester	08b28f7599	wip	2024-08-18 10:54:50 +02:00