wip

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone15Pro]
+ - OS: [e.g. iOS18]
+ - Version [e.g. 0.3.1]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,59 +0,0 @@
-name: Bug report
-description: Create a report to help us improve
-title: "[Bug]: "
-labels:
-  - ["❌ bug"]
-projects:
-  - ["streamyfin/3"]
-
-body:
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: A clear and concise description of what the bug is.
-    validations:
-      required: true
-
-  - type: textarea
-    id: repro
-    attributes:
-      label: Reproduction steps
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      placeholder: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: device
-    attributes:
-      label: Which device and operating system are you using?
-      description: e.g. iPhone 15, iOS 18.1.1
-    validations:
-      required: true
-
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of Streamyfin are you running?
-      options:
-        - 0.25.0
-        - 0.24.0
-        - 0.23.0
-        - 0.22.0
-        - 0.21.0
-        - older
-    validations:
-      required: true
-
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: If applicable, please add screenshots to help explain your problem.
-        You can drag and drop images here or paste them directly into the comment box.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,10 +2,9 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: '✨ enhancement'
+labels: ''
 assignees: ''
-projects:
+
- - streamyfin/3
 ---
 
 **Describe the solution you'd like**

.github/workflows/build-ios.yaml

@@ -1,49 +0,0 @@
-name: Automatic Build and Deploy
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: macos-15
-    name: Build IOS
-    steps:
-      - uses: actions/checkout@v2
-        name: Check out repository
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-      - run: |
-          bun i && bun run submodule-reload
-          npx expo prebuild
-      - uses: sparkfabrik/ios-build-action@v2.3.0
-        with:
-          upload-to-testflight: false
-          increment-build-number: false
-          build-pods: true
-          pods-path: "ios/Podfile"
-          configuration: Release
-          # Change later to app-store if wanted
-          export-method: appstore
-          #export-method: ad-hoc
-          workspace-path: "ios/Streamyfin.xcodeproj/project.xcworkspace/"
-          project-path: "ios/Streamyfin.xcodeproj"
-          scheme: Streamyfin
-          apple-key-id: ${{ secrets.APPLE_KEY_ID }}
-          apple-key-issuer-id: ${{ secrets.APPLE_KEY_ISSUER_ID }}
-          apple-key-content: ${{ secrets.APPLE_KEY_CONTENT }}
-          team-id: ${{ secrets.TEAM_ID }}
-          team-name: ${{ secrets.TEAM_NAME }}
-          #match-password: ${{ secrets.MATCH_PASSWORD }}
-          #match-git-url: ${{ secrets.MATCH_GIT_URL }}
-          #match-git-basic-authorization: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
-          #match-build-type: "appstore"
-          #browserstack-upload: true
-          #browserstack-username: ${{ secrets.BROWSERSTACK_USERNAME }}
-          #browserstack-access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-          #fastlane-env: stage
-          ios-app-id: com.stetsed.teststreamyfin
-          output-path: build-${{ github.sha }}.ipa

.github/workflows/notification.yaml

@@ -1,18 +0,0 @@
-name: Discord Pull Request Notification
-
-on:
-  pull_request:
-    types: [opened, reopened]
-
-jobs:
-  notify:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: joelwmale/webhook-action@master
-        with:
-          url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          body: |
-            {
-              "content": "New Pull Request: ${{ github.event.pull_request.title }}\nBy: ${{ github.event.pull_request.user.login }}\n\n${{ github.event.pull_request.html_url }}",
-              "avatar_url": "https://avatars.githubusercontent.com/u/193271640"
-            }

.gitignore

@@ -9,7 +9,6 @@ npm-debug.*
 *.mobileprovision
 *.orig.*
 web-build/
-modules/vlc-player/android/build
 
 # macOS
 .DS_Store
@@ -27,14 +26,8 @@ package-lock.json
 /ios
 /android
 
-modules/player/android
-
 pc-api-7079014811501811218-719-3b9f15aeccf8.json
 credentials.json
 *.apk
 *.ipa
 .continuerc.json
-
-.vscode/
-.idea/
-.ruby-lsp

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "utils/jellyseerr"]
-	path = utils/jellyseerr
-	url = https://github.com/herrrta/jellyseerr
-	branch = models

.vscode/settings.json

@@ -8,8 +8,5 @@
   "[typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true
-  },
-  "[swift]": {
-    "editor.defaultFormatter": "sswg.swift-lang"
   }
 }

README.md

@@ -8,17 +8,16 @@ Welcome to Streamyfin, a simple and user-friendly Jellyfin client built with Exp
   <img width=150 src="./assets/images/screenshots/screenshot1.png" />
   <img width=150 src="./assets/images/screenshots/screenshot3.png" />
   <img width=150 src="./assets/images/screenshots/screenshot2.png" />
-  <img width=159 src="./assets/images/jellyseerr.PNG"/>
+  
 </div>
 
 ## 🌟 Features
 
-- 🚀 **Skip Intro / Credits Support**
+- 📱 **Native video player**: Playback with the platform native video player. With support for subtitles, playback speed control, and more.
-- 🖼️ **Trickplay images**: The new golden standard for chapter previews when seeking.
+- 📺 **Picture in Picture** (iPhone only): Watch movies in PiP mode on your iPhone.
 - 🔊 **Background audio**: Stream music in the background, even when locking the phone.
 - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
 - 📡 **Chromecast** (Experimental): Cast your media to any Chromecast-enabled device.
-- 🤖 **Jellyseerr integration**: Request media directly in the app.
 
 ## 🧪 Experimental Features
 
@@ -32,17 +31,22 @@ Downloading works by using ffmpeg to convert an HLS stream into a video file on
 
 Chromecast support is still in development, and we're working on improving it. Currently, it supports casting videos and audio, but we're working on adding support for subtitles and other features.
 
-### Streamyfin Plugin
+## Plugins
 
-The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that hold all settings for the client Streamyfin. This allows you to syncronize settings accross all your users, like:
+In Streamyfin we have built-in support for a few plugins. These plugins are not required to use Streamyfin, but they add some extra functionality.
 
-- Auto log in to Jellyseerr without the user having to do anythin
+### Collection rows
-- Choose the default languages 
-- Set download method and search provider
-- Customize homescreen
-- And more...
 
-[Streamyfin Plugin](https://github.com/streamyfin/jellyfin-plugin-streamyfin)
+Jellyfin collections can be shown as rows or carousel on the home screen.
+The following tags can be added to a collection to provide this functionality.
+
+Available tags:
+
+- sf_promoted: will make the collection a row at home
+- sf_carousel: will make the collection a carousel on home.
+
+A plugin exists to create collections based on external sources like mdblist. This make the automatic process of managing collections such as trending, most watched, etc.
+See [Collection Import Plugin](https://github.com/lostb1t/jellyfin-plugin-collection-import) for more info.
 
 ### Jellysearch
 
@@ -57,17 +61,19 @@ Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) to
 ## Get it now
 
 <div style="display: flex; gap: 5px;">
-  <a href="https://apps.apple.com/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://apps.apple.com/se/app/streamyfin/id6593660679?l=en-GB"><img height=50 alt="Get Streamyfin on App Store" src="./assets/Download_on_the_App_Store_Badge.png"/></a>
   <a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin"><img height=50 alt="Get the beta on Google Play" src="./assets/Google_Play_Store_badge_EN.svg"/></a>
 </div>
 
-Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/releases) for Android.
+Or download the APKs [here on GitHub](https://github.com/fredrikburmester/streamyfin/releases) for Android.
 
 ### Beta testing
 
-To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This will give you immediate access to the ⁠🧪-public-beta channel on Discord and i'll know that you have subscribed. This is where I post APKs and IPAs. This won't give automatic access to the TestFlight, however, so you need to send me a DM with the email you use for Apple so that i can manually add you.
+Get the latest updates by using the TestFlight version of the app.
 
- **Note**: Everyone who is actively contributing to the source code of Streamyfin will have automatic access to the betas.
+<a href="https://testflight.apple.com/join/CWBaAAK2">
+  <img height=75 alt="Get the beta on TestFlight" src="./assets/Get_the_beta_on_Testflight.svg"/>
+</a>
 
 ## 🚀 Getting Started
 
@@ -82,10 +88,36 @@ We welcome any help to make Streamyfin better. If you'd like to contribute, plea
 
 ### Development info
 
-1. Use node `>20`
+1. Use node `20`
-2. Install dependencies `bun i && bun run submodule-reload`
+2. Install dependencies `bun i`
-3. Make sure you have xcode and/or android studio installed.
+3. Create an expo dev build by running `npx expo run:ios` or `npx expo run:android`.
-4. Create an expo dev build by running `npx expo run:ios` or `npx expo run:android`. This will open a simulator on your computer and run the app.
+
+## Extended chromecast controls
+
+Add this to AppDelegate.mm:
+
+```
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+// @generated begin react-native-google-cast-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-8901be60b982d2ae9c658b1e8c50634d61bb5091
+#if __has_include(<GoogleCast/GoogleCast.h>)
+...
+
+[GCKCastContext sharedInstance].useDefaultExpandedMediaControls = true;`
+#endif
+```
+
+Add this to Info.plist:
+
+```
+<key>NSBonjourServices</key>
+<array>
+  <string>_googlecast._tcp</string>
+  <string>_CC1AD845._googlecast._tcp</string>
+</array>
+<key>NSLocalNetworkUsageDescription</key>
+<string>${PRODUCT_NAME} uses the local network to discover Cast-enabled devices on your WiFi network.</string>
+```
 
 ## 📄 License
 
@@ -103,7 +135,7 @@ Key points of the MPL-2.0:
 
 ## 🌐 Connect with Us
 
-Join our Discord: [https://discord.gg/aJvAYeycyY](https://discord.gg/aJvAYeycyY)
+Join our Discord: [https://discord.gg/zyGKHJZvv4](https://discord.gg/aJvAYeycyY)
 
 If you have questions or need support, feel free to reach out:
 
@@ -112,7 +144,7 @@ If you have questions or need support, feel free to reach out:
 
 ## 📝 Credits
 
-Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmester) and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.
+Streamyfin is developed by Fredrik Burmester and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.
 
 ## ✨ Acknowledgements
 
@@ -120,9 +152,4 @@ I'd like to thank the following people and projects for their contributions to S
 
 - [Reiverr](https://github.com/aleksilassila/reiverr) for great help with understanding the Jellyfin API.
 - [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for the TypeScript SDK.
-- [Jellyseerr](https://github.com/Fallenbagel/jellyseerr) for enabling API integration with their project.
 - The Jellyfin devs for always being helpful in the Discord.
-
-## Star History
-
-[![Star History Chart](https://api.star-history.com/svg?repos=streamyfin/streamyfin&type=Date)](https://star-history.com/#streamyfin/streamyfin&Date)

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.25.0",
+    "version": "0.12.0",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
@@ -10,7 +10,7 @@
     "splash": {
       "image": "./assets/images/splash.png",
       "resizeMode": "contain",
-      "backgroundColor": "#2E2E2E"
+      "backgroundColor": "#29164B"
     },
     "jsEngine": "hermes",
     "assetBundlePatterns": ["**/*"],
@@ -19,14 +19,11 @@
       "infoPlist": {
         "NSCameraUsageDescription": "The app needs access to your camera to scan barcodes.",
         "NSMicrophoneUsageDescription": "The app needs access to your microphone.",
-        "UIBackgroundModes": ["audio", "fetch"],
+        "UIBackgroundModes": ["audio"],
         "NSLocalNetworkUsageDescription": "The app needs access to your local network to connect to your Jellyfin server.",
         "NSAppTransportSecurity": {
           "NSAllowsArbitraryLoads": true
-        },
+        }
-        "UISupportsTrueScreenSizeOnMac": true,
-        "UIFileSharingEnabled": true,
-        "LSSupportsOpeningDocumentsInPlace": true
       },
       "config": {
         "usesNonExemptEncryption": false
@@ -36,17 +33,21 @@
     },
     "android": {
       "jsEngine": "hermes",
-      "versionCode": 50,
+      "versionCode": 36,
       "adaptiveIcon": {
-        "foregroundImage": "./assets/images/adaptive_icon.png"
+        "foregroundImage": "./assets/images/icon.png"
       },
       "package": "com.fredrikburmester.streamyfin",
       "permissions": [
         "android.permission.FOREGROUND_SERVICE",
-        "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK",
+        "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"
-        "android.permission.WRITE_SETTINGS"
       ]
     },
+    "web": {
+      "bundler": "metro",
+      "output": "static",
+      "favicon": "./assets/images/favicon.png"
+    },
     "plugins": [
       "expo-router",
       "expo-font",
@@ -70,12 +71,18 @@
           }
         }
       ],
+      [
+        "./plugins/withAndroidMainActivityAttributes",
+        {
+          "com.reactnative.googlecast.RNGCExpandedControllerActivity": true
+        }
+      ],
+      ["./plugins/withExpandedController.js"],
       [
         "expo-build-properties",
         {
           "ios": {
-            "deploymentTarget": "15.6",
+            "deploymentTarget": "14.0"
-            "useFrameworks": "static"
           },
           "android": {
             "android": {
@@ -104,17 +111,7 @@
         {
           "motionPermission": "Allow Streamyfin to access your device motion for landscape video watching."
         }
-      ],
+      ]
-      "expo-localization",
-      "expo-asset",
-      [
-        "react-native-edge-to-edge",
-        { "android": { "parentTheme": "Material3" } }
-      ],
-      ["react-native-bottom-tabs"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withGoogleCastActivity.js"],
-      ["./plugins/withTrustLocalCerts.js"]
     ],
     "experiments": {
       "typedRoutes": true

app/(auth)/(tabs)/(custom-links)/_layout.tsx

@@ -1,22 +0,0 @@
-import {Stack} from "expo-router";
-import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";
-
-export default function CustomMenuLayout() {
-  const { t } = useTranslation();
-  return (
-    <Stack>
-      <Stack.Screen
-        name="index"
-        options={{
-          headerShown: true,
-          headerLargeTitle: true,
-          headerTitle: t("tabs.custom_links"),
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios",
-          headerShadowVisible: false,
-        }}
-      />
-    </Stack>
-  );
-}

app/(auth)/(tabs)/(custom-links)/index.tsx

@@ -1,77 +0,0 @@
-import { FlatList, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import React, { useCallback, useEffect, useState } from "react";
-import { useAtom } from "jotai/index";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { ListItem } from "@/components/list/ListItem";
-import * as WebBrowser from "expo-web-browser";
-import Ionicons from "@expo/vector-icons/Ionicons";
-import { Text } from "@/components/common/Text";
-import { useTranslation } from "react-i18next";
-
-export interface MenuLink {
-  name: string;
-  url: string;
-  icon: string;
-}
-
-export default function menuLinks() {
-  const [api] = useAtom(apiAtom);
-  const insets = useSafeAreaInsets();
-  const [menuLinks, setMenuLinks] = useState<MenuLink[]>([]);
-  const { t } = useTranslation();
-
-  const getMenuLinks = useCallback(async () => {
-    try {
-      const response = await api?.axiosInstance.get(
-        api?.basePath + "/web/config.json"
-      );
-      const config = response?.data;
-
-      if (!config && !config.hasOwnProperty("menuLinks")) {
-        console.error("Menu links not found");
-        return;
-      }
-
-      setMenuLinks(config?.menuLinks as MenuLink[]);
-    } catch (error) {
-      console.error("Failed to retrieve config:", error);
-    }
-  }, [api]);
-
-  useEffect(() => {
-    getMenuLinks();
-  }, []);
-  return (
-    <FlatList
-      contentInsetAdjustmentBehavior="automatic"
-      contentContainerStyle={{
-        paddingTop: 10,
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-      data={menuLinks}
-      renderItem={({ item }) => (
-        <TouchableOpacity onPress={() => WebBrowser.openBrowserAsync(item.url)}>
-          <ListItem
-            title={item.name}
-            iconAfter={<Ionicons name="link" size={24} color="white" />}
-          />
-        </TouchableOpacity>
-      )}
-      ItemSeparatorComponent={() => (
-        <View
-          style={{
-            width: 10,
-            height: 10,
-          }}
-        />
-      )}
-      ListEmptyComponent={
-        <View className="flex flex-col items-center justify-center h-full">
-          <Text className="font-bold text-xl text-neutral-500">{t("custom_links.no_links")}</Text>
-        </View>
-      }
-    />
-  );
-}

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

@@ -1,29 +0,0 @@
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { Stack } from "expo-router";
-import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";
-
-export default function SearchLayout() {
-  const { t } = useTranslation();
-  return (
-    <Stack>
-      <Stack.Screen
-        name="index"
-        options={{
-          headerShown: true,
-          headerLargeTitle: true,
-          headerTitle: t("tabs.favorites"),
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
-      {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
-        <Stack.Screen key={name} name={name} options={options} />
-      ))}
-    </Stack>
-  );
-}

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

@@ -1,36 +0,0 @@
-import { Favorites } from "@/components/home/Favorites";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import React, { useCallback, useState } from "react";
-import { RefreshControl, ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-export default function favorites() {
-  const invalidateCache = useInvalidatePlaybackProgressCache();
-
-  const [loading, setLoading] = useState(false);
-  const refetch = useCallback(async () => {
-    setLoading(true);
-    await invalidateCache();
-    setLoading(false);
-  }, []);
-  const insets = useSafeAreaInsets();
-
-  return (
-    <ScrollView
-      nestedScrollEnabled
-      contentInsetAdjustmentBehavior="automatic"
-      refreshControl={
-        <RefreshControl refreshing={loading} onRefresh={refetch} />
-      }
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 16,
-      }}
-    >
-      <View className="my-4">
-        <Favorites />
-      </View>
-    </ScrollView>
-  );
-}

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

@@ -1,14 +1,12 @@
 import { Chromecast } from "@/components/Chromecast";
-import { Text } from "@/components/common/Text";
+import { HeaderBackButton } from "@/components/common/HeaderBackButton";
 import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { Feather } from "@expo/vector-icons";
+import { Feather, Ionicons } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { Platform, TouchableOpacity, View } from "react-native";
-import { useTranslation } from "react-i18next";
 
 export default function IndexLayout() {
   const router = useRouter();
-  const { t } = useTranslation();
   return (
     <Stack>
       <Stack.Screen
@@ -16,96 +14,70 @@ export default function IndexLayout() {
         options={{
           headerShown: true,
           headerLargeTitle: true,
-          headerTitle: t("tabs.home"),
+          headerTitle: "Home",
           headerBlurEffect: "prominent",
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
           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">
+              <TouchableOpacity
+                onPress={() => {
+                  router.push("/(auth)/syncplay");
+                }}
+                style={{
+                  marginRight: 8,
+                }}
+              >
+                <Ionicons name="people" color={"white"} size={22} />
+              </TouchableOpacity>
               <Chromecast />
               <TouchableOpacity
                 onPress={() => {
                   router.push("/(auth)/settings");
                 }}
               >
+                <View className="h-10 aspect-square flex items-center justify-center rounded">
                   <Feather name="settings" color={"white"} size={22} />
+                </View>
               </TouchableOpacity>
             </View>
           ),
         }}
       />
       <Stack.Screen
-        name="downloads/index"
+        name="downloads"
         options={{
-          title: t("home.downloads.downloads_title"),
+          title: "Downloads",
-        }}
-      />
-      <Stack.Screen
-        name="downloads/[seriesId]"
-        options={{
-          title: t("home.downloads.tvseries"),
         }}
       />
       <Stack.Screen
         name="settings"
         options={{
-          title: t("home.settings.settings_title"),
+          title: "Settings",
         }}
       />
       <Stack.Screen
-        name="settings/optimized-server/page"
+        name="syncplay"
         options={{
-          title: "",
+          title: "Syncplay",
-        }}
-      />
-      <Stack.Screen
-        name="settings/marlin-search/page"
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name="settings/jellyseerr/page"
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name="settings/hide-libraries/page"
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name="settings/logs/page"
-        options={{
-          title: "",
-        }}
-      />
-      <Stack.Screen
-        name="intro/page"
-        options={{
-          headerShown: false,
-          title: "",
           presentation: "modal",
         }}
       />
       {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
         <Stack.Screen key={name} name={name} options={options} />
       ))}
-      <Stack.Screen
-        name="collections/[collectionId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
     </Stack>
   );
 }

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

@@ -0,0 +1,192 @@
+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";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+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]);
+
+  const insets = useSafeAreaInsets();
+
+  if (isLoading) {
+    return (
+      <View className="h-full flex flex-col items-center justify-center -mt-6">
+        <Loader />
+      </View>
+    );
+  }
+
+  return (
+    <ScrollView
+      contentContainerStyle={{
+        paddingLeft: insets.left,
+        paddingRight: insets.right,
+        paddingBottom: 100,
+      }}
+    >
+      <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/page?id=${q.item.Id}`)
+                  }
+                  className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
+                >
+                  <View>
+                    <Text className="font-semibold">{q.item.Name}</Text>
+                    <Text className="text-xs opacity-50">{q.item.Type}</Text>
+                  </View>
+                  <TouchableOpacity
+                    onPress={() => {
+                      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/page?id=${process.item.Id}`)
+                }
+                className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
+              >
+                <View>
+                  <Text className="font-semibold">{process.item.Name}</Text>
+                  <Text className="text-xs opacity-50">
+                    {process.item.Type}
+                  </Text>
+                  <View className="flex flex-row items-center space-x-2 mt-1 text-purple-600">
+                    <Text className="text-xs">
+                      {process.progress.toFixed(0)}%
+                    </Text>
+                    <Text className="text-xs">
+                      {process.speed?.toFixed(2)}x
+                    </Text>
+                    <View>
+                      <Text className="text-xs">ETA {eta}</Text>
+                    </View>
+                  </View>
+                </View>
+                <TouchableOpacity
+                  onPress={() => {
+                    FFmpegKit.cancel();
+                    setProcess(null);
+                  }}
+                >
+                  <Ionicons name="close" size={24} color="red" />
+                </TouchableOpacity>
+                <View
+                  className={`
+                  absolute bottom-0 left-0 h-1 bg-purple-600
+                `}
+                  style={{
+                    width: process.progress
+                      ? `${Math.max(5, process.progress)}%`
+                      : "5%",
+                  }}
+                ></View>
+              </TouchableOpacity>
+            ) : (
+              <Text className="opacity-50">No active downloads</Text>
+            )}
+          </View>
+        </View>
+        {movies.length > 0 && (
+          <View className="mb-4">
+            <View className="flex flex-row items-center justify-between mb-2">
+              <Text className="text-2xl font-bold">Movies</Text>
+              <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
+                <Text className="text-xs font-bold">{movies?.length}</Text>
+              </View>
+            </View>
+            {movies?.map((item: BaseItemDto) => (
+              <View className="mb-2 last:mb-0" key={item.Id}>
+                <MovieCard item={item} />
+              </View>
+            ))}
+          </View>
+        )}
+        {groupedBySeries?.map((items: BaseItemDto[], index: number) => (
+          <SeriesCard items={items} key={items[0].SeriesId} />
+        ))}
+      </View>
+    </ScrollView>
+  );
+};
+
+export default downloads;
+
+/*
+ * Format a number (Date.getTime) to a human readable string ex. 2m 34s
+ * @param {number} num - The number to format
+ *
+ * @returns {string} - The formatted string
+ */
+const formatNumber = (num: number) => {
+  const minutes = Math.floor(num / 60000);
+  const seconds = ((num % 60000) / 1000).toFixed(0);
+  return `${minutes}m ${seconds}s`;
+};

app/(auth)/(tabs)/(home)/downloads/[seriesId].tsx

@@ -1,132 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { useDownload } from "@/providers/DownloadProvider";
-import { router, useLocalSearchParams, useNavigation } from "expo-router";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { ScrollView, TouchableOpacity, View, Alert } from "react-native";
-import { EpisodeCard } from "@/components/downloads/EpisodeCard";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import {
-  SeasonDropdown,
-  SeasonIndexState,
-} from "@/components/series/SeasonDropdown";
-import { storage } from "@/utils/mmkv";
-import { Ionicons } from "@expo/vector-icons";
-
-export default function page() {
-  const navigation = useNavigation();
-  const local = useLocalSearchParams();
-  const { seriesId, episodeSeasonIndex } = local as {
-    seriesId: string;
-    episodeSeasonIndex: number | string | undefined;
-  };
-
-  const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>(
-    {}
-  );
-  const { downloadedFiles, deleteItems } = useDownload();
-
-  const series = useMemo(() => {
-    try {
-      return (
-        downloadedFiles
-          ?.filter((f) => f.item.SeriesId == seriesId)
-          ?.sort(
-            (a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!
-          ) || []
-      );
-    } catch {
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const seasonIndex =
-    seasonIndexState[series?.[0]?.item?.ParentId ?? ""] ||
-    episodeSeasonIndex ||
-    "";
-
-  const groupBySeason = useMemo<BaseItemDto[]>(() => {
-    const seasons: Record<string, BaseItemDto[]> = {};
-
-    series?.forEach((episode) => {
-      if (!seasons[episode.item.ParentIndexNumber!]) {
-        seasons[episode.item.ParentIndexNumber!] = [];
-      }
-
-      seasons[episode.item.ParentIndexNumber!].push(episode.item);
-    });
-    return (
-      seasons[seasonIndex]?.sort((a, b) => a.IndexNumber! - b.IndexNumber!) ??
-      []
-    );
-  }, [series, seasonIndex]);
-
-  const initialSeasonIndex = useMemo(
-    () =>
-      Object.values(groupBySeason)?.[0]?.ParentIndexNumber ??
-      series?.[0]?.item?.ParentIndexNumber,
-    [groupBySeason]
-  );
-
-  useEffect(() => {
-    if (series.length > 0) {
-      navigation.setOptions({
-        title: series[0].item.SeriesName,
-      });
-    } else {
-      storage.delete(seriesId);
-      router.back();
-    }
-  }, [series]);
-
-  const deleteSeries = useCallback(() => {
-    Alert.alert(
-      "Delete season",
-      "Are you sure you want to delete the entire season?",
-      [
-        {
-          text: "Cancel",
-          style: "cancel",
-        },
-        {
-          text: "Delete",
-          onPress: () => deleteItems(groupBySeason),
-          style: "destructive",
-        },
-      ]
-    );
-  }, [groupBySeason]);
-
-  return (
-    <View className="flex-1">
-      {series.length > 0 && (
-        <View className="flex flex-row items-center justify-start my-2 px-4">
-          <SeasonDropdown
-            item={series[0].item}
-            seasons={series.map((s) => s.item)}
-            state={seasonIndexState}
-            initialSeasonIndex={initialSeasonIndex!}
-            onSelect={(season) => {
-              setSeasonIndexState((prev) => ({
-                ...prev,
-                [series[0].item.ParentId ?? ""]: season.ParentIndexNumber,
-              }));
-            }}
-          />
-          <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center ml-2">
-            <Text className="text-xs font-bold">{groupBySeason.length}</Text>
-          </View>
-          <View className="bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto">
-            <TouchableOpacity onPress={deleteSeries}>
-              <Ionicons name="trash" size={20} color="white" />
-            </TouchableOpacity>
-          </View>
-        </View>
-      )}
-      <ScrollView key={seasonIndex} className="px-4">
-        {groupBySeason.map((episode, index) => (
-          <EpisodeCard key={index} item={episode} />
-        ))}
-      </ScrollView>
-    </View>
-  );
-}

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

@@ -1,253 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ActiveDownloads } from "@/components/downloads/ActiveDownloads";
-import { MovieCard } from "@/components/downloads/MovieCard";
-import { SeriesCard } from "@/components/downloads/SeriesCard";
-import { DownloadedItem, useDownload } from "@/providers/DownloadProvider";
-import { queueAtom } from "@/utils/atoms/queue";
-import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
-import { Ionicons } from "@expo/vector-icons";
-import { useNavigation, useRouter } from "expo-router";
-import { useAtom } from "jotai";
-import React, { useEffect, useMemo, useRef } from "react";
-import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
-import { Button } from "@/components/Button";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
-import { t } from 'i18next';
-import { DownloadSize } from "@/components/downloads/DownloadSize";
-import {
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { toast } from "sonner-native";
-import { writeToLog } from "@/utils/log";
-
-export default function page() {
-  const navigation = useNavigation();
-  const { t } = useTranslation();
-  const [queue, setQueue] = useAtom(queueAtom);
-  const { removeProcess, downloadedFiles, deleteFileByType } = useDownload();
-  const router = useRouter();
-  const [settings] = useSettings();
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const movies = useMemo(() => {
-    try {
-      return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
-    } catch {
-      migration_20241124();
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const groupedBySeries = useMemo(() => {
-    try {
-      const episodes = downloadedFiles?.filter(
-        (f) => f.item.Type === "Episode"
-      );
-      const series: { [key: string]: DownloadedItem[] } = {};
-      episodes?.forEach((e) => {
-        if (!series[e.item.SeriesName!]) series[e.item.SeriesName!] = [];
-        series[e.item.SeriesName!].push(e);
-      });
-      return Object.values(series);
-    } catch {
-      migration_20241124();
-      return [];
-    }
-  }, [downloadedFiles]);
-
-  const insets = useSafeAreaInsets();
-
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () => (
-        <TouchableOpacity onPress={bottomSheetModalRef.current?.present}>
-          <DownloadSize items={downloadedFiles?.map((f) => f.item) || []} />
-        </TouchableOpacity>
-      ),
-    });
-  }, [downloadedFiles]);
-
-  const deleteMovies = () =>
-    deleteFileByType("Movie")
-      .then(() => toast.success(t("home.downloads.toasts.deleted_all_movies_successfully")))
-      .catch((reason) => {
-        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_movies"));
-      });
-  const deleteShows = () =>
-    deleteFileByType("Episode")
-      .then(() => toast.success(t("home.downloads.toasts.deleted_all_tvseries_successfully")))
-      .catch((reason) => {
-        writeToLog("ERROR", reason);
-        toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
-      });
-  const deleteAllMedia = async () =>
-    await Promise.all([deleteMovies(), deleteShows()]);
-
-  return (
-    <>
-      <ScrollView
-        contentContainerStyle={{
-          paddingLeft: insets.left,
-          paddingRight: insets.right,
-          paddingBottom: 100,
-        }}
-      >
-        <View className="py-4">
-          <View className="mb-4 flex flex-col space-y-4 px-4">
-            {settings?.downloadMethod === DownloadMethod.Remux && (
-              <View className="bg-neutral-900 p-4 rounded-2xl">
-                <Text className="text-lg font-bold">{t("home.downloads.queue")}</Text>
-                <Text className="text-xs opacity-70 text-red-600">
-                  {t("home.downloads.queue_hint")}
-                </Text>
-                <View className="flex flex-col space-y-2 mt-2">
-                  {queue.map((q, index) => (
-                    <TouchableOpacity
-                      onPress={() =>
-                        router.push(`/(auth)/items/page?id=${q.item.Id}`)
-                      }
-                      className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
-                      key={index}
-                    >
-                      <View>
-                        <Text className="font-semibold">{q.item.Name}</Text>
-                        <Text className="text-xs opacity-50">
-                          {q.item.Type}
-                        </Text>
-                      </View>
-                      <TouchableOpacity
-                        onPress={() => {
-                          removeProcess(q.id);
-                          setQueue((prev) => {
-                            if (!prev) return [];
-                            return [...prev.filter((i) => i.id !== q.id)];
-                          });
-                        }}
-                      >
-                        <Ionicons name="close" size={24} color="red" />
-                      </TouchableOpacity>
-                    </TouchableOpacity>
-                  ))}
-                </View>
-
-                {queue.length === 0 && (
-                  <Text className="opacity-50">{t("home.downloads.no_items_in_queue")}</Text>
-                )}
-              </View>
-            )}
-
-            <ActiveDownloads />
-          </View>
-
-          {movies.length > 0 && (
-            <View className="mb-4">
-              <View className="flex flex-row items-center justify-between mb-2 px-4">
-                <Text className="text-lg font-bold">{t("home.downloads.movies")}</Text>
-                <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
-                  <Text className="text-xs font-bold">{movies?.length}</Text>
-                </View>
-              </View>
-              <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-                <View className="px-4 flex flex-row">
-                  {movies?.map((item) => (
-                    <View className="mb-2 last:mb-0" key={item.item.Id}>
-                      <MovieCard item={item.item} />
-                    </View>
-                  ))}
-                </View>
-              </ScrollView>
-            </View>
-          )}
-          {groupedBySeries.length > 0 && (
-            <View className="mb-4">
-              <View className="flex flex-row items-center justify-between mb-2 px-4">
-                <Text className="text-lg font-bold">{t("home.downloads.tvseries")}</Text>
-                <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
-                  <Text className="text-xs font-bold">
-                    {groupedBySeries?.length}
-                  </Text>
-                </View>
-              </View>
-              <ScrollView horizontal showsHorizontalScrollIndicator={false}>
-                <View className="px-4 flex flex-row">
-                  {groupedBySeries?.map((items) => (
-                    <View
-                      className="mb-2 last:mb-0"
-                      key={items[0].item.SeriesId}
-                    >
-                      <SeriesCard
-                        items={items.map((i) => i.item)}
-                        key={items[0].item.SeriesId}
-                      />
-                    </View>
-                  ))}
-                </View>
-              </ScrollView>
-            </View>
-          )}
-          {downloadedFiles?.length === 0 && (
-            <View className="flex px-4">
-              <Text className="opacity-50">{t("home.downloads.no_downloaded_items")}</Text>
-            </View>
-          )}
-        </View>
-      </ScrollView>
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        backdropComponent={(props: BottomSheetBackdropProps) => (
-          <BottomSheetBackdrop
-            {...props}
-            disappearsOnIndex={-1}
-            appearsOnIndex={0}
-          />
-        )}
-      >
-        <BottomSheetView>
-          <View className="p-4 space-y-4 mb-4">
-            <Button color="purple" onPress={deleteMovies}>
-              {t("home.downloads.delete_all_movies_button")}
-            </Button>
-            <Button color="purple" onPress={deleteShows}>
-              {t("home.downloads.delete_all_tvseries_button")}
-            </Button>
-            <Button color="red" onPress={deleteAllMedia}>
-              {t("home.downloads.delete_all_button")}
-            </Button>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </>
-  );
-}
-
-function migration_20241124() {
-  const router = useRouter();
-  const { deleteAllFiles } = useDownload();
-  Alert.alert(
-    t("home.downloads.new_app_version_requires_re_download"),
-    t("home.downloads.new_app_version_requires_re_download_description"),
-    [
-      {
-        text: t("home.downloads.back"),
-        onPress: () => router.back(),
-      },
-      {
-        text: t("home.downloads.delete"),
-        style: "destructive",
-        onPress: async () => await deleteAllFiles(),
-      },
-    ]
-  );
-}

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

@@ -4,17 +4,11 @@ import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
 import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
 import { Loader } from "@/components/Loader";
 import { MediaListSection } from "@/components/medialists/MediaListSection";
-import { Colors } from "@/constants/Colors";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { HomeSectionStyle, useSettings } from "@/utils/atoms/settings";
+import { useSettings } from "@/utils/atoms/settings";
-import { Feather, Ionicons } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";
 import { Api } from "@jellyfin/sdk";
-import {
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-  BaseItemDto,
-  BaseItemKind,
-} from "@jellyfin/sdk/lib/generated-client/models";
 import {
   getItemsApi,
   getSuggestionsApi,
@@ -23,81 +17,50 @@ import {
   getUserViewsApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import NetInfo from "@react-native-community/netinfo";
-import { QueryFunction, useQuery } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useNavigation, useRouter } from "expo-router";
+import { useRouter } from "expo-router";
-import { useAtomValue } from "jotai";
+import { useAtom } from "jotai";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
 import {
   ActivityIndicator,
   RefreshControl,
+  SafeAreaView,
   ScrollView,
-  TouchableOpacity,
   View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-type ScrollingCollectionListSection = {
+type BaseSection = {
+  title: string;
+  queryKey: (string | undefined)[];
+};
+
+type ScrollingCollectionListSection = BaseSection & {
   type: "ScrollingCollectionList";
-  title?: string;
+  queryFn: () => Promise<BaseItemDto[]>;
-  queryKey: (string | undefined | null)[];
-  queryFn: QueryFunction<BaseItemDto[]>;
   orientation?: "horizontal" | "vertical";
 };
 
-type MediaListSection = {
+type MediaListSection = BaseSection & {
   type: "MediaListSection";
-  queryKey: (string | undefined)[];
+  queryFn: () => Promise<BaseItemDto>;
-  queryFn: QueryFunction<BaseItemDto>;
 };
 
 type Section = ScrollingCollectionListSection | MediaListSection;
 
 export default function index() {
+  const queryClient = useQueryClient();
   const router = useRouter();
 
-  const { t } = useTranslation();
+  const [api] = useAtom(apiAtom);
-
+  const [user] = useAtom(userAtom);
-  const api = useAtomValue(apiAtom);
-  const user = useAtomValue(userAtom);
 
   const [loading, setLoading] = useState(false);
-  const [
+  const [settings, _] = useSettings();
-    settings,
-    updateSettings,
-    pluginSettings,
-    setPluginSettings,
-    refreshStreamyfinPluginSettings,
-  ] = useSettings();
 
   const [isConnected, setIsConnected] = useState<boolean | null>(null);
   const [loadingRetry, setLoadingRetry] = useState(false);
 
-  const { downloadedFiles, cleanCacheDirectory } = useDownload();
-  const navigation = useNavigation();
-
-  const insets = useSafeAreaInsets();
-
-  useEffect(() => {
-    const hasDownloads = downloadedFiles && downloadedFiles.length > 0;
-    navigation.setOptions({
-      headerLeft: () => (
-        <TouchableOpacity
-          onPress={() => {
-            router.push("/(auth)/downloads");
-          }}
-          className="p-2"
-        >
-          <Feather
-            name="download"
-            color={hasDownloads ? Colors.primary : "white"}
-            size={22}
-          />
-        </TouchableOpacity>
-      ),
-    });
-  }, [downloadedFiles, navigation, router]);
-
   const checkConnection = useCallback(async () => {
     setLoadingRetry(true);
     const state = await NetInfo.fetch();
@@ -116,21 +79,17 @@ export default function index() {
       setIsConnected(state.isConnected);
     });
 
-    cleanCacheDirectory().catch((e) =>
-      console.error("Something went wrong cleaning cache directory")
-    );
-
     return () => {
       unsubscribe();
     };
   }, []);
 
   const {
-    data,
+    data: userViews,
     isError: e1,
     isLoading: l1,
   } = useQuery({
-    queryKey: ["home", "userViews", user?.Id],
+    queryKey: ["userViews", user?.Id],
     queryFn: async () => {
       if (!api || !user?.Id) {
         return null;
@@ -146,100 +105,74 @@ export default function index() {
     staleTime: 60 * 1000,
   });
 
-  const userViews = useMemo(
+  const {
-    () => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
+    data: mediaListCollections,
-    [data, settings?.hiddenLibraries]
+    isError: e2,
-  );
+    isLoading: l2,
+  } = useQuery({
+    queryKey: ["sf_promoted", user?.Id, settings?.usePopularPlugin],
+    queryFn: async () => {
+      if (!api || !user?.Id) return [];
 
-  const collections = useMemo(() => {
+      const response = await getItemsApi(api).getItems({
-    const allow = ["movies", "tvshows"];
+        userId: user.Id,
-    return (
+        tags: ["sf_promoted"],
-      userViews?.filter(
+        recursive: true,
-        (c) => c.CollectionType && allow.includes(c.CollectionType)
+        fields: ["Tags"],
-      ) || []
+        includeItemTypes: ["BoxSet"],
-    );
+      });
+
+      return response.data.Items || [];
+    },
+    enabled: !!api && !!user?.Id && settings?.usePopularPlugin === true,
+    staleTime: 60 * 1000,
+  });
+
+  const movieCollectionId = useMemo(() => {
+    return userViews?.find((c) => c.CollectionType === "movies")?.Id;
   }, [userViews]);
 
-  const invalidateCache = useInvalidatePlaybackProgressCache();
+  const tvShowCollectionId = useMemo(() => {
+    return userViews?.find((c) => c.CollectionType === "tvshows")?.Id;
+  }, [userViews]);
 
   const refetch = useCallback(async () => {
     setLoading(true);
-    await refreshStreamyfinPluginSettings();
+    await queryClient.refetchQueries({ queryKey: ["userViews"] });
-    await invalidateCache();
+    await queryClient.refetchQueries({ queryKey: ["resumeItems"] });
-    setLoading(false);
+    await queryClient.refetchQueries({ queryKey: ["nextUp-all"] });
-  }, []);
+    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInMovies"] });
-
+    await queryClient.refetchQueries({ queryKey: ["recentlyAddedInTVShows"] });
-  const createCollectionConfig = useCallback(
+    await queryClient.refetchQueries({ queryKey: ["suggestions"] });
-    (
+    await queryClient.refetchQueries({
-      title: string,
+      queryKey: ["sf_promoted"],
-      queryKey: string[],
-      includeItemTypes: BaseItemKind[],
-      parentId: string | undefined
-    ): ScrollingCollectionListSection => ({
-      title,
-      queryKey,
-      queryFn: async () => {
-        if (!api) return [];
-        return (
-          (
-            await getUserLibraryApi(api).getLatestMedia({
-              userId: user?.Id,
-              limit: 20,
-              fields: ["PrimaryImageAspectRatio", "Path"],
-              imageTypeLimit: 1,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              includeItemTypes,
-              parentId,
-            })
-          ).data || []
-        );
-      },
-      type: "ScrollingCollectionList",
-    }),
-    [api, user?.Id]
-  );
-
-  let sections: Section[] = [];
-  if (!settings?.home || !settings?.home?.sections) {
-    sections = useMemo(() => {
-      if (!api || !user?.Id) return [];
-
-      const latestMediaViews = collections.map((c) => {
-        const includeItemTypes: BaseItemKind[] =
-          c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
-        const title = t("home.recently_added_in", {libraryName: c.Name});
-        const queryKey = [
-          "home",
-          "recentlyAddedIn" + c.CollectionType,
-          user?.Id!,
-          c.Id!,
-        ];
-        return createCollectionConfig(
-          title || "",
-          queryKey,
-          includeItemTypes,
-          c.Id
-        );
     });
+    await queryClient.refetchQueries({
+      queryKey: ["sf_carousel"],
+    });
+    setLoading(false);
+  }, [queryClient, user?.Id]);
+
+  const sections = useMemo(() => {
+    if (!api || !user?.Id) return [];
 
     const ss: Section[] = [
       {
-          title: t("home.continue_watching"),
+        title: "Continue Watching",
-          queryKey: ["home", "resumeItems"],
+        queryKey: ["resumeItems", user.Id],
         queryFn: async () =>
           (
             await getItemsApi(api).getResumeItems({
               userId: user.Id,
               enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-                includeItemTypes: ["Movie", "Series", "Episode"],
             })
           ).data.Items || [],
         type: "ScrollingCollectionList",
         orientation: "horizontal",
       },
       {
-          title: t("home.next_up"),
+        title: "Next Up",
-          queryKey: ["home", "nextUp-all"],
+        queryKey: ["nextUp-all", user?.Id],
         queryFn: async () =>
           (
             await getTvShowsApi(api).getNextUp({
@@ -247,26 +180,57 @@ export default function index() {
               fields: ["MediaSourceCount"],
               limit: 20,
               enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-                enableResumable: false,
             })
           ).data.Items || [],
         type: "ScrollingCollectionList",
         orientation: "horizontal",
       },
-        ...latestMediaViews,
+      ...(mediaListCollections?.map(
-        // ...(mediaListCollections?.map(
+        (ml) =>
-        //   (ml) =>
+          ({
-        //     ({
+            title: ml.Name || "",
-        //       title: ml.Name,
+            queryKey: ["mediaList", ml.Id],
-        //       queryKey: ["home", "mediaList", ml.Id!],
+            queryFn: async () => ml,
-        //       queryFn: async () => ml,
+            type: "MediaListSection",
-        //       type: "MediaListSection",
+          } as MediaListSection)
-        //       orientation: "vertical",
+      ) || []),
-        //     } as Section)
-        // ) || []),
       {
-          title: t("home.suggested_movies"),
+        title: "Recently Added in Movies",
-          queryKey: ["home", "suggestedMovies", user?.Id],
+        queryKey: ["recentlyAddedInMovies", user?.Id, movieCollectionId],
+        queryFn: async () =>
+          (
+            await getUserLibraryApi(api).getLatestMedia({
+              userId: user?.Id,
+              limit: 50,
+              fields: ["PrimaryImageAspectRatio", "Path"],
+              imageTypeLimit: 1,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              includeItemTypes: ["Movie"],
+              parentId: movieCollectionId,
+            })
+          ).data || [],
+        type: "ScrollingCollectionList",
+      },
+      {
+        title: "Recently Added in TV-Shows",
+        queryKey: ["recentlyAddedInTVShows", user?.Id, tvShowCollectionId],
+        queryFn: async () =>
+          (
+            await getUserLibraryApi(api).getLatestMedia({
+              userId: user?.Id,
+              limit: 50,
+              fields: ["PrimaryImageAspectRatio", "Path"],
+              imageTypeLimit: 1,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              includeItemTypes: ["Series"],
+              parentId: tvShowCollectionId,
+            })
+          ).data || [],
+        type: "ScrollingCollectionList",
+      },
+      {
+        title: "Suggested Movies",
+        queryKey: ["suggestedMovies", user?.Id],
         queryFn: async () =>
           (
             await getSuggestionsApi(api).getSuggestions({
@@ -280,8 +244,8 @@ export default function index() {
         orientation: "vertical",
       },
       {
-          title: t("home.suggested_episodes"),
+        title: "Suggested Episodes",
-          queryKey: ["home", "suggestedEpisodes", user?.Id],
+        queryKey: ["suggestedEpisodes", user?.Id],
         queryFn: async () => {
           try {
             const suggestions = await getSuggestions(api, user.Id);
@@ -301,58 +265,20 @@ export default function index() {
       },
     ];
     return ss;
-    }, [api, user?.Id, collections]);
+  }, [
-  } else {
+    api,
-    sections = useMemo(() => {
+    user?.Id,
-      if (!api || !user?.Id) return [];
+    movieCollectionId,
-      const ss: Section[] = [];
+    tvShowCollectionId,
-
+    mediaListCollections,
-      for (const key in settings.home?.sections) {
+  ]);
-        const section = settings.home?.sections[key];
-        const id = section.title || key;
-        ss.push({
-          title: id,
-          queryKey: ["home", id],
-          queryFn: async () => {
-            if (section.items) {
-              const response = await getItemsApi(api).getItems({
-                userId: user?.Id,
-                limit: section.items?.limit || 25,
-                recursive: true,
-                includeItemTypes: section.items?.includeItemTypes,
-                sortBy: section.items?.sortBy,
-                sortOrder: section.items?.sortOrder,
-                filters: section.items?.filters,
-                parentId: section.items?.parentId,
-              });
-              return response.data.Items || [];
-            } else if (section.nextUp) {
-              const response = await getTvShowsApi(api).getNextUp({
-                userId: user?.Id,
-                fields: ["MediaSourceCount"],
-                limit: section.items?.limit || 25,
-                enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-                enableResumable: section.items?.enableResumable || false,
-                enableRewatching: section.items?.enableRewatching || false,
-              });
-              return response.data.Items || [];
-            }
-            return [];
-          },
-          type: "ScrollingCollectionList",
-          orientation: section?.orientation || "vertical",
-        });
-      }
-      return ss;
-    }, [api, user?.Id, settings.home?.sections]);
-  }
 
   if (isConnected === false) {
     return (
       <View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
-        <Text className="text-3xl font-bold mb-2">{t("home.no_internet")}</Text>
+        <Text className="text-3xl font-bold mb-2">No Internet</Text>
         <Text className="text-center opacity-70">
-        {t("home.no_internet_message")}
+          No worries, you can still watch{"\n"}downloaded content.
         </Text>
         <View className="mt-4">
           <Button
@@ -363,7 +289,7 @@ export default function index() {
               <Ionicons name="arrow-forward" size={20} color="white" />
             }
           >
-            {t("home.go_to_downloads")}
+            Go to downloads
           </Button>
           <Button
             color="black"
@@ -389,15 +315,19 @@ export default function index() {
     );
   }
 
-  if (e1)
+  const insets = useSafeAreaInsets();
+
+  if (e1 || e2)
     return (
       <View className="flex flex-col items-center justify-center h-full -mt-6">
-        <Text className="text-3xl font-bold mb-2">{t("home.oops")}</Text>
+        <Text className="text-3xl font-bold mb-2">Oops!</Text>
-        <Text className="text-center opacity-70">{t("home.error_message")}</Text>
+        <Text className="text-center opacity-70">
+          Something went wrong.{"\n"}Please log out and in again.
+        </Text>
       </View>
     );
 
-  if (l1)
+  if (l1 || l2)
     return (
       <View className="justify-center items-center h-full">
         <Loader />
@@ -411,13 +341,14 @@ export default function index() {
       refreshControl={
         <RefreshControl refreshing={loading} onRefresh={refetch} />
       }
-      contentContainerStyle={{
+    >
+      <View
+        style={{
           paddingLeft: insets.left,
           paddingRight: insets.right,
-        paddingBottom: 16,
         }}
+        className="flex flex-col pt-4 pb-24 gap-y-4"
       >
-      <View className="flex flex-col space-y-4">
         <LargeMovieCarousel />
 
         {sections.map((section, index) => {

app/(auth)/(tabs)/(home)/intro/page.tsx

@@ -1,135 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { storage } from "@/utils/mmkv";
-import { Feather, Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
-import { useFocusEffect, useRouter } from "expo-router";
-import { useCallback } from "react";
-import {useTranslation } from "react-i18next";
-import { Linking, TouchableOpacity, View } from "react-native";
-
-export default function page() {
-  const router = useRouter();
-  const { t } = useTranslation();
-
-  useFocusEffect(
-    useCallback(() => {
-      storage.set("hasShownIntro", true);
-    }, [])
-  );
-
-  return (
-    <View className="bg-neutral-900 h-full py-16 px-4 space-y-8">
-      <View>
-        <Text className="text-3xl font-bold text-center mb-2">
-          {t("home.intro.welcome_to_streamyfin")}
-        </Text>
-        <Text className="text-center">
-          {t("home.intro.a_free_and_open_source_client_for_jellyfin")}
-        </Text>
-      </View>
-
-      <View>
-        <Text className="text-lg font-bold">{t("home.intro.features_title")}</Text>
-        <Text className="text-xs">
-          {t("home.intro.features_description")}
-        </Text>
-        <View className="flex flex-row items-center mt-4">
-          <Image
-            source={require("@/assets/icons/jellyseerr-logo.svg")}
-            style={{
-              width: 50,
-              height: 50,
-            }}
-          />
-          <View className="shrink ml-2">
-            <Text className="font-bold mb-1">Jellyseerr</Text>
-            <Text className="shrink text-xs">
-              {t("home.intro.jellyseerr_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className="flex flex-row items-center mt-4">
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className="flex items-center justify-center"
-          >
-            <Ionicons name="cloud-download-outline" size={32} color="white" />
-          </View>
-          <View className="shrink ml-2">
-            <Text className="font-bold mb-1">{t("home.intro.downloads_feature_title")}</Text>
-            <Text className="shrink text-xs">
-              {t("home.intro.downloads_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className="flex flex-row items-center mt-4">
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className="flex items-center justify-center"
-          >
-            <Feather name="cast" size={28} color={"white"} />
-          </View>
-          <View className="shrink ml-2">
-            <Text className="font-bold mb-1">Chromecast</Text>
-            <Text className="shrink text-xs">
-              {t("home.intro.chromecast_feature_description")}
-            </Text>
-          </View>
-        </View>
-        <View className="flex flex-row items-center mt-4">
-          <View
-            style={{
-              width: 50,
-              height: 50,
-            }}
-            className="flex items-center justify-center"
-          >
-            <Feather name="settings" size={28} color={"white"} />
-          </View>
-          <View className="shrink ml-2">
-            <Text className="font-bold mb-1">{t("home.intro.centralised_settings_plugin_title")}</Text>
-            <Text className="shrink text-xs">
-              {t("home.intro.centralised_settings_plugin_description")}{" "}
-              <Text
-                className="text-purple-600"
-                onPress={() => {
-                  Linking.openURL(
-                    "https://github.com/streamyfin/jellyfin-plugin-streamyfin"
-                  );
-                }}
-              >
-                {t("home.intro.read_more")}
-              </Text>
-            </Text>
-          </View>
-        </View>
-      </View>
-      <View>
-        <Button
-          onPress={() => {
-            router.back();
-          }}
-          className="mt-4"
-        >
-          {t("home.intro.done_button")}
-        </Button>
-        <TouchableOpacity
-          onPress={() => {
-            router.back();
-            router.push("/settings");
-          }}
-          className="mt-4"
-        >
-          <Text className="text-purple-600 text-center">{t("home.intro.go_to_settings_button")}</Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-}

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

@@ -1,109 +1,100 @@
+import { Button } from "@/components/Button";
 import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
+import { ListItem } from "@/components/ListItem";
-import { ListItem } from "@/components/list/ListItem";
+import { SettingToggles } from "@/components/settings/SettingToggles";
-import { AudioToggles } from "@/components/settings/AudioToggles";
+import { useFiles } from "@/hooks/useFiles";
-import { DownloadSettings } from "@/components/settings/DownloadSettings";
+import { apiAtom, useJellyfin, userAtom } from "@/providers/JellyfinProvider";
-import { MediaProvider } from "@/components/settings/MediaContext";
+import { clearLogs, readFromLog } from "@/utils/log";
-import { MediaToggles } from "@/components/settings/MediaToggles";
+import { useQuery } from "@tanstack/react-query";
-import { OtherSettings } from "@/components/settings/OtherSettings";
+import * as Haptics from "expo-haptics";
-import { PluginSettings } from "@/components/settings/PluginSettings";
+import { useAtom } from "jotai";
-import { QuickConnect } from "@/components/settings/QuickConnect";
+import { ScrollView, View } from "react-native";
-import { StorageSettings } from "@/components/settings/StorageSettings";
-import { SubtitleToggles } from "@/components/settings/SubtitleToggles";
-import { AppLanguageSelector } from "@/components/settings/AppLanguageSelector";
-import { UserInfo } from "@/components/settings/UserInfo";
-import { useJellyfin } from "@/providers/JellyfinProvider";
-import { clearLogs } from "@/utils/log";
-import { useHaptic } from "@/hooks/useHaptic";
-import { useNavigation, useRouter } from "expo-router";
-import { t } from "i18next";
-import React, { useEffect } from "react";
-import { ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { storage } from "@/utils/mmkv";
 
 export default function settings() {
-  const router = useRouter();
-  const insets = useSafeAreaInsets();
   const { logout } = useJellyfin();
-  const successHapticFeedback = useHaptic("success");
+  const { deleteAllFiles } = useFiles();
 
-  const onClearLogsClicked = async () => {
+  const [api] = useAtom(apiAtom);
-    clearLogs();
+  const [user] = useAtom(userAtom);
-    successHapticFeedback();
-  };
 
-  const navigation = useNavigation();
+  const { data: logs } = useQuery({
-  useEffect(() => {
+    queryKey: ["logs"],
-    navigation.setOptions({
+    queryFn: async () => readFromLog(),
-      headerRight: () => (
+    refetchInterval: 1000,
-        <TouchableOpacity
-          onPress={() => {
-            logout();
-          }}
-        >
-          <Text className="text-red-600">{t("home.settings.log_out_button")}</Text>
-        </TouchableOpacity>
-      ),
   });
-  }, []);
+
+  const insets = useSafeAreaInsets();
 
   return (
     <ScrollView
       contentContainerStyle={{
         paddingLeft: insets.left,
         paddingRight: insets.right,
+        paddingBottom: 100,
       }}
     >
       <View className="p-4 flex flex-col gap-y-4">
-        <UserInfo />
+        <View>
-        <QuickConnect className="mb-4" />
+          <Text className="font-bold text-lg mb-2">Information</Text>
 
-        <MediaProvider>
+          <View className="flex flex-col rounded-xl mb-4 overflow-hidden border-neutral-800 divide-y-2 divide-solid divide-neutral-800 ">
-          <MediaToggles className="mb-4" />
+            <ListItem title="User" subTitle={user?.Name} />
-          <AudioToggles className="mb-4" />
+            <ListItem title="Server" subTitle={api?.basePath} />
-          <SubtitleToggles className="mb-4" />
+          </View>
-        </MediaProvider>
-
-        <OtherSettings />
-        <DownloadSettings />
-
-        <PluginSettings />
-
-        <AppLanguageSelector/>
-
-        <ListGroup title={"Intro"}>
-          <ListItem
-            onPress={() => {
-              router.push("/intro/page");
-            }}
-            title={t("home.settings.intro.show_intro")}
-          />
-          <ListItem
-            textColor="red"
-            onPress={() => {
-              storage.set("hasShownIntro", false);
-            }}
-            title={t("home.settings.intro.reset_intro")}
-          />
-        </ListGroup>
-
-        <View className="mb-4">
-          <ListGroup title={t("home.settings.logs.logs_title")}>
-            <ListItem
-              onPress={() => router.push("/settings/logs/page")}
-              showArrow
-              title={t("home.settings.logs.logs_title")}
-            />
-            <ListItem
-              textColor="red"
-              onPress={onClearLogsClicked}
-              title={t("home.settings.logs.delete_all_logs")}
-            />
-          </ListGroup>
         </View>
 
-        <StorageSettings />
+        <SettingToggles />
+
+        <View className="flex flex-col space-y-2">
+          <Button color="black" onPress={logout}>
+            Log out
+          </Button>
+          <Button
+            color="red"
+            onPress={async () => {
+              await deleteAllFiles();
+              Haptics.notificationAsync(
+                Haptics.NotificationFeedbackType.Success
+              );
+            }}
+          >
+            Delete all downloaded files
+          </Button>
+          <Button
+            color="red"
+            onPress={async () => {
+              await clearLogs();
+              Haptics.notificationAsync(
+                Haptics.NotificationFeedbackType.Success
+              );
+            }}
+          >
+            Delete all logs
+          </Button>
+        </View>
+        <View>
+          <Text className="font-bold text-lg mb-2">Logs</Text>
+          <View className="flex flex-col space-y-2">
+            {logs?.map((log, index) => (
+              <View key={index} className="bg-neutral-900 rounded-xl p-3">
+                <Text
+                  className={`
+                  mb-1
+              ${log.level === "INFO" && "text-blue-500"}
+              ${log.level === "ERROR" && "text-red-500"}
+                `}
+                >
+                  {log.level}
+                </Text>
+                <Text className="text-xs">{log.message}</Text>
+              </View>
+            ))}
+            {logs?.length === 0 && (
+              <Text className="opacity-50">No logs available</Text>
+            )}
+          </View>
+        </View>
       </View>
     </ScrollView>
   );

app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx

@@ -1,67 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import { Loader } from "@/components/Loader";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import { Switch, View } from "react-native";
-import { useTranslation } from "react-i18next"; 
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-  const user = useAtomValue(userAtom);
-  const api = useAtomValue(apiAtom);
-
-  const { t } = useTranslation();
-
-  const { data, isLoading: isLoading } = useQuery({
-    queryKey: ["user-views", user?.Id],
-    queryFn: async () => {
-      const response = await getUserViewsApi(api!).getUserViews({
-        userId: user?.Id,
-      });
-
-      return response.data.Items || null;
-    },
-  });
-
-  if (!settings) return null;
-
-  if (isLoading)
-    return (
-      <View className="mt-4">
-        <Loader />
-      </View>
-    );
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.hiddenLibraries?.locked === true}
-      className="px-4"
-    >
-      <ListGroup>
-        {data?.map((view) => (
-          <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-            <Switch
-              value={settings.hiddenLibraries?.includes(view.Id!) || false}
-              onValueChange={(value) => {
-                updateSettings({
-                  hiddenLibraries: value
-                    ? [...(settings.hiddenLibraries || []), view.Id!]
-                    : settings.hiddenLibraries?.filter((id) => id !== view.Id),
-                });
-              }}
-            />
-          </ListItem>
-        ))}
-      </ListGroup>
-      <Text className="px-4 text-xs text-neutral-500 mt-1">
-      {t("home.settings.other.select_liraries_you_want_to_hide")}
-      </Text>
-    </DisabledSetting>
-  );
-}

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

@@ -1,16 +0,0 @@
-import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
-import { useSettings } from "@/utils/atoms/settings";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
-      className="p-4"
-    >
-      <JellyseerrSettings />
-    </DisabledSetting>
-  );
-}

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

@@ -1,35 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { useLog } from "@/utils/log";
-import { ScrollView, View } from "react-native";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const { logs } = useLog();
-  const { t } = useTranslation();
-
-  return (
-    <ScrollView className="p-4">
-      <View className="flex flex-col space-y-2">
-        {logs?.map((log, index) => (
-          <View key={index} className="bg-neutral-900 rounded-xl p-3">
-            <Text
-              className={`
-                  mb-1
-              ${log.level === "INFO" && "text-blue-500"}
-              ${log.level === "ERROR" && "text-red-500"}
-                `}
-            >
-              {log.level}
-            </Text>
-            <Text uiTextView selectable className="text-xs">
-              {log.message}
-            </Text>
-          </View>
-        ))}
-        {logs?.length === 0 && (
-          <Text className="opacity-50">{t("home.settings.logs.no_logs_available")}</Text>
-        )}
-      </View>
-    </ScrollView>
-  );
-}

app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx

@@ -1,117 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import { useSettings } from "@/utils/atoms/settings";
-import { useQueryClient } from "@tanstack/react-query";
-import { useNavigation } from "expo-router";
-import { useTranslation } from "react-i18next";
-
-import React, {useEffect, useMemo, useState} from "react";
-import {
-  Linking,
-  Switch,
-  TextInput,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { toast } from "sonner-native";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-export default function page() {
-  const navigation = useNavigation();
-
-  const { t } = useTranslation();
-
-  const [settings, updateSettings, pluginSettings] = useSettings();
-  const queryClient = useQueryClient();
-
-  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
-
-  const onSave = (val: string) => {
-    updateSettings({
-      marlinServerUrl: !val.endsWith("/") ? val : val.slice(0, -1),
-    });
-    toast.success(t("home.settings.plugins.marlin_search.toasts.saved"));
-  };
-
-  const handleOpenLink = () => {
-    Linking.openURL("https://github.com/fredrikburmester/marlin-search");
-  };
-
-  const disabled = useMemo(() => {
-    return pluginSettings?.searchEngine?.locked === true && pluginSettings?.marlinServerUrl?.locked === true
-  }, [pluginSettings]);
-
-  useEffect(() => {
-    if (!pluginSettings?.marlinServerUrl?.locked) {
-      navigation.setOptions({
-        headerRight: () => (
-          <TouchableOpacity onPress={() => onSave(value)}>
-            <Text className="text-blue-500">{t("home.settings.plugins.marlin_search.save_button")}</Text>
-          </TouchableOpacity>
-        ),
-      });
-    }
-  }, [navigation, value]);
-
-  if (!settings) return null;
-
-  return (
-    <DisabledSetting
-      disabled={disabled}
-      className="px-4"
-    >
-      <ListGroup>
-        <DisabledSetting
-          disabled={pluginSettings?.searchEngine?.locked === true}
-          showText={!pluginSettings?.marlinServerUrl?.locked}
-        >
-          <ListItem
-            title={t("home.settings.plugins.marlin_search.enable_marlin_search")}
-            onPress={() => {
-              updateSettings({ searchEngine: "Jellyfin" });
-              queryClient.invalidateQueries({ queryKey: ["search"] });
-            }}
-          >
-            <Switch
-              value={settings.searchEngine === "Marlin"}
-              onValueChange={(value) => {
-                updateSettings({ searchEngine: value ? "Marlin" : "Jellyfin" });
-                queryClient.invalidateQueries({ queryKey: ["search"] });
-              }}
-            />
-          </ListItem>
-        </DisabledSetting>
-      </ListGroup>
-
-      <DisabledSetting
-        disabled={pluginSettings?.marlinServerUrl?.locked === true}
-        showText={!pluginSettings?.searchEngine?.locked}
-        className="mt-2 flex flex-col rounded-xl overflow-hidden pl-4 bg-neutral-900 px-4"
-      >
-        <View
-          className={`flex flex-row items-center bg-neutral-900 h-11 pr-4`}
-        >
-          <Text className="mr-4">{t("home.settings.plugins.marlin_search.url")}</Text>
-          <TextInput
-            editable={settings.searchEngine === "Marlin"}
-            className="text-white"
-            placeholder={t("home.settings.plugins.marlin_search.server_url_placeholder")}
-            value={value}
-            keyboardType="url"
-            returnKeyType="done"
-            autoCapitalize="none"
-            textContentType="URL"
-            onChangeText={(text) => setValue(text)}
-          />
-        </View>
-      </DisabledSetting>
-      <Text className="px-4 text-xs text-neutral-500 mt-1">
-        {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
-        <Text className="text-blue-500" onPress={handleOpenLink}>
-          {t("home.settings.plugins.marlin_search.read_more_about_marlin")}
-        </Text>
-      </Text>
-    </DisabledSetting>
-  );
-}

app/(auth)/(tabs)/(home)/settings/optimized-server/page.tsx

@@ -1,89 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getOrSetDeviceId } from "@/utils/device";
-import { getStatistics } from "@/utils/optimize-server";
-import { useMutation } from "@tanstack/react-query";
-import { useNavigation } from "expo-router";
-import { useAtom } from "jotai";
-import { useEffect, useState } from "react";
-import { ActivityIndicator, TouchableOpacity, View } from "react-native";
-import { toast } from "sonner-native";
-import { useTranslation } from "react-i18next";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-
-export default function page() {
-  const navigation = useNavigation();
-
-  const { t } = useTranslation();
-
-  const [api] = useAtom(apiAtom);
-  const [settings, updateSettings, pluginSettings] = useSettings();
-
-  const [optimizedVersionsServerUrl, setOptimizedVersionsServerUrl] =
-    useState<string>(settings?.optimizedVersionsServerUrl || "");
-
-  const saveMutation = useMutation({
-    mutationFn: async (newVal: string) => {
-      if (newVal.length === 0 || !newVal.startsWith("http")) {
-        toast.error(t("home.settings.toasts.invalid_url"));
-        return;
-      }
-
-      const updatedUrl = newVal.endsWith("/") ? newVal : newVal + "/";
-
-      updateSettings({
-        optimizedVersionsServerUrl: updatedUrl,
-      });
-
-      return await getStatistics({
-        url: settings?.optimizedVersionsServerUrl,
-        authHeader: api?.accessToken,
-        deviceId: getOrSetDeviceId(),
-      });
-    },
-    onSuccess: (data) => {
-      if (data) {
-        toast.success(t("home.settings.toasts.connected"));
-      } else {
-        toast.error(t("home.settings.toasts.could_not_connect"));
-      }
-    },
-    onError: () => {
-      toast.error(t("home.settings.toasts.could_not_connect"));
-    },
-  });
-
-  const onSave = (newVal: string) => {
-    saveMutation.mutate(newVal);
-  };
-
-  useEffect(() => {
-    if (!pluginSettings?.optimizedVersionsServerUrl?.locked) {
-      navigation.setOptions({
-        title: t("home.settings.downloads.optimized_server"),
-        headerRight: () =>
-          saveMutation.isPending ? (
-            <ActivityIndicator size={"small"} color={"white"} />
-          ) : (
-            <TouchableOpacity onPress={() => onSave(optimizedVersionsServerUrl)}>
-              <Text className="text-blue-500">{t("home.settings.downloads.save_button")}</Text>
-            </TouchableOpacity>
-          ),
-      });
-    }
-  }, [navigation, optimizedVersionsServerUrl, saveMutation.isPending]);
-
-  return (
-    <DisabledSetting
-      disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true}
-      className="p-4"
-    >
-      <OptimizedServerForm
-        value={optimizedVersionsServerUrl}
-        onChangeValue={setOptimizedVersionsServerUrl}
-      />
-    </DisabledSetting>
-  );
-}

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

@@ -0,0 +1,145 @@
+import { Text } from "@/components/common/Text";
+import { List } from "@/components/List";
+import { ListItem } from "@/components/ListItem";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { Ionicons } from "@expo/vector-icons";
+import { getSyncPlayApi } from "@jellyfin/sdk/lib/utils/api";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useAtom } from "jotai";
+import { useMemo } from "react";
+import { ActivityIndicator, Alert, ScrollView, View } from "react-native";
+
+export default function page() {
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const queryClient = useQueryClient();
+
+  const name = useMemo(() => user?.Name || "", [user]);
+
+  const { data: activeGroups } = useQuery({
+    queryKey: ["syncplay", "activeGroups"],
+    queryFn: async () => {
+      if (!api) return [];
+      const res = await getSyncPlayApi(api).syncPlayGetGroups();
+      return res.data;
+    },
+    refetchInterval: 1000,
+    refetchIntervalInBackground: true,
+    refetchOnWindowFocus: true,
+    refetchOnReconnect: true,
+    refetchOnMount: true,
+  });
+
+  const createGroupMutation = useMutation({
+    mutationFn: async (GroupName: string) => {
+      if (!api) return;
+      const res = await getSyncPlayApi(api).syncPlayCreateGroup({
+        newGroupRequestDto: {
+          GroupName,
+        },
+      });
+      if (res.status !== 204) {
+        Alert.alert("Error", "Failed to create group");
+        return false;
+      }
+      return true;
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["syncplay", "activeGroups"] });
+    },
+  });
+
+  const createGroup = () => {
+    Alert.prompt("Create Group", "Enter a name for the group", (text) => {
+      if (text) {
+        createGroupMutation.mutate(text);
+      }
+    });
+  };
+
+  const joinGroupMutation = useMutation({
+    mutationFn: async (groupId: string) => {
+      if (!api) return;
+      const res = await getSyncPlayApi(api).syncPlayJoinGroup({
+        joinGroupRequestDto: {
+          GroupId: groupId,
+        },
+      });
+      if (res.status !== 204) {
+        Alert.alert("Error", "Failed to join group");
+        return false;
+      }
+      return true;
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["syncplay", "activeGroups"] });
+    },
+  });
+
+  const leaveGroupMutation = useMutation({
+    mutationFn: async () => {
+      if (!api) return;
+      const res = await getSyncPlayApi(api).syncPlayLeaveGroup();
+      if (res.status !== 204) {
+        Alert.alert("Error", "Failed to exit group");
+        return false;
+      }
+      return true;
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["syncplay", "activeGroups"] });
+    },
+  });
+
+  return (
+    <ScrollView>
+      <View className="px-4 py-4">
+        <View>
+          <Text className="text-lg font-bold mb-4">Join group</Text>
+          {!activeGroups?.length && (
+            <Text className="text-neutral-500 mb-4">No active groups</Text>
+          )}
+          <List>
+            {activeGroups?.map((group) => (
+              <ListItem
+                key={group.GroupId}
+                title={group.GroupName}
+                onPress={async () => {
+                  if (!group.GroupId) {
+                    return;
+                  }
+                  if (group.Participants?.includes(name)) {
+                    leaveGroupMutation.mutate();
+                  } else {
+                    joinGroupMutation.mutate(group.GroupId);
+                  }
+                }}
+                iconAfter={
+                  group.Participants?.includes(name) ? (
+                    <Ionicons name="exit-outline" size={20} color="white" />
+                  ) : (
+                    <Ionicons name="add" size={20} color="white" />
+                  )
+                }
+                subTitle={group.Participants?.join(", ")}
+              />
+            ))}
+            <ListItem
+              onPress={() => createGroup()}
+              key={"create"}
+              title={"Create group"}
+              iconAfter={
+                createGroupMutation.isPending ? (
+                  <ActivityIndicator size={20} color={"white"} />
+                ) : (
+                  <Ionicons name="add" size={20} color="white" />
+                )
+              }
+            />
+          </List>
+        </View>
+      </View>
+    </ScrollView>
+  );
+}

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

@@ -18,12 +18,10 @@ import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
 import { View } from "react-native";
-import { useTranslation } from "react-i18next";
 
 const page: React.FC = () => {
   const local = useLocalSearchParams();
   const { actorId } = local as { actorId: string };
-  const { t } = useTranslation();
 
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
@@ -52,7 +50,7 @@ const page: React.FC = () => {
         userId: user.Id,
         personIds: [actorId],
         startIndex: pageParam,
-        limit: 16,
+        limit: 8,
         sortOrder: ["Descending", "Descending", "Ascending"],
         includeItemTypes: ["Movie", "Series"],
         recursive: true,
@@ -112,7 +110,7 @@ const page: React.FC = () => {
         </View>
 
         <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
-          {t("item_card.appeared_in")}
+          Appeared In
         </Text>
         <InfiniteHorizontalScroll
           height={247}

app/(auth)/(tabs)/(home,libraries,search)/albums/[albumId].tsx

@@ -0,0 +1,128 @@
+import { Chromecast } from "@/components/Chromecast";
+import { ItemImage } from "@/components/common/ItemImage";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { SongsList } from "@/components/music/SongsList";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
+import { ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { collectionId, artistId, albumId } = searchParams as {
+    collectionId: string;
+    artistId: string;
+    albumId: string;
+  };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerRight: () => (
+        <View className="">
+          <Chromecast />
+        </View>
+      ),
+    });
+  });
+
+  const { data: album } = useQuery({
+    queryKey: ["album", albumId, artistId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [albumId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!albumId,
+    staleTime: 0,
+  });
+
+  const {
+    data: songs,
+    isLoading,
+    isError,
+  } = useQuery<{
+    Items: BaseItemDto[];
+    TotalRecordCount: number;
+  }>({
+    queryKey: ["songs", artistId, albumId],
+    queryFn: async () => {
+      if (!api)
+        return {
+          Items: [],
+          TotalRecordCount: 0,
+        };
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: albumId,
+        fields: [
+          "ItemCounts",
+          "PrimaryImageAspectRatio",
+          "CanDelete",
+          "MediaSourceCount",
+        ],
+        sortBy: ["ParentIndexNumber", "IndexNumber", "SortName"],
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!api && !!user?.Id,
+  });
+
+  const insets = useSafeAreaInsets();
+
+  if (!album) return null;
+
+  return (
+    <ParallaxScrollView
+      headerHeight={400}
+      headerImage={
+        <ItemImage
+          variant={"Primary"}
+          item={album}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+    >
+      <View className="px-4 mb-8">
+        <Text className="font-bold text-2xl mb-2">{album?.Name}</Text>
+        <Text className="text-neutral-500">
+          {songs?.TotalRecordCount} songs
+        </Text>
+      </View>
+      <View className="px-4">
+        <SongsList
+          albumId={albumId}
+          songs={songs?.Items}
+          collectionId={collectionId}
+          artistId={artistId}
+        />
+      </View>
+    </ParallaxScrollView>
+  );
+}

app/(auth)/(tabs)/(home,libraries,search)/artists/[artistId].tsx

@@ -0,0 +1,130 @@
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import { Text } from "@/components/common/Text";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import { useEffect, useState } from "react";
+import { FlatList, ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { ItemImage } from "@/components/common/ItemImage";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { artistId } = searchParams as {
+    artistId: string;
+  };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const navigation = useNavigation();
+
+  const [startIndex, setStartIndex] = useState<number>(0);
+
+  const { data: artist } = useQuery({
+    queryKey: ["album", artistId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [artistId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!artistId,
+    staleTime: 0,
+  });
+
+  const {
+    data: albums,
+    isLoading,
+    isError,
+  } = useQuery<{
+    Items: BaseItemDto[];
+    TotalRecordCount: number;
+  }>({
+    queryKey: ["albums", artistId, startIndex],
+    queryFn: async () => {
+      if (!api)
+        return {
+          Items: [],
+          TotalRecordCount: 0,
+        };
+
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        parentId: artistId,
+        sortOrder: ["Descending", "Descending", "Ascending"],
+        includeItemTypes: ["MusicAlbum"],
+        recursive: true,
+        fields: [
+          "ParentId",
+          "PrimaryImageAspectRatio",
+          "ParentId",
+          "PrimaryImageAspectRatio",
+        ],
+        collapseBoxSetItems: false,
+        albumArtistIds: [artistId],
+        startIndex,
+        limit: 100,
+        sortBy: ["PremiereDate", "ProductionYear", "SortName"],
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!api && !!user?.Id,
+  });
+
+  const insets = useSafeAreaInsets();
+
+  if (!artist || !albums) return null;
+
+  return (
+    <ParallaxScrollView
+      headerHeight={400}
+      headerImage={
+        <ItemImage
+          variant={"Primary"}
+          item={artist}
+          style={{
+            width: "100%",
+            height: "100%",
+          }}
+        />
+      }
+    >
+      <View className="px-4 mb-8">
+        <Text className="font-bold text-2xl mb-2">{artist?.Name}</Text>
+        <Text className="text-neutral-500">
+          {albums.TotalRecordCount} albums
+        </Text>
+      </View>
+      <View className="flex flex-row flex-wrap justify-between px-4">
+        {albums.Items.map((item, idx) => (
+          <TouchableItemRouter
+            item={item}
+            style={{ width: "30%", marginBottom: 20 }}
+            key={idx}
+          >
+            <View className="flex flex-col gap-y-2">
+              <ArtistPoster item={item} />
+              <Text numberOfLines={2}>{item.Name}</Text>
+              <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
+            </View>
+          </TouchableItemRouter>
+        ))}
+      </View>
+    </ParallaxScrollView>
+  );
+}

app/(auth)/(tabs)/(home,libraries,search)/artists/index.tsx

@@ -0,0 +1,117 @@
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import ArtistPoster from "@/components/posters/ArtistPoster";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { getArtistsApi, getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams } from "expo-router";
+import { useAtom } from "jotai";
+import { useMemo, useState } from "react";
+import { FlatList, TouchableOpacity, View } from "react-native";
+
+export default function page() {
+  const searchParams = useLocalSearchParams();
+  const { collectionId } = searchParams as { collectionId: string };
+
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data: collection } = useQuery({
+    queryKey: ["collection", collectionId],
+    queryFn: async () => {
+      if (!api) return null;
+      const response = await getItemsApi(api).getItems({
+        userId: user?.Id,
+        ids: [collectionId],
+      });
+      const data = response.data.Items?.[0];
+      return data;
+    },
+    enabled: !!api && !!user?.Id && !!collectionId,
+    staleTime: 0,
+  });
+
+  const [startIndex, setStartIndex] = useState<number>(0);
+
+  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 response = await getArtistsApi(api).getArtists({
+        sortBy: ["SortName"],
+        sortOrder: ["Ascending"],
+        fields: ["PrimaryImageAspectRatio", "SortName"],
+        imageTypeLimit: 1,
+        enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
+        parentId: collectionId,
+        userId: user?.Id,
+      });
+
+      const data = response.data.Items;
+
+      return {
+        Items: data || [],
+        TotalRecordCount: response.data.TotalRecordCount || 0,
+      };
+    },
+    enabled: !!collection?.Id && !!api && !!user?.Id,
+  });
+
+  const totalItems = useMemo(() => {
+    return data?.TotalRecordCount;
+  }, [data]);
+
+  if (!data) return null;
+
+  return (
+    <FlatList
+      contentContainerStyle={{
+        padding: 16,
+        paddingBottom: 140,
+      }}
+      ListHeaderComponent={
+        <View className="mb-4">
+          <Text className="font-bold text-3xl mb-2">Artists</Text>
+        </View>
+      }
+      nestedScrollEnabled
+      data={data.Items}
+      numColumns={3}
+      columnWrapperStyle={{
+        justifyContent: "space-between",
+      }}
+      renderItem={({ item, index }) => (
+        <TouchableItemRouter
+          style={{
+            maxWidth: "30%",
+            width: "100%",
+          }}
+          key={index}
+          item={item}
+        >
+          <View className="flex flex-col gap-y-2">
+            {collection?.CollectionType === "movies" && (
+              <MoviePoster item={item} />
+            )}
+            {collection?.CollectionType === "music" && (
+              <ArtistPoster item={item} />
+            )}
+            <Text>{item.Name}</Text>
+            <Text className="opacity-50 text-xs">{item.ProductionYear}</Text>
+          </View>
+        </TouchableItemRouter>
+      )}
+      keyExtractor={(item) => item.Id || ""}
+    />
+  );
+}

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

@@ -33,7 +33,8 @@ import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { FlatList, View } from "react-native";
-import { useTranslation } from "react-i18next";
+
+const MemoizedTouchableItemRouter = React.memo(TouchableItemRouter);
 
 const page: React.FC = () => {
   const searchParams = useLocalSearchParams();
@@ -46,8 +47,6 @@ const page: React.FC = () => {
     ScreenOrientation.Orientation.PORTRAIT_UP
   );
 
-  const { t } = useTranslation();
-
   const [selectedGenres, setSelectedGenres] = useAtom(genreFilterAtom);
   const [selectedYears, setSelectedYears] = useAtom(yearFilterAtom);
   const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
@@ -107,12 +106,9 @@ const page: React.FC = () => {
           "CanDelete",
           "MediaSourceCount",
         ],
-        // true is needed for merged versions
-        recursive: true,
         genres: selectedGenres,
         tags: selectedTags,
         years: selectedYears.map((year) => parseInt(year)),
-        includeItemTypes: ["Movie", "Series"],
       });
 
       return response.data || null;
@@ -173,7 +169,7 @@ const page: React.FC = () => {
 
   const renderItem = useCallback(
     ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <TouchableItemRouter
+      <MemoizedTouchableItemRouter
         key={item.Id}
         style={{
           width: "100%",
@@ -197,7 +193,7 @@ const page: React.FC = () => {
           {/* <MoviePoster item={item} /> */}
           <ItemCardText item={item} />
         </View>
-      </TouchableItemRouter>
+      </MemoizedTouchableItemRouter>
     ),
     [orientation]
   );
@@ -247,7 +243,7 @@ const page: React.FC = () => {
                   }}
                   set={setSelectedGenres}
                   values={selectedGenres}
-                  title={t("library.filters.genres")}
+                  title="Genres"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) =>
                     item.toLowerCase().includes(search.toLowerCase())
@@ -274,7 +270,7 @@ const page: React.FC = () => {
                   }}
                   set={setSelectedYears}
                   values={selectedYears}
-                  title={t("library.filters.years")}
+                  title="Years"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) => item.includes(search)}
                 />
@@ -299,7 +295,7 @@ const page: React.FC = () => {
                   }}
                   set={setSelectedTags}
                   values={selectedTags}
-                  title={t("library.filters.tags")}
+                  title="Tags"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) =>
                     item.toLowerCase().includes(search.toLowerCase())
@@ -317,7 +313,7 @@ const page: React.FC = () => {
                   queryFn={async () => sortOptions.map((s) => s.key)}
                   set={setSortBy}
                   values={sortBy}
-                  title={t("library.filters.sort_by")}
+                  title="Sort By"
                   renderItemLabel={(item) =>
                     sortOptions.find((i) => i.key === item)?.value || ""
                   }
@@ -337,7 +333,7 @@ const page: React.FC = () => {
                   queryFn={async () => sortOrderOptions.map((s) => s.key)}
                   set={setSortOrder}
                   values={sortOrder}
-                  title={t("library.filters.sort_order")}
+                  title="Sort Order"
                   renderItemLabel={(item) =>
                     sortOrderOptions.find((i) => i.key === item)?.value || ""
                   }
@@ -377,7 +373,7 @@ const page: React.FC = () => {
     <FlashList
       ListEmptyComponent={
         <View className="flex flex-col items-center justify-center h-full">
-          <Text className="font-bold text-xl text-neutral-500">{t("search.no_results")}</Text>
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
         </View>
       }
       extraData={[

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

@@ -0,0 +1,13 @@
+import { ItemContent } from "@/components/ItemContent";
+import { useLocalSearchParams } from "expo-router";
+import React, { useMemo } from "react";
+
+const Page: React.FC = () => {
+  const { id } = useLocalSearchParams() as { id: string };
+
+  const memoizedContent = useMemo(() => <ItemContent id={id} />, [id]);
+
+  return memoizedContent;
+};
+
+export default React.memo(Page);

app/(auth)/(tabs)/(home,libraries,search)/series/[id].tsx

@@ -1,32 +1,27 @@
-import { AddToFavorites } from "@/components/AddToFavorites";
+import { Text } from "@/components/common/Text";
-import { DownloadItems } from "@/components/DownloadItem";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
 import { NextUp } from "@/components/series/NextUp";
 import { SeasonPicker } from "@/components/series/SeasonPicker";
-import { SeriesHeader } from "@/components/series/SeriesHeader";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
-import { Ionicons } from "@expo/vector-icons";
-import { getTvShowsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation } from "expo-router";
+import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useEffect, useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { View } from "react-native";
-import { useTranslation } from "react-i18next";
 
 const page: React.FC = () => {
-  const navigation = useNavigation();
-  const { t } = useTranslation();
   const params = useLocalSearchParams();
   const { id: seriesId, seasonIndex } = params as {
     id: string;
     seasonIndex: string;
   };
 
+  console.log("seasonIndex", seasonIndex);
+
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
 
@@ -38,6 +33,7 @@ const page: React.FC = () => {
         userId: user?.Id,
         itemId: seriesId,
       }),
+    enabled: !!seriesId && !!api,
     staleTime: 60 * 1000,
   });
 
@@ -61,50 +57,6 @@ const page: React.FC = () => {
     [item]
   );
 
-  const { data: allEpisodes, isLoading } = useQuery({
-    queryKey: ["AllEpisodes", item?.Id],
-    queryFn: async () => {
-      const res = await getTvShowsApi(api!).getEpisodes({
-        seriesId: item?.Id!,
-        userId: user?.Id!,
-        enableUserData: true,
-        fields: ["MediaSources", "MediaStreams", "Overview"],
-      });
-      return res?.data.Items || [];
-    },
-    staleTime: 60,
-    enabled: !!api && !!user?.Id && !!item?.Id,
-  });
-
-  useEffect(() => {
-    navigation.setOptions({
-      headerRight: () =>
-        !isLoading &&
-        item &&
-        allEpisodes &&
-        allEpisodes.length > 0 && (
-          <View className="flex flex-row items-center space-x-2">
-            <AddToFavorites item={item} type="series" />
-            <DownloadItems
-              size="large"
-              title={t("item_card.download.download_series")}
-              items={allEpisodes || []}
-              MissingDownloadIconComponent={() => (
-                <Ionicons name="download" size={22} color="white" />
-              )}
-              DownloadedIconComponent={() => (
-                <Ionicons
-                  name="checkmark-done-outline"
-                  size={24}
-                  color="#9333ea"
-                />
-              )}
-            />
-          </View>
-        ),
-    });
-  }, [allEpisodes, isLoading, item]);
-
   if (!item || !backdropUrl) return null;
 
   return (
@@ -139,7 +91,10 @@ const page: React.FC = () => {
       }
     >
       <View className="flex flex-col pt-4">
-        <SeriesHeader item={item} />
+        <View className="px-4 py-4">
+          <Text className="text-3xl font-bold">{item?.Name}</Text>
+          <Text className="">{item?.Overview}</Text>
+        </View>
         <View className="mb-4">
           <NextUp seriesId={seriesId} />
         </View>

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

@@ -1,114 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { ItemContent } from "@/components/ItemContent";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useLocalSearchParams } from "expo-router";
-import { useAtom } from "jotai";
-import React, { useEffect } from "react";
-import { View } from "react-native";
-import Animated, {
-  runOnJS,
-  useAnimatedStyle,
-  useSharedValue,
-  withTiming,
-} from "react-native-reanimated";
-import { useTranslation } from "react-i18next";
-
-const Page: React.FC = () => {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const { id } = useLocalSearchParams() as { id: string };
-  const { t } = useTranslation();
-
-  const { data: item, isError } = useQuery({
-    queryKey: ["item", id],
-    queryFn: async () => {
-      if (!api || !user || !id) return;
-      const res = await getUserLibraryApi(api).getItem({
-        itemId: id,
-        userId: user?.Id,
-      });
-
-      return res.data;
-    },
-    staleTime: 0,
-    refetchOnMount: true,
-    refetchOnWindowFocus: true,
-    refetchOnReconnect: true,
-  });
-
-  const opacity = useSharedValue(1);
-  const animatedStyle = useAnimatedStyle(() => {
-    return {
-      opacity: opacity.value,
-    };
-  });
-
-  const fadeOut = (callback: any) => {
-    setTimeout(() => {
-      opacity.value = withTiming(0, { duration: 500 }, (finished) => {
-        if (finished) {
-          runOnJS(callback)();
-        }
-      });
-    }, 100);
-  };
-
-  const fadeIn = (callback: any) => {
-    setTimeout(() => {
-      opacity.value = withTiming(1, { duration: 500 }, (finished) => {
-        if (finished) {
-          runOnJS(callback)();
-        }
-      });
-    }, 100);
-  };
-
-  useEffect(() => {
-    if (item) {
-      fadeOut(() => {});
-    } else {
-      fadeIn(() => {});
-    }
-  }, [item]);
-
-  if (isError)
-    return (
-      <View className="flex flex-col items-center justify-center h-screen w-screen">
-        <Text>{t("item_card.could_not_load_item")}</Text>
-      </View>
-    );
-
-  return (
-    <View className="flex flex-1 relative">
-      <Animated.View
-        pointerEvents={"none"}
-        style={[animatedStyle]}
-        className="absolute top-0 left-0 flex flex-col items-start h-screen w-screen px-4 z-50 bg-black"
-      >
-        <View
-          style={{
-            height: item?.Type === "Episode" ? 300 : 450,
-          }}
-          className="bg-transparent rounded-lg mb-4 w-full"
-        ></View>
-        <View className="h-6 bg-neutral-900 rounded mb-4 w-14"></View>
-        <View className="h-10 bg-neutral-900 rounded-lg mb-2 w-1/2"></View>
-        <View className="h-3 bg-neutral-900 rounded mb-3 w-8"></View>
-        <View className="flex flex-row space-x-1 mb-8">
-          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
-          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
-          <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
-        </View>
-        <View className="h-3 bg-neutral-900 rounded w-2/3 mb-1"></View>
-        <View className="h-10 bg-neutral-900 rounded-lg w-full mb-2"></View>
-        <View className="h-12 bg-neutral-900 rounded-lg w-full mb-2"></View>
-        <View className="h-24 bg-neutral-900 rounded-lg mb-1 w-full"></View>
-      </Animated.View>
-      {item && <ItemContent item={item} />}
-    </View>
-  );
-};
-
-export default Page;

app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx

@@ -1,95 +0,0 @@
-import {router, useLocalSearchParams, useSegments,} from "expo-router";
-import React, {useMemo,} from "react";
-import {TouchableOpacity} from "react-native";
-import {useInfiniteQuery} from "@tanstack/react-query";
-import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
-import {Text} from "@/components/common/Text";
-import {Image} from "expo-image";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import {COMPANY_LOGO_IMAGE_FILTER} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
-import {uniqBy} from "lodash";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const {jellyseerrApi} = useJellyseerr();
-
-  const {companyId, name, image, type} = local as unknown as {
-    companyId: string,
-    name: string,
-    image: string,
-    type: DiscoverSliderType
-  };
-
-  const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
-    queryKey: ["jellyseerr", "company", type, companyId],
-    queryFn: async ({pageParam}) => {
-      let params: any = {
-        page: Number(pageParam),
-      };
-
-      return jellyseerrApi?.discover(
-       (
-         type == DiscoverSliderType.NETWORKS
-           ? Endpoints.DISCOVER_TV_NETWORK
-           : Endpoints.DISCOVER_MOVIES_STUDIO
-       ) + `/${companyId}`,
-        params
-      )
-    },
-    enabled: !!jellyseerrApi && !!companyId,
-    initialPageParam: 1,
-    getNextPageParam: (lastPage, pages) =>
-      (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
-      1,
-    staleTime: 0,
-  });
-
-  const flatData = useMemo(
-    () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
-    [data]
-  );
-
-  const backdrops = useMemo(
-    () => jellyseerrApi
-      ? flatData.map((r) => jellyseerrApi.imageProxy((r as  TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
-      : [],
-    [jellyseerrApi, flatData]
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={flatData}
-      images={backdrops}
-      listHeader=""
-      keyExtractor={(item) => item.id.toString()}
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage()
-        }
-      }}
-      logo={
-        <Image
-          id={companyId}
-          key={companyId}
-          className="bottom-1 w-1/2"
-          source={{
-            uri: jellyseerrApi?.imageProxy(image, COMPANY_LOGO_IMAGE_FILTER),
-          }}
-          cachePolicy={"memory-disk"}
-          contentFit="contain"
-          style={{
-            aspectRatio: "4/3",
-          }}
-        />
-      }
-      renderItem={(item, index) =>
-        <JellyseerrPoster item={item as MovieResult | TvResult} />
-      }
-    />
-  );
-}

app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx

@@ -1,87 +0,0 @@
-import {router, useLocalSearchParams, useSegments,} from "expo-router";
-import React, {useMemo,} from "react";
-import {TouchableOpacity} from "react-native";
-import {useInfiniteQuery} from "@tanstack/react-query";
-import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
-import {Text} from "@/components/common/Text";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import {uniqBy} from "lodash";
-import {textShadowStyle} from "@/components/jellyseerr/discover/GenericSlideCard";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const {jellyseerrApi} = useJellyseerr();
-
-  const {genreId, name, type} = local as unknown as {
-    genreId: string,
-    name: string,
-    type: DiscoverSliderType
-  };
-
-  const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
-    queryKey: ["jellyseerr", "company", type, genreId],
-    queryFn: async ({pageParam}) => {
-      let params: any = {
-        page: Number(pageParam),
-        genre: genreId
-      };
-
-      return jellyseerrApi?.discover(
-         type == DiscoverSliderType.MOVIE_GENRES
-           ? Endpoints.DISCOVER_MOVIES
-           : Endpoints.DISCOVER_TV,
-        params
-      )
-    },
-    enabled: !!jellyseerrApi && !!genreId,
-    initialPageParam: 1,
-    getNextPageParam: (lastPage, pages) =>
-      (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
-      1,
-    staleTime: 0,
-  });
-
-  const flatData = useMemo(
-    () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
-    [data]
-  );
-
-  const backdrops = useMemo(
-    () => jellyseerrApi
-      ? flatData.map((r) => jellyseerrApi.imageProxy((r as  TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
-      : [],
-    [jellyseerrApi, flatData]
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={flatData}
-      images={backdrops}
-      listHeader=""
-      keyExtractor={(item) => item.id.toString()}
-      onEndReached={() => {
-        if (hasNextPage) {
-          fetchNextPage()
-        }
-      }}
-      logo={
-        <Text
-          className="text-4xl font-bold text-center bottom-1"
-          style={{
-            ...textShadowStyle.shadow,
-            shadowRadius: 10
-          }}>
-          {name}
-        </Text>
-      }
-      renderItem={(item, index) =>
-        <JellyseerrPoster item={item as MovieResult | TvResult} />
-      }
-    />
-  );
-}

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

@@ -1,360 +0,0 @@
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { GenreTags } from "@/components/GenreTags";
-import Cast from "@/components/jellyseerr/Cast";
-import DetailFacts from "@/components/jellyseerr/DetailFacts";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { JellyserrRatings } from "@/components/Ratings";
-import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
-import { ItemActions } from "@/components/series/SeriesActions";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
-import {
-  IssueType,
-  IssueTypeName,
-} from "@/utils/jellyseerr/server/constants/issue";
-import { MediaType } from "@/utils/jellyseerr/server/constants/media";
-import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
-import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-import { useTranslation } from "react-i18next";
-import { Ionicons } from "@expo/vector-icons";
-import {
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetModal,
-  BottomSheetTextInput,
-  BottomSheetView,
-} from "@gorhom/bottom-sheet";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation } from "expo-router";
-import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
-import { TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import * as DropdownMenu from "zeego/dropdown-menu";
-import RequestModal from "@/components/jellyseerr/RequestModal";
-import {ANIME_KEYWORD_ID} from "@/utils/jellyseerr/server/api/themoviedb/constants";
-import {MediaRequestBody} from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
-
-const Page: React.FC = () => {
-  const insets = useSafeAreaInsets();
-  const params = useLocalSearchParams();
-  const { t } = useTranslation();
-
-  const { mediaTitle, releaseYear, posterSrc, ...result } =
-    params as unknown as {
-      mediaTitle: string;
-      releaseYear: number;
-      canRequest: string;
-      posterSrc: string;
-    } & Partial<MovieResult | TvResult>;
-
-  const navigation = useNavigation();
-  const { jellyseerrApi, requestMedia } = useJellyseerr();
-
-  const [issueType, setIssueType] = useState<IssueType>();
-  const [issueMessage, setIssueMessage] = useState<string>();
-  const advancedReqModalRef = useRef<BottomSheetModal>(null);
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-
-  const {
-    data: details,
-    isFetching,
-    isLoading,
-    refetch,
-  } = useQuery({
-    enabled: !!jellyseerrApi && !!result && !!result.id,
-    queryKey: ["jellyseerr", "detail", result.mediaType, result.id],
-    staleTime: 0,
-    refetchOnMount: true,
-    refetchOnReconnect: true,
-    refetchOnWindowFocus: true,
-    retryOnMount: true,
-    refetchInterval: 0,
-    queryFn: async () => {
-      return result.mediaType === MediaType.MOVIE
-        ? jellyseerrApi?.movieDetails(result.id!!)
-        : jellyseerrApi?.tvDetails(result.id!!);
-    },
-  });
-
-  const [canRequest, hasAdvancedRequestPermission] = useJellyseerrCanRequest(details);
-
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop
-        {...props}
-        disappearsOnIndex={-1}
-        appearsOnIndex={0}
-      />
-    ),
-    []
-  );
-
-  const submitIssue = useCallback(() => {
-    if (result.id && issueType && issueMessage && details) {
-      jellyseerrApi
-        ?.submitIssue(details.mediaInfo.id, Number(issueType), issueMessage)
-        .then(() => {
-          setIssueType(undefined);
-          setIssueMessage(undefined);
-          bottomSheetModalRef?.current?.close();
-        });
-    }
-  }, [jellyseerrApi, details, result, issueType, issueMessage]);
-
-  const request = useCallback(async () => {
-    const body: MediaRequestBody = {
-      mediaId: Number(result.id!!),
-      mediaType: result.mediaType!!,
-      tvdbId: details?.externalIds?.tvdbId,
-      seasons: (details as TvDetails)?.seasons
-        ?.filter?.((s) => s.seasonNumber !== 0)
-        ?.map?.((s) => s.seasonNumber),
-    }
-
-    if (hasAdvancedRequestPermission) {
-      advancedReqModalRef?.current?.present?.(body)
-      return
-    }
-
-    requestMedia(mediaTitle, body, refetch);
-  }, [details, result, requestMedia, hasAdvancedRequestPermission]);
-
-  const isAnime = useMemo(
-    () => (details?.keywords.some(k => k.id === ANIME_KEYWORD_ID) || false) && result.mediaType === MediaType.TV,
-    [details]
-  )
-
-  useEffect(() => {
-    if (details) {
-      navigation.setOptions({
-        headerRight: () => (
-          <TouchableOpacity className="rounded-full p-2 bg-neutral-800/80">
-            <ItemActions item={details} />
-          </TouchableOpacity>
-        ),
-      });
-    }
-  }, [details]);
-
-  return (
-    <View
-      className="flex-1 relative"
-      style={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      <ParallaxScrollView
-        className="flex-1 opacity-100"
-        headerHeight={300}
-        headerImage={
-          <View>
-            {result.backdropPath ? (
-              <Image
-                cachePolicy={"memory-disk"}
-                transition={300}
-                style={{
-                  width: "100%",
-                  height: "100%",
-                }}
-                source={{
-                  uri: jellyseerrApi?.imageProxy(
-                    result.backdropPath,
-                    "w1920_and_h800_multi_faces"
-                  ),
-                }}
-              />
-            ) : (
-              <View
-                style={{
-                  width: "100%",
-                  height: "100%",
-                }}
-                className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
-              >
-                <Ionicons
-                  name="image-outline"
-                  size={24}
-                  color="white"
-                  style={{ opacity: 0.4 }}
-                />
-              </View>
-            )}
-          </View>
-        }
-      >
-        <View className="flex flex-col">
-          <View className="space-y-4">
-            <View className="px-4">
-              <View className="flex flex-row justify-between w-full">
-                <View className="flex flex-col w-56">
-                  <JellyserrRatings result={result as MovieResult | TvResult} />
-                  <Text
-                    uiTextView
-                    selectable
-                    className="font-bold text-2xl mb-1"
-                  >
-                    {mediaTitle}
-                  </Text>
-                  <Text className="opacity-50">{releaseYear}</Text>
-                </View>
-                <Image
-                  className="absolute bottom-1 right-1 rounded-lg w-28 aspect-[10/15] border-2 border-neutral-800/50 drop-shadow-2xl"
-                  cachePolicy={"memory-disk"}
-                  transition={300}
-                  source={{
-                    uri: posterSrc,
-                  }}
-                />
-              </View>
-              <View className="mb-4">
-                <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
-              </View>
-              {isLoading || isFetching ? (
-                <Button loading={true} disabled={true} color="purple"></Button>
-              ) : canRequest ? (
-                <Button color="purple" onPress={request}>
-                  {t("jellyseerr.request_button")}
-                </Button>
-              ) : (
-                <Button
-                  className="bg-yellow-500/50 border-yellow-400 ring-yellow-400 text-yellow-100"
-                  color="transparent"
-                  onPress={() => bottomSheetModalRef?.current?.present()}
-                  iconLeft={
-                    <Ionicons name="warning-outline" size={24} color="white" />
-                  }
-                  style={{
-                    borderWidth: 1,
-                    borderStyle: "solid",
-                  }}
-                >
-                  {t("jellyseerr.report_issue_button")}
-                </Button>
-              )}
-              <OverviewText text={result.overview} className="mt-4" />
-            </View>
-
-            {result.mediaType === MediaType.TV && (
-              <JellyseerrSeasons
-                isLoading={isLoading || isFetching}
-                result={result as TvResult}
-                details={details as TvDetails}
-                refetch={refetch}
-                hasAdvancedRequest={hasAdvancedRequestPermission}
-                onAdvancedRequest={(data) =>
-                  advancedReqModalRef?.current?.present(data)
-              }
-              />
-            )}
-            <DetailFacts
-              className="p-2 border border-neutral-800 bg-neutral-900 rounded-xl"
-              details={details}
-            />
-            <Cast details={details} />
-          </View>
-        </View>
-      </ParallaxScrollView>
-      <RequestModal
-        ref={advancedReqModalRef}
-        title={mediaTitle}
-        id={result.id!!}
-        type={result.mediaType as MediaType}
-        isAnime={isAnime}
-        onRequested={() => {
-          advancedReqModalRef?.current?.close()
-          refetch()
-        }}
-      />
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        enableDynamicSizing
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        backdropComponent={renderBackdrop}
-      >
-        <BottomSheetView>
-          <View className="flex flex-col space-y-4 px-4 pb-8 pt-2">
-            <View>
-              <Text className="font-bold text-2xl text-neutral-100">
-                {t("jellyseerr.whats_wrong")}
-              </Text>
-            </View>
-            <View className="flex flex-col space-y-2 items-start">
-              <View className="flex flex-col">
-                <DropdownMenu.Root>
-                  <DropdownMenu.Trigger>
-                    <View className="flex flex-col">
-                      <Text className="opacity-50 mb-1 text-xs">
-                        {t("jellyseerr.issue_type")}
-                      </Text>
-                      <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
-                        <Text style={{}} className="" numberOfLines={1}>
-                          {issueType
-                            ? IssueTypeName[issueType]
-                            : t("jellyseerr.select_an_issue")}
-                        </Text>
-                      </TouchableOpacity>
-                    </View>
-                  </DropdownMenu.Trigger>
-                  <DropdownMenu.Content
-                    loop={false}
-                    side="bottom"
-                    align="center"
-                    alignOffset={0}
-                    avoidCollisions={true}
-                    collisionPadding={0}
-                    sideOffset={0}
-                  >
-                    <DropdownMenu.Label>{t("jellyseerr.types")}</DropdownMenu.Label>
-                    {Object.entries(IssueTypeName)
-                      .reverse()
-                      .map(([key, value], idx) => (
-                        <DropdownMenu.Item
-                          key={value}
-                          onSelect={() =>
-                            setIssueType(key as unknown as IssueType)
-                          }
-                        >
-                          <DropdownMenu.ItemTitle>
-                            {value}
-                          </DropdownMenu.ItemTitle>
-                        </DropdownMenu.Item>
-                      ))}
-                  </DropdownMenu.Content>
-                </DropdownMenu.Root>
-              </View>
-
-              <View className="p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full">
-                <BottomSheetTextInput
-                  multiline
-                  maxLength={254}
-                  style={{ color: "white" }}
-                  clearButtonMode="always"
-                  placeholder={t("jellyseerr.describe_the_issue")}
-                  placeholderTextColor="#9CA3AF"
-                  // Issue with multiline + Textinput inside a portal
-                  // https://github.com/callstack/react-native-paper/issues/1668
-                  defaultValue={issueMessage}
-                  onChangeText={setIssueMessage}
-                />
-              </View>
-            </View>
-            <Button className="mt-auto" onPress={submitIssue} color="purple">
-              {t("jellyseerr.submit_button")}
-            </Button>
-          </View>
-        </BottomSheetView>
-      </BottomSheetModal>
-    </View>
-  );
-};
-
-export default Page;

app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx

@@ -1,110 +0,0 @@
-import {
-  useLocalSearchParams,
-  useSegments,
-} from "expo-router";
-import React, { useMemo } from "react";
-import { useQuery } from "@tanstack/react-query";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { Text } from "@/components/common/Text";
-import { Image } from "expo-image";
-import { OverviewText } from "@/components/OverviewText";
-import {orderBy, uniqBy} from "lodash";
-import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
-import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
-import {MovieResult, TvResult} from "@/utils/jellyseerr/server/models/Search";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const local = useLocalSearchParams();
-  const { t } = useTranslation();
-
-  const { jellyseerrApi, jellyseerrUser } = useJellyseerr();
-
-  const { personId } = local as { personId: string };
-
-  const { data, isLoading, isFetching } = useQuery({
-    queryKey: ["jellyseerr", "person", personId],
-    queryFn: async () => ({
-      details: await jellyseerrApi?.personDetails(personId),
-      combinedCredits: await jellyseerrApi?.personCombinedCredits(personId),
-    }),
-    enabled: !!jellyseerrApi && !!personId,
-  });
-
-  const locale = useMemo(() => {
-    return jellyseerrUser?.settings?.locale || "en";
-  }, [jellyseerrUser]);
-
-  const region = useMemo(
-    () => jellyseerrUser?.settings?.region || "US",
-    [jellyseerrUser]
-  );
-
-  const castedRoles: PersonCreditCast[] = useMemo(
-    () =>
-      uniqBy(orderBy(
-        data?.combinedCredits?.cast,
-        ["voteCount", "voteAverage"],
-        "desc"
-      ), 'id'),
-    [data?.combinedCredits]
-  );
-  const backdrops = useMemo(
-    () => jellyseerrApi
-      ? castedRoles.map((c) => jellyseerrApi.imageProxy(c.backdropPath, "w1920_and_h800_multi_faces"))
-      : [],
-    [jellyseerrApi, data?.combinedCredits]
-  );
-
-  return (
-    <ParallaxSlideShow
-      data={castedRoles}
-      images={backdrops}
-      listHeader={t("jellyseerr.appearances")}
-      keyExtractor={(item) => item.id.toString()}
-      logo={
-        <Image
-          key={data?.details?.id}
-          id={data?.details?.id.toString()}
-          className="rounded-full bottom-1"
-          source={{
-            uri: jellyseerrApi?.imageProxy(
-              data?.details?.profilePath,
-              "w600_and_h600_bestv2"
-            ),
-          }}
-          cachePolicy={"memory-disk"}
-          contentFit="cover"
-          style={{
-            width: 125,
-            height: 125,
-          }}
-        />
-      }
-      HeaderContent={() => (
-        <>
-          <Text className="font-bold text-2xl mb-1">
-            {data?.details?.name}
-          </Text>
-          <Text className="opacity-50">
-            {t("jellyseerr.born")}{" "}
-            {new Date(data?.details?.birthday!!).toLocaleDateString(
-              `${locale}-${region}`,
-              {
-                year: "numeric",
-                month: "long",
-                day: "numeric",
-              }
-            )}{" "}
-            | {data?.details?.placeOfBirth}
-          </Text>
-        </>
-      )}
-      MainContent={() => (
-        <OverviewText text={data?.details?.biography} className="mt-4" />
-      )}
-      renderItem={(item, index) => <JellyseerrPoster item={item as MovieResult | TvResult} />}
-    />
-  );
-}

app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/_layout.tsx

@@ -1,49 +0,0 @@
-import type {
-  MaterialTopTabNavigationEventMap,
-  MaterialTopTabNavigationOptions,
-} from "@react-navigation/material-top-tabs";
-import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
-import { ParamListBase, TabNavigationState } from "@react-navigation/native";
-import { Stack, withLayoutContext } from "expo-router";
-import React from "react";
-
-const { Navigator } = createMaterialTopTabNavigator();
-
-export const Tab = withLayoutContext<
-  MaterialTopTabNavigationOptions,
-  typeof Navigator,
-  TabNavigationState<ParamListBase>,
-  MaterialTopTabNavigationEventMap
->(Navigator);
-
-const Layout = () => {
-  return (
-    <>
-      <Stack.Screen options={{ title: "Live TV" }} />
-      <Tab
-        initialRouteName="programs"
-        keyboardDismissMode="none"
-        screenOptions={{
-          tabBarBounces: true,
-          tabBarLabelStyle: { fontSize: 10 },
-          tabBarItemStyle: {
-            width: 100,
-          },
-          tabBarStyle: { backgroundColor: "black" },
-          animationEnabled: true,
-          lazy: true,
-          swipeEnabled: true,
-          tabBarIndicatorStyle: { backgroundColor: "#9334E9" },
-          tabBarScrollEnabled: true,
-        }}
-      >
-        <Tab.Screen name="programs" />
-        <Tab.Screen name="guide" />
-        <Tab.Screen name="channels" />
-        <Tab.Screen name="recordings" />
-      </Tab>
-    </>
-  );
-};
-
-export default Layout;

app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/channels.tsx

@@ -1,56 +0,0 @@
-import { ItemImage } from "@/components/common/ItemImage";
-import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { FlashList } from "@shopify/flash-list";
-import { useQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
-import React from "react";
-import { View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-export default function page() {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const insets = useSafeAreaInsets();
-
-  const { data: channels } = useQuery({
-    queryKey: ["livetv", "channels"],
-    queryFn: async () => {
-      const res = await getLiveTvApi(api!).getLiveTvChannels({
-        startIndex: 0,
-        limit: 500,
-        enableFavoriteSorting: true,
-        userId: user?.Id,
-        addCurrentProgram: false,
-        enableUserData: false,
-        enableImageTypes: ["Primary"],
-      });
-      return res.data;
-    },
-  });
-
-  return (
-    <View className="flex flex-1">
-      <FlashList
-        data={channels?.Items}
-        estimatedItemSize={76}
-        renderItem={({ item }) => (
-          <View className="flex flex-row items-center px-4 mb-2">
-            <View className="w-22 mr-4 rounded-lg overflow-hidden">
-              <ItemImage
-                style={{
-                  aspectRatio: "1/1",
-                  width: 60,
-                  borderRadius: 8,
-                }}
-                item={item}
-              />
-            </View>
-            <Text className="font-bold">{item.Name}</Text>
-          </View>
-        )}
-      />
-    </View>
-  );
-}

app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx

@@ -1,221 +0,0 @@
-import { ItemImage } from "@/components/common/ItemImage";
-import { Text } from "@/components/common/Text";
-import { HourHeader } from "@/components/livetv/HourHeader";
-import { LiveTVGuideRow } from "@/components/livetv/LiveTVGuideRow";
-import { TAB_HEIGHT } from "@/constants/Values";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { Ionicons } from "@expo/vector-icons";
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtom } from "jotai";
-import React, { useCallback, useMemo, useState } from "react";
-import {
-  Button,
-  Dimensions,
-  ScrollView,
-  TouchableOpacity,
-  View,
-} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
-
-const HOUR_HEIGHT = 30;
-const ITEMS_PER_PAGE = 20;
-
-const MemoizedLiveTVGuideRow = React.memo(LiveTVGuideRow);
-
-export default function page() {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const insets = useSafeAreaInsets();
-  const [date, setDate] = useState<Date>(new Date());
-  const [currentPage, setCurrentPage] = useState(1);
-
-  const { data: guideInfo } = useQuery({
-    queryKey: ["livetv", "guideInfo"],
-    queryFn: async () => {
-      const res = await getLiveTvApi(api!).getGuideInfo();
-      return res.data;
-    },
-  });
-
-  const { data: channels } = useQuery({
-    queryKey: ["livetv", "channels", currentPage],
-    queryFn: async () => {
-      const res = await getLiveTvApi(api!).getLiveTvChannels({
-        startIndex: (currentPage - 1) * ITEMS_PER_PAGE,
-        limit: ITEMS_PER_PAGE,
-        enableFavoriteSorting: true,
-        userId: user?.Id,
-        addCurrentProgram: false,
-        enableUserData: false,
-        enableImageTypes: ["Primary"],
-      });
-      return res.data;
-    },
-  });
-
-  const { data: programs } = useQuery({
-    queryKey: ["livetv", "programs", date, currentPage],
-    queryFn: async () => {
-      const startOfDay = new Date(date);
-      startOfDay.setHours(0, 0, 0, 0);
-      const endOfDay = new Date(date);
-      endOfDay.setHours(23, 59, 59, 999);
-
-      const now = new Date();
-      const isToday = startOfDay.toDateString() === now.toDateString();
-
-      const res = await getLiveTvApi(api!).getPrograms({
-        getProgramsDto: {
-          MaxStartDate: endOfDay.toISOString(),
-          MinEndDate: isToday ? now.toISOString() : startOfDay.toISOString(),
-          ChannelIds: channels?.Items?.map((c) => c.Id).filter(
-            Boolean
-          ) as string[],
-          ImageTypeLimit: 1,
-          EnableImages: false,
-          SortBy: ["StartDate"],
-          EnableTotalRecordCount: false,
-          EnableUserData: false,
-        },
-      });
-      return res.data;
-    },
-    enabled: !!channels,
-  });
-
-  const screenWidth = Dimensions.get("window").width;
-
-  const [scrollX, setScrollX] = useState(0);
-
-  const handleNextPage = useCallback(() => {
-    setCurrentPage((prev) => prev + 1);
-  }, []);
-
-  const handlePrevPage = useCallback(() => {
-    setCurrentPage((prev) => Math.max(1, prev - 1));
-  }, []);
-
-  return (
-    <ScrollView
-      nestedScrollEnabled
-      contentInsetAdjustmentBehavior="automatic"
-      key={"home"}
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 16,
-      }}
-    >
-      <PageButtons
-        currentPage={currentPage}
-        onPrevPage={handlePrevPage}
-        onNextPage={handleNextPage}
-        isNextDisabled={
-          !channels || (channels?.Items?.length || 0) < ITEMS_PER_PAGE
-        }
-      />
-
-      <View className="flex flex-row">
-        <View className="flex flex-col w-[64px]">
-          <View
-            style={{
-              height: HOUR_HEIGHT,
-            }}
-            className="bg-neutral-800"
-          ></View>
-          {channels?.Items?.map((c, i) => (
-            <View className="h-16 w-16 mr-4 rounded-lg overflow-hidden" key={i}>
-              <ItemImage
-                style={{
-                  width: "100%",
-                  height: "100%",
-                  resizeMode: "contain",
-                }}
-                item={c}
-              />
-            </View>
-          ))}
-        </View>
-        <ScrollView
-          style={{
-            width: screenWidth - 64,
-          }}
-          horizontal
-          scrollEnabled
-          onScroll={(e) => {
-            setScrollX(e.nativeEvent.contentOffset.x);
-          }}
-        >
-          <View className="flex flex-col">
-            <HourHeader height={HOUR_HEIGHT} />
-            {channels?.Items?.map((c, i) => (
-              <MemoizedLiveTVGuideRow
-                channel={c}
-                programs={programs?.Items}
-                key={c.Id}
-                scrollX={scrollX}
-              />
-            ))}
-          </View>
-        </ScrollView>
-      </View>
-    </ScrollView>
-  );
-}
-
-interface PageButtonsProps {
-  currentPage: number;
-  onPrevPage: () => void;
-  onNextPage: () => void;
-  isNextDisabled: boolean;
-}
-
-const PageButtons: React.FC<PageButtonsProps> = ({
-  currentPage,
-  onPrevPage,
-  onNextPage,
-  isNextDisabled,
-}) => {
-  const { t } = useTranslation();
-  return (
-    <View className="flex flex-row justify-between items-center bg-neutral-800 w-full px-4 py-2">
-      <TouchableOpacity
-        onPress={onPrevPage}
-        disabled={currentPage === 1}
-        className="flex flex-row items-center"
-      >
-        <Ionicons
-          name="chevron-back"
-          size={24}
-          color={currentPage === 1 ? "gray" : "white"}
-        />
-        <Text
-          className={`ml-1 ${
-            currentPage === 1 ? "text-gray-500" : "text-white"
-          }`}
-        >
-          {t("live_tv.previous")}
-        </Text>
-      </TouchableOpacity>
-      <Text className="text-white">Page {currentPage}</Text>
-      <TouchableOpacity
-        onPress={onNextPage}
-        disabled={isNextDisabled}
-        className="flex flex-row items-center"
-      >
-        <Text
-          className={`mr-1 ${isNextDisabled ? "text-gray-500" : "text-white"}`}
-        >
-          {t("live_tv.next")}
-        </Text>
-        <Ionicons
-          name="chevron-forward"
-          size={24}
-          color={isNextDisabled ? "gray" : "white"}
-        />
-      </TouchableOpacity>
-    </View>
-  );
-};

app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/programs.tsx

@@ -1,147 +0,0 @@
-import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
-import { TAB_HEIGHT } from "@/constants/Values";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
-import { useAtom } from "jotai";
-import React from "react";
-import { ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const insets = useSafeAreaInsets();
-
-  const { t } = useTranslation();
-
-  return (
-    <ScrollView
-      nestedScrollEnabled
-      contentInsetAdjustmentBehavior="automatic"
-      key={"home"}
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-        paddingBottom: 16,
-        paddingTop: 8,
-      }}
-    >
-      <View className="flex flex-col space-y-2">
-        <ScrollingCollectionList
-          queryKey={["livetv", "recommended"]}
-          title={t("live_tv.on_now")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getRecommendedPrograms({
-              userId: user?.Id,
-              isAiring: true,
-              limit: 24,
-              imageTypeLimit: 1,
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo", "PrimaryImageAspectRatio"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-        <ScrollingCollectionList
-          queryKey={["livetv", "shows"]}
-          title={t("live_tv.shows")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getLiveTvPrograms({
-              userId: user?.Id,
-              hasAired: false,
-              limit: 9,
-              isMovie: false,
-              isSeries: true,
-              isSports: false,
-              isNews: false,
-              isKids: false,
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo", "PrimaryImageAspectRatio"],
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-        <ScrollingCollectionList
-          queryKey={["livetv", "movies"]}
-          title={t("live_tv.movies")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getLiveTvPrograms({
-              userId: user?.Id,
-              hasAired: false,
-              limit: 9,
-              isMovie: true,
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo"],
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-        <ScrollingCollectionList
-          queryKey={["livetv", "sports"]}
-          title={t("live_tv.sports")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getLiveTvPrograms({
-              userId: user?.Id,
-              hasAired: false,
-              limit: 9,
-              isSports: true,
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo"],
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-        <ScrollingCollectionList
-          queryKey={["livetv", "kids"]}
-          title={t("live_tv.for_kids")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getLiveTvPrograms({
-              userId: user?.Id,
-              hasAired: false,
-              limit: 9,
-              isKids: true,
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo"],
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-        <ScrollingCollectionList
-          queryKey={["livetv", "news"]}
-          title={t("live_tv.news")}
-          queryFn={async () => {
-            if (!api) return [] as BaseItemDto[];
-            const res = await getLiveTvApi(api).getLiveTvPrograms({
-              userId: user?.Id,
-              hasAired: false,
-              limit: 9,
-              isNews: true,
-              enableTotalRecordCount: false,
-              fields: ["ChannelInfo"],
-              enableImageTypes: ["Primary", "Thumb", "Backdrop"],
-            });
-            return res.data.Items || [];
-          }}
-          orientation="horizontal"
-        />
-      </View>
-    </ScrollView>
-  );
-}

app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/recordings.tsx

@@ -1,13 +0,0 @@
-import { Text } from "@/components/common/Text";
-import React from "react";
-import { View } from "react-native";
-import { useTranslation } from "react-i18next";
-
-export default function page() {
-  const { t } = useTranslation();
-  return (
-    <View className="flex items-center justify-center h-full -mt-12">
-      <Text>{t("live_tv.coming_soon")}</Text>
-    </View>
-  );
-}

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

@@ -1,8 +1,8 @@
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { useLocalSearchParams, useNavigation } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo } from "react";
+import React, { useCallback, useEffect, useLayoutEffect, useMemo } from "react";
 import { FlatList, useWindowDimensions, View } from "react-native";
 
 import { Text } from "@/components/common/Text";
@@ -12,7 +12,6 @@ import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
 import { ItemCardText } from "@/components/ItemCardText";
 import { Loader } from "@/components/Loader";
 import { ItemPoster } from "@/components/posters/ItemPoster";
-import { useOrientation } from "@/hooks/useOrientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import {
   genreFilterAtom,
@@ -29,10 +28,10 @@ import {
   tagsFilterAtom,
   yearFilterAtom,
 } from "@/utils/atoms/filters";
+import { orientationAtom } from "@/utils/atoms/orientation";
 import {
   BaseItemDto,
   BaseItemDtoQueryResult,
-  BaseItemKind,
 } from "@jellyfin/sdk/lib/generated-client/models";
 import {
   getFilterApi,
@@ -41,7 +40,8 @@ import {
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
+
+const MemoizedTouchableItemRouter = React.memo(TouchableItemRouter);
 
 const Page = () => {
   const searchParams = useLocalSearchParams();
@@ -56,23 +56,22 @@ const Page = () => {
   const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
   const [sortBy, _setSortBy] = useAtom(sortByAtom);
   const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
+  const [orientation] = useAtom(orientationAtom);
   const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
   const [sortOrderPreference, setOderByPreference] = useAtom(
     sortOrderPreferenceAtom
   );
 
-  const { orientation } = useOrientation();
-
-  const { t } = useTranslation();
-
   useEffect(() => {
     const sop = getSortOrderPreference(libraryId, sortOrderPreference);
     if (sop) {
+      console.log("getSortOrderPreference ~", sop, libraryId);
       _setSortOrder([sop]);
     } else {
       _setSortOrder([SortOrderOption.Ascending]);
     }
     const obp = getSortByPreference(libraryId, sortByPreference);
+    console.log("getSortByPreference ~", obp, libraryId);
     if (obp) {
       _setSortBy([obp]);
     } else {
@@ -84,6 +83,7 @@ const Page = () => {
     (sortBy: SortByOption[]) => {
       const sop = getSortByPreference(libraryId, sortByPreference);
       if (sortBy[0] !== sop) {
+        console.log("setSortByPreference ~", sortBy[0], libraryId);
         setSortByPreference({ ...sortByPreference, [libraryId]: sortBy[0] });
       }
       _setSortBy(sortBy);
@@ -95,6 +95,7 @@ const Page = () => {
     (sortOrder: SortOrderOption[]) => {
       const sop = getSortOrderPreference(libraryId, sortOrderPreference);
       if (sortOrder[0] !== sop) {
+        console.log("setSortOrderPreference ~", sortOrder[0], libraryId);
         setOderByPreference({
           ...sortOrderPreference,
           [libraryId]: sortOrder[0],
@@ -105,12 +106,11 @@ const Page = () => {
     [libraryId, sortOrderPreference]
   );
 
-  const nrOfCols = useMemo(() => {
+  const getNumberOfColumns = useCallback(() => {
-    if (screenWidth < 300) return 2;
+    if (orientation === ScreenOrientation.Orientation.PORTRAIT_UP) return 3;
-    if (screenWidth < 500) return 3;
+    if (screenWidth < 600) return 5;
-    if (screenWidth < 800) return 5;
+    if (screenWidth < 960) return 6;
-    if (screenWidth < 1000) return 6;
+    if (screenWidth < 1280) return 7;
-    if (screenWidth < 1500) return 7;
     return 6;
   }, [screenWidth, orientation]);
 
@@ -128,13 +128,6 @@ const Page = () => {
     staleTime: 60 * 1000,
   });
 
-  const navigation = useNavigation();
-  useEffect(() => {
-    navigation.setOptions({
-      title: library?.Name || "",
-    });
-  }, [library]);
-
   const fetchItems = useCallback(
     async ({
       pageParam,
@@ -143,18 +136,6 @@ const Page = () => {
     }): Promise<BaseItemDtoQueryResult | null> => {
       if (!api || !library) return null;
 
-      let itemType: BaseItemKind | undefined;
-
-      // This fix makes sure to only return 1 type of items, if defined.
-      // This is because the underlying directory some times contains other types, and we don't want to show them.
-      if (library.CollectionType === "movies") {
-        itemType = "Movie";
-      } else if (library.CollectionType === "tvshows") {
-        itemType = "Series";
-      } else if (library.CollectionType === "boxsets") {
-        itemType = "BoxSet";
-      }
-
       const response = await getItemsApi(api).getItems({
         userId: user?.Id,
         parentId: libraryId,
@@ -163,14 +144,12 @@ const Page = () => {
         sortBy: [sortBy[0], "SortName", "ProductionYear"],
         sortOrder: [sortOrder[0]],
         enableImageTypes: ["Primary", "Backdrop", "Banner", "Thumb"],
-        // true is needed for merged versions
+        recursive: false,
-        recursive: true,
         imageTypeLimit: 1,
         fields: ["PrimaryImageAspectRatio", "SortName"],
         genres: selectedGenres,
         tags: selectedTags,
         years: selectedYears.map((year) => parseInt(year)),
-        includeItemTypes: itemType ? [itemType] : undefined,
       });
 
       return response.data || null;
@@ -233,7 +212,7 @@ const Page = () => {
 
   const renderItem = useCallback(
     ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <TouchableItemRouter
+      <MemoizedTouchableItemRouter
         key={item.Id}
         style={{
           width: "100%",
@@ -244,10 +223,10 @@ const Page = () => {
         <View
           style={{
             alignSelf:
-              orientation === ScreenOrientation.OrientationLock.PORTRAIT_UP
+              orientation === ScreenOrientation.Orientation.PORTRAIT_UP
-                ? index % nrOfCols === 0
+                ? index % 3 === 0
                   ? "flex-end"
-                  : (index + 1) % nrOfCols === 0
+                  : (index + 1) % 3 === 0
                   ? "flex-start"
                   : "center"
                 : "center",
@@ -258,7 +237,7 @@ const Page = () => {
           <ItemPoster item={item} />
           <ItemCardText item={item} />
         </View>
-      </TouchableItemRouter>
+      </MemoizedTouchableItemRouter>
     ),
     [orientation]
   );
@@ -301,7 +280,7 @@ const Page = () => {
                   }}
                   set={setSelectedGenres}
                   values={selectedGenres}
-                  title={t("library.filters.genres")}
+                  title="Genres"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) =>
                     item.toLowerCase().includes(search.toLowerCase())
@@ -328,7 +307,7 @@ const Page = () => {
                   }}
                   set={setSelectedYears}
                   values={selectedYears}
-                  title={t("library.filters.years")}
+                  title="Years"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) => item.includes(search)}
                 />
@@ -353,7 +332,7 @@ const Page = () => {
                   }}
                   set={setSelectedTags}
                   values={selectedTags}
-                  title={t("library.filters.tags")}
+                  title="Tags"
                   renderItemLabel={(item) => item.toString()}
                   searchFilter={(item, search) =>
                     item.toLowerCase().includes(search.toLowerCase())
@@ -371,7 +350,7 @@ const Page = () => {
                   queryFn={async () => sortOptions.map((s) => s.key)}
                   set={setSortBy}
                   values={sortBy}
-                  title={t("library.filters.sort_by")}
+                  title="Sort By"
                   renderItemLabel={(item) =>
                     sortOptions.find((i) => i.key === item)?.value || ""
                   }
@@ -391,7 +370,7 @@ const Page = () => {
                   queryFn={async () => sortOrderOptions.map((s) => s.key)}
                   set={setSortOrder}
                   values={sortOrder}
-                  title={t("library.filters.sort_order")}
+                  title="Sort Order"
                   renderItemLabel={(item) =>
                     sortOrderOptions.find((i) => i.key === item)?.value || ""
                   }
@@ -437,25 +416,24 @@ const Page = () => {
   if (flatData.length === 0)
     return (
       <View className="h-full w-full flex justify-center items-center">
-        <Text className="text-lg text-neutral-500">{t("library.no_items_found")}</Text>
+        <Text className="text-lg text-neutral-500">No items found</Text>
       </View>
     );
 
   return (
     <FlashList
-      key={orientation}
       ListEmptyComponent={
         <View className="flex flex-col items-center justify-center h-full">
-          <Text className="font-bold text-xl text-neutral-500">{t("library.no_results")}</Text>
+          <Text className="font-bold text-xl text-neutral-500">No results</Text>
         </View>
       }
       contentInsetAdjustmentBehavior="automatic"
       data={flatData}
       renderItem={renderItem}
-      extraData={[orientation, nrOfCols]}
+      extraData={orientation}
       keyExtractor={keyExtractor}
       estimatedItemSize={244}
-      numColumns={nrOfCols}
+      numColumns={getNumberOfColumns()}
       onEndReached={() => {
         if (hasNextPage) {
           fetchNextPage();

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

@@ -4,12 +4,9 @@ import { Ionicons } from "@expo/vector-icons";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
-import { useTranslation } from "react-i18next";
 
 export default function IndexLayout() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings] = useSettings();
-
-  const { t } = useTranslation();
 
   if (!settings?.libraryOptions) return null;
 
@@ -20,15 +17,11 @@ export default function IndexLayout() {
         options={{
           headerShown: true,
           headerLargeTitle: true,
-          headerTitle: t("tabs.library"),
+          headerTitle: "Library",
           headerBlurEffect: "prominent",
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
           headerTransparent: Platform.OS === "ios" ? true : false,
           headerShadowVisible: false,
           headerRight: () => (
-            !pluginSettings?.libraryOptions?.locked &&
             <DropdownMenu.Root>
               <DropdownMenu.Trigger>
                 <Ionicons
@@ -46,11 +39,11 @@ export default function IndexLayout() {
                 side={"bottom"}
                 sideOffset={10}
               >
-                <DropdownMenu.Label>{t("library.options.display")}</DropdownMenu.Label>
+                <DropdownMenu.Label>Display</DropdownMenu.Label>
                 <DropdownMenu.Group key="display-group">
                   <DropdownMenu.Sub>
                     <DropdownMenu.SubTrigger key="image-style-trigger">
-                      {t("library.options.display")}
+                      Display
                     </DropdownMenu.SubTrigger>
                     <DropdownMenu.SubContent
                       alignOffset={-10}
@@ -73,7 +66,7 @@ export default function IndexLayout() {
                       >
                         <DropdownMenu.ItemIndicator />
                         <DropdownMenu.ItemTitle key="display-title-1">
-                          {t("library.options.row")}
+                          Row
                         </DropdownMenu.ItemTitle>
                       </DropdownMenu.CheckboxItem>
                       <DropdownMenu.CheckboxItem
@@ -90,14 +83,14 @@ export default function IndexLayout() {
                       >
                         <DropdownMenu.ItemIndicator />
                         <DropdownMenu.ItemTitle key="display-title-2">
-                          {t("library.options.list")}
+                          List
                         </DropdownMenu.ItemTitle>
                       </DropdownMenu.CheckboxItem>
                     </DropdownMenu.SubContent>
                   </DropdownMenu.Sub>
                   <DropdownMenu.Sub>
                     <DropdownMenu.SubTrigger key="image-style-trigger">
-                      {t("library.options.image_style")}
+                      Image style
                     </DropdownMenu.SubTrigger>
                     <DropdownMenu.SubContent
                       alignOffset={-10}
@@ -120,7 +113,7 @@ export default function IndexLayout() {
                       >
                         <DropdownMenu.ItemIndicator />
                         <DropdownMenu.ItemTitle key="poster-title">
-                          {t("library.options.poster")}
+                          Poster
                         </DropdownMenu.ItemTitle>
                       </DropdownMenu.CheckboxItem>
                       <DropdownMenu.CheckboxItem
@@ -137,7 +130,7 @@ export default function IndexLayout() {
                       >
                         <DropdownMenu.ItemIndicator />
                         <DropdownMenu.ItemTitle key="cover-title">
-                          {t("library.options.cover")}
+                          Cover
                         </DropdownMenu.ItemTitle>
                       </DropdownMenu.CheckboxItem>
                     </DropdownMenu.SubContent>
@@ -161,7 +154,7 @@ export default function IndexLayout() {
                   >
                     <DropdownMenu.ItemIndicator />
                     <DropdownMenu.ItemTitle key="show-titles-title">
-                      {t("library.options.show_titles")}
+                      Show titles
                     </DropdownMenu.ItemTitle>
                   </DropdownMenu.CheckboxItem>
                   <DropdownMenu.CheckboxItem
@@ -178,7 +171,7 @@ export default function IndexLayout() {
                   >
                     <DropdownMenu.ItemIndicator />
                     <DropdownMenu.ItemTitle key="show-stats-title">
-                      {t("library.options.show_stats")}
+                      Show stats
                     </DropdownMenu.ItemTitle>
                   </DropdownMenu.CheckboxItem>
                 </DropdownMenu.Group>
@@ -202,16 +195,6 @@ export default function IndexLayout() {
       {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
         <Stack.Screen key={name} name={name} options={options} />
       ))}
-      <Stack.Screen
-        name="collections/[collectionId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
     </Stack>
   );
 }

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

@@ -10,10 +10,9 @@ import {
 import { FlashList } from "@shopify/flash-list";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useAtom } from "jotai";
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 import { StyleSheet, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useTranslation } from "react-i18next";
 
 export default function index() {
   const [api] = useAtom(apiAtom);
@@ -21,29 +20,23 @@ export default function index() {
   const queryClient = useQueryClient();
   const [settings] = useSettings();
 
-  const { t } = useTranslation();
-
   const { data, isLoading: isLoading } = useQuery({
     queryKey: ["user-views", user?.Id],
     queryFn: async () => {
-      const response = await getUserViewsApi(api!).getUserViews({
+      if (!api || !user?.Id) {
-        userId: user?.Id,
+        return null;
+      }
+
+      const response = await getUserViewsApi(api).getUserViews({
+        userId: user.Id,
       });
 
       return response.data.Items || null;
     },
-    staleTime: 60,
+    enabled: !!api && !!user?.Id,
+    staleTime: 60 * 1000 * 60,
   });
 
-  const libraries = useMemo(
-    () =>
-      data
-        ?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!))
-        .filter((l) => l.CollectionType !== "music")
-        .filter((l) => l.CollectionType !== "books") || [],
-    [data, settings?.hiddenLibraries]
-  );
-
   useEffect(() => {
     for (const item of data || []) {
       queryClient.prefetchQuery({
@@ -70,10 +63,10 @@ export default function index() {
       </View>
     );
 
-  if (!libraries)
+  if (!data)
     return (
       <View className="h-full w-full flex justify-center items-center">
-        <Text className="text-lg text-neutral-500">{t("library.no_libraries_found")}</Text>
+        <Text className="text-lg text-neutral-500">No libraries found</Text>
       </View>
     );
 
@@ -88,7 +81,7 @@ export default function index() {
         paddingLeft: insets.left,
         paddingRight: insets.right,
       }}
-      data={libraries}
+      data={data}
       renderItem={({ item }) => <LibraryItemCard library={item} />}
       keyExtractor={(item) => item.Id || ""}
       ItemSeparatorComponent={() =>

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

@@ -1,13 +1,8 @@
-import {
+import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-  commonScreenOptions,
-  nestedTabPageScreenOptions,
-} from "@/components/stacks/NestedTabPageStack";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";
 
 export default function SearchLayout() {
-  const { t } = useTranslation();
   return (
     <Stack>
       <Stack.Screen
@@ -15,10 +10,7 @@ export default function SearchLayout() {
         options={{
           headerShown: true,
           headerLargeTitle: true,
-          headerTitle: t("tabs.search"),
+          headerTitle: "Search",
-          headerLargeStyle: {
-            backgroundColor: "black",
-          },
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios" ? true : false,
           headerShadowVisible: false,
@@ -27,20 +19,6 @@ export default function SearchLayout() {
       {Object.entries(nestedTabPageScreenOptions).map(([name, options]) => (
         <Stack.Screen key={name} name={name} options={options} />
       ))}
-      <Stack.Screen
-        name="collections/[collectionId]"
-        options={{
-          title: "",
-          headerShown: true,
-          headerBlurEffect: "prominent",
-          headerTransparent: Platform.OS === "ios" ? true : false,
-          headerShadowVisible: false,
-        }}
-      />
-      <Stack.Screen name="jellyseerr/page" options={commonScreenOptions} />
-      <Stack.Screen name="jellyseerr/person/[personId]" options={commonScreenOptions} />
-      <Stack.Screen name="jellyseerr/company/[companyId]" options={commonScreenOptions} />
-      <Stack.Screen name="jellyseerr/genre/[genreId]" options={commonScreenOptions} />
     </Stack>
   );
 }

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

@@ -1,17 +1,16 @@
+import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
-import { Tag } from "@/components/GenreTags";
 import { ItemCardText } from "@/components/ItemCardText";
-import { JellyserrIndexPage } from "@/components/jellyseerr/JellyseerrIndexPage";
+import { Loader } from "@/components/Loader";
+import AlbumCover from "@/components/posters/AlbumCover";
 import MoviePoster from "@/components/posters/MoviePoster";
 import SeriesPoster from "@/components/posters/SeriesPoster";
-import { LoadingSkeleton } from "@/components/search/LoadingSkeleton";
-import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 import {
   BaseItemDto,
   BaseItemKind,
@@ -31,9 +30,6 @@ import React, {
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDebounce } from "use-debounce";
-import { useTranslation } from "react-i18next";
-
-type SearchType = "Library" | "Discover";
 
 const exampleSearches = [
   "Lord of the rings",
@@ -48,11 +44,8 @@ export default function search() {
   const params = useLocalSearchParams();
   const insets = useSafeAreaInsets();
 
-  const { t } = useTranslation();
-
   const { q, prev } = params as { q: string; prev: Href<string> };
 
-  const [searchType, setSearchType] = useState<SearchType>("Library");
   const [search, setSearch] = useState<string>("");
 
   const [debouncedSearch] = useDebounce(search, 500);
@@ -61,7 +54,6 @@ export default function search() {
   const [user] = useAtom(userAtom);
 
   const [settings] = useSettings();
-  const { jellyseerrApi } = useJellyseerr();
 
   const searchEngine = useMemo(() => {
     return settings?.searchEngine || "Jellyfin";
@@ -79,9 +71,8 @@ export default function search() {
       types: BaseItemKind[];
       query: string;
     }): Promise<BaseItemDto[]> => {
-      if (!api || !query) return [];
+      if (!api) return [];
 
-      try {
       if (searchEngine === "Jellyfin") {
         const searchApi = await getSearchApi(api).getSearchHints({
           searchTerm: query,
@@ -89,18 +80,15 @@ export default function search() {
           includeItemTypes: types,
         });
 
-          return (searchApi.data.SearchHints as BaseItemDto[]) || [];
+        return searchApi.data.SearchHints as BaseItemDto[];
       } else {
-          if (!settings?.marlinServerUrl) return [];
+        const url = `${settings?.marlinServerUrl}/search?q=${encodeURIComponent(
-
+          query
-          const url = `${
+        )}&includeItemTypes=${types
-            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 [];
@@ -110,14 +98,10 @@ export default function search() {
           enableImageTypes: ["Primary", "Backdrop", "Thumb"],
         });
 
-          return (response2.data.Items as BaseItemDto[]) || [];
+        return response2.data.Items as BaseItemDto[];
-        }
-      } catch (error) {
-        console.error("Error during search:", error);
-        return []; // Ensure an empty array is returned in case of an error
       }
     },
-    [api, searchEngine, settings]
+    [api, settings]
   );
 
   const navigation = useNavigation();
@@ -125,7 +109,7 @@ export default function search() {
     if (Platform.OS === "ios")
       navigation.setOptions({
         headerSearchBarOptions: {
-          placeholder: t("search.search"),
+          placeholder: "Search...",
           onChangeText: (e: any) => {
             router.setParams({ q: "" });
             setSearch(e.nativeEvent.text);
@@ -143,7 +127,7 @@ export default function search() {
         query: debouncedSearch,
         types: ["Movie"],
       }),
-    enabled: searchType === "Library" && debouncedSearch.length > 0,
+    enabled: debouncedSearch.length > 0,
   });
 
   const { data: series, isFetching: l2 } = useQuery({
@@ -153,7 +137,7 @@ export default function search() {
         query: debouncedSearch,
         types: ["Series"],
       }),
-    enabled: searchType === "Library" && debouncedSearch.length > 0,
+    enabled: debouncedSearch.length > 0,
   });
 
   const { data: episodes, isFetching: l3 } = useQuery({
@@ -163,7 +147,7 @@ export default function search() {
         query: debouncedSearch,
         types: ["Episode"],
       }),
-    enabled: searchType === "Library" && debouncedSearch.length > 0,
+    enabled: debouncedSearch.length > 0,
   });
 
   const { data: collections, isFetching: l7 } = useQuery({
@@ -173,7 +157,7 @@ export default function search() {
         query: debouncedSearch,
         types: ["BoxSet"],
       }),
-    enabled: searchType === "Library" && debouncedSearch.length > 0,
+    enabled: debouncedSearch.length > 0,
   });
 
   const { data: actors, isFetching: l8 } = useQuery({
@@ -183,22 +167,55 @@ export default function search() {
         query: debouncedSearch,
         types: ["Person"],
       }),
-    enabled: searchType === "Library" && debouncedSearch.length > 0,
+    enabled: debouncedSearch.length > 0,
+  });
+
+  const { data: artists, isFetching: l4 } = useQuery({
+    queryKey: ["search", "artists", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicArtist"],
+      }),
+    enabled: debouncedSearch.length > 0,
+  });
+
+  const { data: albums, isFetching: l5 } = useQuery({
+    queryKey: ["search", "albums", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["MusicAlbum"],
+      }),
+    enabled: debouncedSearch.length > 0,
+  });
+
+  const { data: songs, isFetching: l6 } = useQuery({
+    queryKey: ["search", "songs", debouncedSearch],
+    queryFn: () =>
+      searchFn({
+        query: debouncedSearch,
+        types: ["Audio"],
+      }),
+    enabled: debouncedSearch.length > 0,
   });
 
   const noResults = useMemo(() => {
     return !(
+      artists?.length ||
+      albums?.length ||
+      songs?.length ||
       movies?.length ||
       episodes?.length ||
       series?.length ||
       collections?.length ||
       actors?.length
     );
-  }, [episodes, movies, series, collections, actors]);
+  }, [artists, episodes, albums, songs, movies, series, collections, actors]);
 
   const loading = useMemo(() => {
-    return l1 || l2 || l3 || l7 || l8;
+    return l1 || l2 || l3 || l4 || l5 || l6 || l7 || l8;
-  }, [l1, l2, l3, l7, l8]);
+  }, [l1, l2, l3, l4, l5, l6, l7, l8]);
 
   return (
     <>
@@ -210,55 +227,36 @@ export default function search() {
           paddingRight: insets.right,
         }}
       >
-        <View className="flex flex-col">
+        <View className="flex flex-col pt-4 pb-32">
           {Platform.OS === "android" && (
             <View className="mb-4 px-4">
               <Input
                 autoCorrect={false}
                 returnKeyType="done"
                 keyboardType="web-search"
-                placeholder={t("search.search_here")}
+                placeholder="Search here..."
                 value={search}
                 onChangeText={(text) => setSearch(text)}
               />
             </View>
           )}
-          {jellyseerrApi && (
+          {!!q && (
-            <View className="flex flex-row flex-wrap space-x-2 px-4 mb-2">
+            <View className="px-4 flex flex-col space-y-2">
-              <TouchableOpacity onPress={() => setSearchType("Library")}>
+              <Text className="text-neutral-500 ">
-                <Tag
+                Results for <Text className="text-purple-600">{q}</Text>
-                  text={t("search.library")}
+              </Text>
-                  textClass="p-1"
-                  className={
-                    searchType === "Library" ? "bg-purple-600" : undefined
-                  }
-                />
-              </TouchableOpacity>
-              <TouchableOpacity onPress={() => setSearchType("Discover")}>
-                <Tag
-                  text={t("search.discover")}
-                  textClass="p-1"
-                  className={
-                    searchType === "Discover" ? "bg-purple-600" : undefined
-                  }
-                />
-              </TouchableOpacity>
             </View>
           )}
-
-          <View className="mt-2">
-            <LoadingSkeleton isLoading={loading} />
-          </View>
-
-          {searchType === "Library" ? (
-            <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
           <SearchItemWrapper
-                header={t("search.movies")}
+            header="Movies"
             ids={movies?.map((m) => m.Id!)}
-                renderItem={(item: BaseItemDto) => (
+            renderItem={(data) => (
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
                   <TouchableItemRouter
                     key={item.Id}
-                    className="flex flex-col w-28 mr-2"
+                    className="flex flex-col w-28"
                     item={item}
                   >
                     <MoviePoster item={item} key={item.Id} />
@@ -271,14 +269,19 @@ export default function search() {
                   </TouchableItemRouter>
                 )}
               />
+            )}
+          />
           <SearchItemWrapper
             ids={series?.map((m) => m.Id!)}
-                header={t("search.series")}
+            header="Series"
-                renderItem={(item: BaseItemDto) => (
+            renderItem={(data) => (
-                  <TouchableItemRouter
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
                     key={item.Id}
-                    item={item}
+                    onPress={() => router.push(`/series/${item.Id}`)}
-                    className="flex flex-col w-28 mr-2"
+                    className="flex flex-col w-28"
                   >
                     <SeriesPoster item={item} key={item.Id} />
                     <Text numberOfLines={2} className="mt-2">
@@ -287,64 +290,135 @@ export default function search() {
                     <Text className="opacity-50 text-xs">
                       {item.ProductionYear}
                     </Text>
-                  </TouchableItemRouter>
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={episodes?.map((m) => m.Id!)}
-                header={t("search.episodes")}
+            header="Episodes"
-                renderItem={(item: BaseItemDto) => (
+            renderItem={(data) => (
-                  <TouchableItemRouter
+              <HorizontalScroll
-                    item={item}
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
                     key={item.Id}
-                    className="flex flex-col w-44 mr-2"
+                    onPress={() => router.push(`/items/page?id=${item.Id}`)}
+                    className="flex flex-col w-44"
                   >
                     <ContinueWatchingPoster item={item} />
                     <ItemCardText item={item} />
-                  </TouchableItemRouter>
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={collections?.map((m) => m.Id!)}
-                header={t("search.collections")}
+            header="Collections"
-                renderItem={(item: BaseItemDto) => (
+            renderItem={(data) => (
-                  <TouchableItemRouter
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
                     key={item.Id}
-                    item={item}
+                    className="flex flex-col w-28"
-                    className="flex flex-col w-28 mr-2"
+                    onPress={() => router.push(`/collections/${item.Id}`)}
                   >
                     <MoviePoster item={item} key={item.Id} />
                     <Text numberOfLines={2} className="mt-2">
                       {item.Name}
                     </Text>
-                  </TouchableItemRouter>
+                  </TouchableOpacity>
+                )}
+              />
             )}
           />
           <SearchItemWrapper
             ids={actors?.map((m) => m.Id!)}
-                header={t("search.actors")}
+            header="Actors"
-                renderItem={(item: BaseItemDto) => (
+            renderItem={(data) => (
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
                   <TouchableItemRouter
                     item={item}
                     key={item.Id}
-                    className="flex flex-col w-28 mr-2"
+                    className="flex flex-col w-28"
                   >
                     <MoviePoster item={item} />
                     <ItemCardText item={item} />
                   </TouchableItemRouter>
                 )}
               />
-            </View>
-          ) : (
-            <JellyserrIndexPage searchQuery={debouncedSearch} />
             )}
-
+          />
-          {searchType === "Library" && (
+          <SearchItemWrapper
-            <>
+            ids={artists?.map((m) => m.Id!)}
-              {!loading && noResults && debouncedSearch.length > 0 ? (
+            header="Artists"
+            renderItem={(data) => (
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+            )}
+          />
+          <SearchItemWrapper
+            ids={albums?.map((m) => m.Id!)}
+            header="Albums"
+            renderItem={(data) => (
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.Id} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+            )}
+          />
+          <SearchItemWrapper
+            ids={songs?.map((m) => m.Id!)}
+            header="Songs"
+            renderItem={(data) => (
+              <HorizontalScroll
+                data={data}
+                renderItem={(item) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className="flex flex-col w-28"
+                  >
+                    <AlbumCover id={item.AlbumId} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+            )}
+          />
+          {loading ? (
+            <View className="mt-4 flex justify-center items-center">
+              <Loader />
+            </View>
+          ) : noResults && debouncedSearch.length > 0 ? (
             <View>
               <Text className="text-center text-lg font-bold mt-4">
-                    {t("search.no_results_found_for")}
+                No results found for
               </Text>
               <Text className="text-xs text-purple-600 text-center">
                 "{debouncedSearch}"
@@ -363,10 +437,54 @@ export default function search() {
               ))}
             </View>
           ) : null}
-            </>
-          )}
         </View>
       </ScrollView>
     </>
   );
 }
+
+type Props = {
+  ids?: string[] | null;
+  renderItem: (data: BaseItemDto[]) => React.ReactNode;
+  header?: string;
+};
+
+const SearchItemWrapper: React.FC<Props> = ({ ids, renderItem, header }) => {
+  const [api] = useAtom(apiAtom);
+  const [user] = useAtom(userAtom);
+
+  const { data, isLoading: l1 } = useQuery({
+    queryKey: ["items", ids],
+    queryFn: async () => {
+      if (!user?.Id || !api || !ids || ids.length === 0) {
+        return [];
+      }
+
+      const itemPromises = ids.map((id) =>
+        getUserItemData({
+          api,
+          userId: user.Id,
+          itemId: id,
+        })
+      );
+
+      const results = await Promise.all(itemPromises);
+
+      // Filter out null items
+      return results.filter(
+        (item) => item !== null
+      ) as unknown as BaseItemDto[];
+    },
+    enabled: !!ids && ids.length > 0 && !!api && !!user?.Id,
+    staleTime: Infinity,
+  });
+
+  if (!data) return null;
+
+  return (
+    <>
+      <Text className="font-bold text-2xl px-4 my-2">{header}</Text>
+      {renderItem(data)}
+    </>
+  );
+};

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

@@ -1,139 +1,87 @@
-import React, { useCallback, useRef } from "react";
+import { TabBarIcon } from "@/components/navigation/TabBarIcon";
-import { Platform } from "react-native";
-import { useTranslation } from "react-i18next";
-
-import { useFocusEffect, useRouter, withLayoutContext } from "expo-router";
-
-import {
-  createNativeBottomTabNavigator,
-  NativeBottomTabNavigationEventMap,
-} from "@bottom-tabs/react-navigation";
-
-const { Navigator } = createNativeBottomTabNavigator();
-
-import { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
-
 import { Colors } from "@/constants/Colors";
-import { useSettings } from "@/utils/atoms/settings";
+import { BlurView } from "expo-blur";
-import { storage } from "@/utils/mmkv";
+import * as NavigationBar from "expo-navigation-bar";
-import type {
+import { Tabs } from "expo-router";
-  ParamListBase,
+import React, { useEffect } from "react";
-  TabNavigationState,
+import { Platform, StyleSheet } from "react-native";
-} from "@react-navigation/native";
-import { SystemBars } from "react-native-edge-to-edge";
-
-export const NativeTabs = withLayoutContext<
-  BottomTabNavigationOptions,
-  typeof Navigator,
-  TabNavigationState<ParamListBase>,
-  NativeBottomTabNavigationEventMap
->(Navigator);
 
 export default function TabLayout() {
-  const [settings] = useSettings();
+  useEffect(() => {
-  const { t } = useTranslation();
+    if (Platform.OS === "android") {
-  const router = useRouter();
+      NavigationBar.setBackgroundColorAsync("#121212");
-
+      NavigationBar.setBorderColorAsync("#121212");
-  useFocusEffect(
-    useCallback(() => {
-      const hasShownIntro = storage.getBoolean("hasShownIntro");
-      if (!hasShownIntro) {
-        const timer = setTimeout(() => {
-          router.push("/intro/page");
-        }, 1000);
-
-        return () => {
-          clearTimeout(timer);
-        };
     }
-    }, [])
+  }, []);
-  );
 
   return (
-    <>
+    <Tabs
-      <SystemBars hidden={false} style="light" />
+      initialRouteName="home"
-      <NativeTabs
+      screenOptions={{
-        sidebarAdaptable={false}
+        tabBarActiveTintColor: Colors.tabIconSelected,
-        ignoresTopSafeArea
+        headerShown: false,
-        barTintColor={Platform.OS === "android" ? "#121212" : undefined}
+        tabBarStyle: {
-        tabBarActiveTintColor={Colors.primary}
+          position: "absolute",
-        scrollEdgeAppearance="default"
+          borderTopLeftRadius: 0,
+          borderTopRightRadius: 0,
+          borderTopWidth: 0,
+          paddingTop: 8,
+          paddingBottom: Platform.OS === "android" ? 8 : 26,
+          height: Platform.OS === "android" ? 58 : 74,
+        },
+        tabBarBackground: () =>
+          Platform.OS === "ios" ? (
+            <BlurView
+              experimentalBlurMethod="dimezisBlurView"
+              intensity={95}
+              style={{
+                ...StyleSheet.absoluteFillObject,
+                overflow: "hidden",
+                borderTopLeftRadius: 0,
+                borderTopRightRadius: 0,
+                backgroundColor: "black",
+              }}
+            />
+          ) : undefined,
+      }}
     >
-        <NativeTabs.Screen redirect name="index" />
+      <Tabs.Screen redirect name="index" />
-        <NativeTabs.Screen
+      <Tabs.Screen
         name="(home)"
         options={{
-            title: t("tabs.home"),
+          headerShown: false,
-            tabBarIcon:
+          title: "Home",
-              Platform.OS == "android"
+          tabBarIcon: ({ color, focused }) => (
-                ? ({ color, focused, size }) =>
+            <TabBarIcon
-                    require("@/assets/icons/house.fill.png")
+              name={focused ? "home" : "home-outline"}
-                : ({ focused }) =>
+              color={color}
-                    focused
+            />
-                      ? { sfSymbol: "house.fill" }
+          ),
-                      : { sfSymbol: "house" },
         }}
       />
-        <NativeTabs.Screen
+      <Tabs.Screen
         name="(search)"
         options={{
-            title: t("tabs.search"),
+          headerShown: false,
-            tabBarIcon:
+          title: "Search",
-              Platform.OS == "android"
+          tabBarIcon: ({ color, focused }) => (
-                ? ({ color, focused, size }) =>
+            <TabBarIcon name={focused ? "search" : "search"} color={color} />
-                    require("@/assets/icons/magnifyingglass.png")
+          ),
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "magnifyingglass" }
-                      : { sfSymbol: "magnifyingglass" },
         }}
       />
-        <NativeTabs.Screen
+      <Tabs.Screen
-          name="(favorites)"
-          options={{
-            title: t("tabs.favorites"),
-            tabBarIcon:
-              Platform.OS == "android"
-                ? ({ color, focused, size }) =>
-                    focused
-                      ? require("@/assets/icons/heart.fill.png")
-                      : require("@/assets/icons/heart.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "heart.fill" }
-                      : { sfSymbol: "heart" },
-          }}
-        />
-        <NativeTabs.Screen
         name="(libraries)"
         options={{
-            title: t("tabs.library"),
+          headerShown: false,
-            tabBarIcon:
+          title: "Library",
-              Platform.OS == "android"
+          tabBarIcon: ({ color, focused }) => (
-                ? ({ color, focused, size }) =>
+            <TabBarIcon
-                    require("@/assets/icons/server.rack.png")
+              name={focused ? "apps" : "apps-outline"}
-                : ({ focused }) =>
+              color={color}
-                    focused
+            />
-                      ? { sfSymbol: "rectangle.stack.fill" }
+          ),
-                      : { sfSymbol: "rectangle.stack" },
         }}
       />
-        <NativeTabs.Screen
+    </Tabs>
-          name="(custom-links)"
-          options={{
-            title: t("tabs.custom_links"),
-            // @ts-expect-error
-            tabBarItemHidden: settings?.showCustomMenuLinks ? false : true,
-            tabBarIcon:
-              Platform.OS == "android"
-                ? ({ focused }) => require("@/assets/icons/list.png")
-                : ({ focused }) =>
-                    focused
-                      ? { sfSymbol: "list.dash.fill" }
-                      : { sfSymbol: "list.dash" },
-          }}
-        />
-      </NativeTabs>
-    </>
   );
 }

app/(auth)/player/_layout.tsx

@@ -1,31 +0,0 @@
-import { Stack } from "expo-router";
-import React from "react";
-import { SystemBars } from "react-native-edge-to-edge";
-
-export default function Layout() {
-  return (
-    <>
-      <SystemBars hidden />
-      <Stack>
-        <Stack.Screen
-          name="direct-player"
-          options={{
-            headerShown: false,
-            autoHideHomeIndicator: true,
-            title: "",
-            animation: "fade",
-          }}
-        />
-        <Stack.Screen
-          name="transcoding-player"
-          options={{
-            headerShown: false,
-            autoHideHomeIndicator: true,
-            title: "",
-            animation: "fade",
-          }}
-        />
-      </Stack>
-    </>
-  );
-}

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

@@ -1,528 +0,0 @@
-import { BITRATES } from "@/components/BitrateSelector";
-import { Text } from "@/components/common/Text";
-import { Loader } from "@/components/Loader";
-import { Controls } from "@/components/video-player/controls/Controls";
-import { getDownloadedFileUrl } from "@/hooks/useDownloadedFileOpener";
-import { useOrientation } from "@/hooks/useOrientation";
-import { useOrientationSettings } from "@/hooks/useOrientationSettings";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useWebSocket } from "@/hooks/useWebsockets";
-import { VlcPlayerView } from "@/modules/vlc-player";
-import {
-  PlaybackStatePayload,
-  ProgressUpdatePayload,
-  VlcPlayerViewRef,
-} from "@/modules/vlc-player/src/VlcPlayer.types";
-import { useDownload } from "@/providers/DownloadProvider";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import { writeToLog } from "@/utils/log";
-import native from "@/utils/profiles/native";
-import { msToTicks, ticksToSeconds } from "@/utils/time";
-import { Api } from "@jellyfin/sdk";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import {
-  getPlaystateApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useHaptic } from "@/hooks/useHaptic";
-import { useFocusEffect, useGlobalSearchParams } from "expo-router";
-import { useAtomValue } from "jotai";
-import React, {
-  useCallback,
-  useMemo,
-  useRef,
-  useState,
-  useEffect,
-} from "react";
-import {
-  Alert,
-  BackHandler,
-  View,
-  AppState,
-  AppStateStatus,
-  Platform,
-} from "react-native";
-import { useSharedValue } from "react-native-reanimated";
-import settings from "../(tabs)/(home)/settings";
-import { useSettings } from "@/utils/atoms/settings";
-import { useTranslation } from "react-i18next";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-export default function page() {
-  const videoRef = useRef<VlcPlayerViewRef>(null);
-  const user = useAtomValue(userAtom);
-  const api = useAtomValue(apiAtom);
-  const { t } = useTranslation();
-
-  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
-  const [showControls, _setShowControls] = useState(true);
-  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(false);
-  const [isPlaying, setIsPlaying] = useState(false);
-  const [isBuffering, setIsBuffering] = useState(true);
-  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
-
-  const progress = useSharedValue(0);
-  const isSeeking = useSharedValue(false);
-  const cacheProgress = useSharedValue(0);
-
-  const { getDownloadedItem } = useDownload();
-  const revalidateProgressCache = useInvalidatePlaybackProgressCache();
-
-  const lightHapticFeedback = useHaptic("light");
-
-  const setShowControls = useCallback((show: boolean) => {
-    _setShowControls(show);
-    lightHapticFeedback();
-  }, []);
-
-  const {
-    itemId,
-    audioIndex: audioIndexStr,
-    subtitleIndex: subtitleIndexStr,
-    mediaSourceId,
-    bitrateValue: bitrateValueStr,
-    offline: offlineStr,
-  } = useGlobalSearchParams<{
-    itemId: string;
-    audioIndex: string;
-    subtitleIndex: string;
-    mediaSourceId: string;
-    bitrateValue: string;
-    offline: string;
-  }>();
-  const [settings] = useSettings();
-  const offline = offlineStr === "true";
-
-  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
-  const subtitleIndex = subtitleIndexStr ? parseInt(subtitleIndexStr, 10) : -1;
-  const bitrateValue = bitrateValueStr
-    ? parseInt(bitrateValueStr, 10)
-    : BITRATES[0].value;
-
-  const {
-    data: item,
-    isLoading: isLoadingItem,
-    isError: isErrorItem,
-  } = useQuery({
-    queryKey: ["item", itemId],
-    queryFn: async () => {
-      if (offline) {
-        const item = await getDownloadedItem(itemId);
-        if (item) return item.item;
-      }
-
-      const res = await getUserLibraryApi(api!).getItem({
-        itemId,
-        userId: user?.Id,
-      });
-
-      return res.data;
-    },
-    enabled: !!itemId,
-    staleTime: 0,
-  });
-
-  const {
-    data: stream,
-    isLoading: isLoadingStreamUrl,
-    isError: isErrorStreamUrl,
-  } = useQuery({
-    queryKey: ["stream-url", itemId, mediaSourceId, bitrateValue],
-    queryFn: async () => {
-      if (offline) {
-        const data = await getDownloadedItem(itemId);
-        if (!data?.mediaSource) return null;
-
-        const url = await getDownloadedFileUrl(data.item.Id!);
-
-        if (item)
-          return {
-            mediaSource: data.mediaSource,
-            url,
-            sessionId: undefined,
-          };
-      }
-
-      const res = await getStreamUrl({
-        api,
-        item,
-        startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
-        userId: user?.Id,
-        audioStreamIndex: audioIndex,
-        maxStreamingBitrate: bitrateValue,
-        mediaSourceId: mediaSourceId,
-        subtitleStreamIndex: subtitleIndex,
-        deviceProfile: native,
-      });
-
-      if (!res) return null;
-
-      const { mediaSource, sessionId, url } = res;
-
-      if (!sessionId || !mediaSource || !url) {
-        Alert.alert(t("player.error"), t("player.failed_to_get_stream_url"));
-        return null;
-      }
-
-      return {
-        mediaSource,
-        sessionId,
-        url,
-      };
-    },
-    enabled: !!itemId && !!item,
-    staleTime: 0,
-  });
-
-  const togglePlay = useCallback(async () => {
-    if (!api) return;
-
-    lightHapticFeedback();
-    if (isPlaying) {
-      await videoRef.current?.pause();
-
-      if (!offline && stream) {
-        await getPlaystateApi(api).onPlaybackProgress({
-          itemId: item?.Id!,
-          audioStreamIndex: audioIndex ? audioIndex : undefined,
-          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-          mediaSourceId: mediaSourceId,
-          positionTicks: msToTicks(progress.value),
-          isPaused: true,
-          playMethod: stream.url?.includes("m3u8")
-            ? "Transcode"
-            : "DirectStream",
-          playSessionId: stream.sessionId,
-        });
-      }
-    } else {
-      videoRef.current?.play();
-      if (!offline && stream) {
-        await getPlaystateApi(api).onPlaybackProgress({
-          itemId: item?.Id!,
-          audioStreamIndex: audioIndex ? audioIndex : undefined,
-          subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-          mediaSourceId: mediaSourceId,
-          positionTicks: msToTicks(progress.value),
-          isPaused: false,
-          playMethod: stream?.url.includes("m3u8")
-            ? "Transcode"
-            : "DirectStream",
-          playSessionId: stream.sessionId,
-        });
-      }
-    }
-  }, [
-    isPlaying,
-    api,
-    item,
-    stream,
-    videoRef,
-    audioIndex,
-    subtitleIndex,
-    mediaSourceId,
-    offline,
-    progress.value,
-  ]);
-
-  const reportPlaybackStopped = useCallback(async () => {
-    if (offline) return;
-
-    const currentTimeInTicks = msToTicks(progress.value);
-
-    await getPlaystateApi(api!).onPlaybackStopped({
-      itemId: item?.Id!,
-      mediaSourceId: mediaSourceId,
-      positionTicks: currentTimeInTicks,
-      playSessionId: stream?.sessionId!,
-    });
-
-    revalidateProgressCache();
-  }, [api, item, mediaSourceId, stream]);
-
-  const stop = useCallback(() => {
-    reportPlaybackStopped();
-    setIsPlaybackStopped(true);
-    videoRef.current?.stop();
-  }, [videoRef, reportPlaybackStopped]);
-
-  // TODO: unused should remove.
-  const reportPlaybackStart = useCallback(async () => {
-    if (offline) return;
-
-    if (!stream) return;
-    await getPlaystateApi(api!).onPlaybackStart({
-      itemId: item?.Id!,
-      audioStreamIndex: audioIndex ? audioIndex : undefined,
-      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-      mediaSourceId: mediaSourceId,
-      playMethod: stream.url?.includes("m3u8") ? "Transcode" : "DirectStream",
-      playSessionId: stream?.sessionId ? stream?.sessionId : undefined,
-    });
-  }, [api, item, mediaSourceId, stream]);
-
-  const onProgress = useCallback(
-    async (data: ProgressUpdatePayload) => {
-      if (isSeeking.value === true) return;
-      if (isPlaybackStopped === true) return;
-
-      const { currentTime } = data.nativeEvent;
-
-      if (isBuffering) {
-        setIsBuffering(false);
-      }
-
-      progress.value = currentTime;
-
-      if (offline) return;
-
-      const currentTimeInTicks = msToTicks(currentTime);
-
-      if (!item?.Id || !stream) return;
-
-      await getPlaystateApi(api!).onPlaybackProgress({
-        itemId: item.Id,
-        audioStreamIndex: audioIndex ? audioIndex : undefined,
-        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-        mediaSourceId: mediaSourceId,
-        positionTicks: Math.floor(currentTimeInTicks),
-        isPaused: !isPlaying,
-        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-        playSessionId: stream.sessionId,
-      });
-    },
-    [item?.Id, isPlaying, api, isPlaybackStopped, audioIndex, subtitleIndex]
-  );
-
-  useOrientation();
-  useOrientationSettings();
-
-  useWebSocket({
-    isPlaying: isPlaying,
-    togglePlay: togglePlay,
-    stopPlayback: stop,
-    offline,
-  });
-
-  const onPlaybackStateChanged = useCallback((e: PlaybackStatePayload) => {
-    const { state, isBuffering, isPlaying } = e.nativeEvent;
-
-    if (state === "Playing") {
-      setIsPlaying(true);
-      return;
-    }
-
-    if (state === "Paused") {
-      setIsPlaying(false);
-      return;
-    }
-
-    if (isPlaying) {
-      setIsPlaying(true);
-      setIsBuffering(false);
-    } else if (isBuffering) {
-      setIsBuffering(true);
-    }
-  }, []);
-
-  const startPosition = useMemo(() => {
-    if (offline) return 0;
-
-    return item?.UserData?.PlaybackPositionTicks
-      ? ticksToSeconds(item.UserData.PlaybackPositionTicks)
-      : 0;
-  }, [item]);
-
-  useFocusEffect(
-    React.useCallback(() => {
-      return async () => {
-        stop();
-      };
-    }, [])
-  );
-
-  const [appState, setAppState] = useState(AppState.currentState);
-
-  useEffect(() => {
-    const handleAppStateChange = (nextAppState: AppStateStatus) => {
-      if (appState.match(/inactive|background/) && nextAppState === "active") {
-        // Handle app coming to the foreground
-      } else if (nextAppState.match(/inactive|background/)) {
-        // Handle app going to the background
-        if (videoRef.current && videoRef.current.pause) {
-          videoRef.current.pause();
-        }
-      }
-      setAppState(nextAppState);
-    };
-
-    // Use AppState.addEventListener and return a cleanup function
-    const subscription = AppState.addEventListener(
-      "change",
-      handleAppStateChange
-    );
-
-    return () => {
-      // Cleanup the event listener when the component is unmounted
-      subscription.remove();
-    };
-  }, [appState]);
-
-  // Preselection of audio and subtitle tracks.
-
-  if (!settings) return null;
-
-  let initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
-  let externalTrack = { name: "", DeliveryUrl: "" };
-
-  const allSubs =
-    stream?.mediaSource.MediaStreams?.filter(
-      (sub) => sub.Type === "Subtitle"
-    ) || [];
-  const chosenSubtitleTrack = allSubs.find(
-    (sub) => sub.Index === subtitleIndex
-  );
-  const allAudio =
-    stream?.mediaSource.MediaStreams?.filter(
-      (audio) => audio.Type === "Audio"
-    ) || [];
-  const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
-
-  // Direct playback CASE
-  if (!bitrateValue) {
-    // If Subtitle is embedded we can use the position to select it straight away.
-    if (chosenSubtitleTrack && !chosenSubtitleTrack.DeliveryUrl) {
-      initOptions.push(`--sub-track=${allSubs.indexOf(chosenSubtitleTrack)}`);
-    } else if (chosenSubtitleTrack && chosenSubtitleTrack.DeliveryUrl) {
-      // If Subtitle is external we need to pass the URL to the player.
-      externalTrack = {
-        name: chosenSubtitleTrack.DisplayTitle || "",
-        DeliveryUrl: `${api?.basePath || ""}${chosenSubtitleTrack.DeliveryUrl}`,
-      };
-    }
-
-    if (chosenAudioTrack)
-      initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
-  } else {
-    // Transcoded playback CASE
-    if (chosenSubtitleTrack?.DeliveryMethod === "Hls") {
-      externalTrack = {
-        name: `subs ${chosenSubtitleTrack.DisplayTitle}`,
-        DeliveryUrl: "",
-      };
-    }
-  }
-
-  const insets = useSafeAreaInsets();
-
-  if (!item || isLoadingItem || isLoadingStreamUrl || !stream)
-    return (
-      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
-        <Loader />
-      </View>
-    );
-
-  if (isErrorItem || isErrorStreamUrl)
-    return (
-      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
-        <Text className="text-white">{t("player.error")}</Text>
-      </View>
-    );
-
-  return (
-    <View style={{ flex: 1, backgroundColor: "black" }}>
-      <View
-        style={{
-          display: "flex",
-          width: "100%",
-          height: "100%",
-          position: "relative",
-          flexDirection: "column",
-          justifyContent: "center",
-          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
-          paddingRight: ignoreSafeAreas ? 0 : insets.right,
-        }}
-      >
-        <VlcPlayerView
-          ref={videoRef}
-          source={{
-            uri: stream.url,
-            autoplay: true,
-            isNetwork: true,
-            startPosition,
-            externalTrack,
-            initOptions,
-          }}
-          style={{ width: "100%", height: "100%" }}
-          onVideoProgress={onProgress}
-          progressUpdateInterval={1000}
-          onVideoStateChange={onPlaybackStateChanged}
-          onVideoLoadStart={() => {}}
-          onVideoLoadEnd={() => {
-            setIsVideoLoaded(true);
-          }}
-          onVideoError={(e) => {
-            console.error("Video Error:", e.nativeEvent);
-            Alert.alert(
-              t("player.error"),
-              t("player.an_error_occured_while_playing_the_video")
-            );
-            writeToLog("ERROR", "Video Error", e.nativeEvent);
-          }}
-        />
-      </View>
-      {videoRef.current && (
-        <Controls
-          mediaSource={stream?.mediaSource}
-          item={item}
-          videoRef={videoRef}
-          togglePlay={togglePlay}
-          isPlaying={isPlaying}
-          isSeeking={isSeeking}
-          progress={progress}
-          cacheProgress={cacheProgress}
-          isBuffering={isBuffering}
-          showControls={showControls}
-          setShowControls={setShowControls}
-          setIgnoreSafeAreas={setIgnoreSafeAreas}
-          ignoreSafeAreas={ignoreSafeAreas}
-          isVideoLoaded={isVideoLoaded}
-          play={videoRef.current?.play}
-          pause={videoRef.current?.pause}
-          seek={videoRef.current?.seekTo}
-          enableTrickplay={true}
-          getAudioTracks={videoRef.current?.getAudioTracks}
-          getSubtitleTracks={videoRef.current?.getSubtitleTracks}
-          offline={offline}
-          setSubtitleTrack={videoRef.current.setSubtitleTrack}
-          setSubtitleURL={videoRef.current.setSubtitleURL}
-          setAudioTrack={videoRef.current.setAudioTrack}
-          stop={stop}
-          isVlc
-        />
-      )}
-    </View>
-  );
-}
-
-export function usePoster(
-  item: BaseItemDto,
-  api: Api | null
-): string | undefined {
-  const poster = useMemo(() => {
-    if (!item || !api) return undefined;
-    return item.Type === "Audio"
-      ? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
-      : getBackdropUrl({
-          api,
-          item: item,
-          quality: 70,
-          width: 200,
-        });
-  }, [item, api]);
-
-  return poster ?? undefined;
-}

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

@@ -1,547 +0,0 @@
-import { Text } from "@/components/common/Text";
-import { Loader } from "@/components/Loader";
-import { Controls } from "@/components/video-player/controls/Controls";
-import { useOrientation } from "@/hooks/useOrientation";
-import { useOrientationSettings } from "@/hooks/useOrientationSettings";
-import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useWebSocket } from "@/hooks/useWebsockets";
-import { TrackInfo } from "@/modules/vlc-player";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
-import transcoding from "@/utils/profiles/transcoding";
-import { secondsToTicks } from "@/utils/secondsToTicks";
-import { Api } from "@jellyfin/sdk";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import {
-  getPlaystateApi,
-  getUserLibraryApi,
-} from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useHaptic } from "@/hooks/useHaptic";
-import { useFocusEffect, useLocalSearchParams } from "expo-router";
-import { useAtomValue } from "jotai";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { View } from "react-native";
-import { useSharedValue } from "react-native-reanimated";
-import Video, {
-  OnProgressData,
-  SelectedTrack,
-  SelectedTrackType,
-  VideoRef,
-} from "react-native-video";
-import { SubtitleHelper } from "@/utils/SubtitleHelper";
-import { useTranslation } from "react-i18next";
-
-const Player = () => {
-  const api = useAtomValue(apiAtom);
-  const user = useAtomValue(userAtom);
-  const [settings] = useSettings();
-  const videoRef = useRef<VideoRef | null>(null);
-  const { t } = useTranslation();
-
-  const firstTime = useRef(true);
-  const revalidateProgressCache = useInvalidatePlaybackProgressCache();
-  const lightHapticFeedback = useHaptic("light");
-
-  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
-  const [showControls, _setShowControls] = useState(true);
-  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(false);
-  const [isPlaying, setIsPlaying] = useState(false);
-  const [isBuffering, setIsBuffering] = useState(true);
-  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
-
-  const setShowControls = useCallback((show: boolean) => {
-    _setShowControls(show);
-    lightHapticFeedback();
-  }, []);
-
-  const progress = useSharedValue(0);
-  const isSeeking = useSharedValue(false);
-  const cacheProgress = useSharedValue(0);
-
-  const {
-    itemId,
-    audioIndex: audioIndexStr,
-    subtitleIndex: subtitleIndexStr,
-    mediaSourceId,
-    bitrateValue: bitrateValueStr,
-  } = useLocalSearchParams<{
-    itemId: string;
-    audioIndex: string;
-    subtitleIndex: string;
-    mediaSourceId: string;
-    bitrateValue: string;
-  }>();
-
-  const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
-  const subtitleIndex = subtitleIndexStr
-    ? parseInt(subtitleIndexStr, 10)
-    : undefined;
-  const bitrateValue = bitrateValueStr
-    ? parseInt(bitrateValueStr, 10)
-    : undefined;
-
-  const {
-    data: item,
-    isLoading: isLoadingItem,
-    isError: isErrorItem,
-  } = useQuery({
-    queryKey: ["item", itemId],
-    queryFn: async () => {
-      if (!api) {
-        throw new Error("No api");
-      }
-
-      if (!itemId) {
-        console.warn("No itemId");
-        return null;
-      }
-
-      const res = await getUserLibraryApi(api).getItem({
-        itemId,
-        userId: user?.Id,
-      });
-
-      return res.data;
-    },
-    staleTime: 0,
-  });
-
-  // TODO: NEED TO FIND A WAY TO FROM SWITCHING TO IMAGE BASED TO TEXT BASED SUBTITLES, THERE IS A BUG.
-  // MOST LIKELY LIKELY NEED A MASSIVE REFACTOR.
-  const {
-    data: stream,
-    isLoading: isLoadingStreamUrl,
-    isError: isErrorStreamUrl,
-  } = useQuery({
-    queryKey: ["stream-url", itemId, bitrateValue, mediaSourceId, audioIndex],
-
-    queryFn: async () => {
-      if (!api) {
-        throw new Error("No api");
-      }
-
-      if (!item) {
-        console.warn("No item", itemId, item);
-        return null;
-      }
-
-      const res = await getStreamUrl({
-        api,
-        item,
-        startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
-        userId: user?.Id,
-        audioStreamIndex: audioIndex,
-        maxStreamingBitrate: bitrateValue,
-        mediaSourceId: mediaSourceId,
-        subtitleStreamIndex: subtitleIndex,
-        deviceProfile: transcoding,
-      });
-
-      if (!res) return null;
-
-      const { mediaSource, sessionId, url } = res;
-
-      if (!sessionId || !mediaSource || !url) {
-        console.warn("No sessionId or mediaSource or url", url);
-        return null;
-      }
-
-      return {
-        mediaSource,
-        sessionId,
-        url,
-      };
-    },
-    enabled: !!item,
-    staleTime: 0,
-  });
-
-  const poster = usePoster(item, api);
-  const videoSource = useVideoSource(item, api, poster, stream?.url);
-
-  const togglePlay = useCallback(async () => {
-    lightHapticFeedback();
-    if (isPlaying) {
-      videoRef.current?.pause();
-      await getPlaystateApi(api!).onPlaybackProgress({
-        itemId: item?.Id!,
-        audioStreamIndex: audioIndex ? audioIndex : undefined,
-        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-        mediaSourceId: mediaSourceId,
-        positionTicks: Math.floor(progress.value),
-        isPaused: true,
-        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-        playSessionId: stream?.sessionId,
-      });
-    } else {
-      videoRef.current?.resume();
-      await getPlaystateApi(api!).onPlaybackProgress({
-        itemId: item?.Id!,
-        audioStreamIndex: audioIndex ? audioIndex : undefined,
-        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-        mediaSourceId: mediaSourceId,
-        positionTicks: Math.floor(progress.value),
-        isPaused: false,
-        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-        playSessionId: stream?.sessionId,
-      });
-    }
-  }, [
-    isPlaying,
-    api,
-    item,
-    videoRef,
-    settings,
-    stream,
-    audioIndex,
-    subtitleIndex,
-    mediaSourceId,
-  ]);
-
-  const play = useCallback(() => {
-    videoRef.current?.resume();
-    reportPlaybackStart();
-  }, [videoRef]);
-
-  const pause = useCallback(() => {
-    videoRef.current?.pause();
-  }, [videoRef]);
-
-  const seek = useCallback(
-    (seconds: number) => {
-      videoRef.current?.seek(seconds);
-    },
-    [videoRef]
-  );
-
-  const reportPlaybackStopped = async () => {
-    if (!item?.Id) return;
-    await getPlaystateApi(api!).onPlaybackStopped({
-      itemId: item.Id,
-      mediaSourceId: mediaSourceId,
-      positionTicks: Math.floor(progress.value),
-      playSessionId: stream?.sessionId,
-    });
-    revalidateProgressCache();
-  };
-
-  const stop = useCallback(() => {
-    reportPlaybackStopped();
-    videoRef.current?.pause();
-    setIsPlaybackStopped(true);
-  }, [videoRef, reportPlaybackStopped]);
-
-  const reportPlaybackStart = async () => {
-    if (!item?.Id) return;
-    await getPlaystateApi(api!).onPlaybackStart({
-      itemId: item.Id,
-      audioStreamIndex: audioIndex ? audioIndex : undefined,
-      subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-      mediaSourceId: mediaSourceId,
-      playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-      playSessionId: stream?.sessionId,
-    });
-  };
-
-  const onProgress = useCallback(
-    async (data: OnProgressData) => {
-      if (isSeeking.value === true) return;
-      if (isPlaybackStopped === true) return;
-
-      const ticks = secondsToTicks(data.currentTime);
-
-      progress.value = ticks;
-      cacheProgress.value = secondsToTicks(data.playableDuration);
-
-      // TODO: Use this when streaming with HLS url, but NOT when direct playing
-      // TODO: since playable duration is always 0 then.
-      setIsBuffering(data.playableDuration === 0);
-
-      if (!item?.Id || data.currentTime === 0) {
-        return;
-      }
-
-      await getPlaystateApi(api!).onPlaybackProgress({
-        itemId: item.Id,
-        audioStreamIndex: audioIndex ? audioIndex : undefined,
-        subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
-        mediaSourceId: mediaSourceId,
-        positionTicks: Math.round(ticks),
-        isPaused: !isPlaying,
-        playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
-        playSessionId: stream?.sessionId,
-      });
-    },
-    [
-      item,
-      isPlaying,
-      api,
-      isPlaybackStopped,
-      isSeeking,
-      stream,
-      mediaSourceId,
-      audioIndex,
-      subtitleIndex,
-    ]
-  );
-
-  useOrientation();
-  useOrientationSettings();
-
-  useWebSocket({
-    isPlaying: isPlaying,
-    togglePlay: togglePlay,
-    stopPlayback: stop,
-    offline: false,
-  });
-
-  const [selectedTextTrack, setSelectedTextTrack] = useState<
-    SelectedTrack | undefined
-  >();
-
-  const [embededTextTracks, setEmbededTextTracks] = useState<
-    {
-      index: number;
-      language?: string | undefined;
-      selected?: boolean | undefined;
-      title?: string | undefined;
-      type: any;
-    }[]
-  >([]);
-
-  const [audioTracks, setAudioTracks] = useState<TrackInfo[]>([]);
-  const [selectedAudioTrack, setSelectedAudioTrack] = useState<
-    SelectedTrack | undefined
-  >(undefined);
-
-  useEffect(() => {
-    if (selectedTextTrack === undefined) {
-      const subtitleHelper = new SubtitleHelper(
-        stream?.mediaSource.MediaStreams ?? []
-      );
-      const embeddedTrackIndex = subtitleHelper.getEmbeddedTrackIndex(
-        subtitleIndex!
-      );
-
-      // Most likely the subtitle is burned in.
-      if (embeddedTrackIndex === -1) return;
-
-      setSelectedTextTrack({
-        type: SelectedTrackType.INDEX,
-        value: embeddedTrackIndex,
-      });
-    }
-  }, [embededTextTracks]);
-
-  const getAudioTracks = (): TrackInfo[] => {
-    return audioTracks.map((t) => ({
-      name: t.name,
-      index: t.index,
-    }));
-  };
-
-  const getSubtitleTracks = (): TrackInfo[] => {
-    return embededTextTracks.map((t) => ({
-      name: t.title ?? "",
-      index: t.index,
-      language: t.language,
-    }));
-  };
-
-  useFocusEffect(
-    React.useCallback(() => {
-      return async () => {
-        stop();
-      };
-    }, [])
-  );
-
-  if (isLoadingItem || isLoadingStreamUrl)
-    return (
-      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
-        <Loader />
-      </View>
-    );
-
-  if (isErrorItem || isErrorStreamUrl)
-    return (
-      <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
-        <Text className="text-white">{t("player.error")}</Text>
-      </View>
-    );
-
-  return (
-    <View style={{ flex: 1, backgroundColor: "black" }}>
-      <View
-        style={{
-          display: "flex",
-          width: "100%",
-          height: "100%",
-          position: "relative",
-          flexDirection: "column",
-          justifyContent: "center",
-        }}
-      >
-        {videoSource ? (
-          <>
-            <Video
-              ref={videoRef}
-              source={videoSource}
-              style={{
-                height: "100%",
-                width: "100%",
-              }}
-              resizeMode={ignoreSafeAreas ? "cover" : "contain"}
-              onProgress={onProgress}
-              onError={(e) => {
-                console.error("Error playing video", e);
-              }}
-              onLoad={() => {
-                if (firstTime.current === true) {
-                  play();
-                  firstTime.current = false;
-                }
-              }}
-              progressUpdateInterval={500}
-              playWhenInactive={true}
-              allowsExternalPlayback={true}
-              playInBackground={true}
-              showNotificationControls={true}
-              ignoreSilentSwitch="ignore"
-              fullscreen={false}
-              onPlaybackStateChanged={(state) => {
-                if (isSeeking.value === false) setIsPlaying(state.isPlaying);
-              }}
-              onTextTracks={(data) => {
-                setEmbededTextTracks(data.textTracks as any);
-              }}
-              onBuffer={(e) => {
-                setIsBuffering(e.isBuffering);
-              }}
-              onAudioTracks={(e) => {
-                setAudioTracks(
-                  e.audioTracks.map((t) => ({
-                    index: t.index,
-                    name: t.title ?? "",
-                    language: t.language,
-                  }))
-                );
-              }}
-              selectedTextTrack={selectedTextTrack}
-              selectedAudioTrack={selectedAudioTrack}
-            />
-          </>
-        ) : (
-          <Text>{t("player.no_video_source")}</Text>
-        )}
-      </View>
-
-      {item && (
-        <Controls
-          mediaSource={stream?.mediaSource}
-          videoRef={videoRef}
-          enableTrickplay={true}
-          item={item}
-          togglePlay={togglePlay}
-          isPlaying={isPlaying}
-          isSeeking={isSeeking}
-          progress={progress}
-          cacheProgress={cacheProgress}
-          isBuffering={isBuffering}
-          showControls={showControls}
-          setShowControls={setShowControls}
-          setIgnoreSafeAreas={setIgnoreSafeAreas}
-          ignoreSafeAreas={ignoreSafeAreas}
-          seek={seek}
-          play={play}
-          pause={pause}
-          stop={stop}
-          getSubtitleTracks={getSubtitleTracks}
-          setSubtitleTrack={(i) => {
-            if (i === -1) {
-              setSelectedTextTrack({
-                type: SelectedTrackType.DISABLED,
-                value: undefined,
-              });
-              return;
-            }
-            setSelectedTextTrack({
-              type: SelectedTrackType.INDEX,
-              value: i,
-            });
-          }}
-          getAudioTracks={getAudioTracks}
-          setAudioTrack={(i) => {
-            setSelectedAudioTrack({
-              type: SelectedTrackType.INDEX,
-              value: i,
-            });
-          }}
-        />
-      )}
-    </View>
-  );
-};
-
-export function usePoster(
-  item: BaseItemDto | null | undefined,
-  api: Api | null
-): string | undefined {
-  const poster = useMemo(() => {
-    if (!item || !api) return undefined;
-    return item.Type === "Audio"
-      ? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
-      : getBackdropUrl({
-          api,
-          item: item,
-          quality: 70,
-          width: 200,
-        });
-  }, [item, api]);
-
-  return poster ?? undefined;
-}
-
-export function useVideoSource(
-  item: BaseItemDto | null | undefined,
-  api: Api | null,
-  poster: string | undefined,
-  url?: string | null
-) {
-  const videoSource = useMemo(() => {
-    if (!item || !api || !url) {
-      return null;
-    }
-
-    const startPosition = item?.UserData?.PlaybackPositionTicks
-      ? Math.round(item.UserData.PlaybackPositionTicks / 10000)
-      : 0;
-
-    return {
-      uri: url,
-      isNetwork: true,
-      startPosition,
-      headers: getAuthHeaders(api),
-      metadata: {
-        title: item?.Name || "Unknown",
-        description: item?.Overview ?? undefined,
-        imageUri: poster,
-        subtitle: item?.Album ?? undefined,
-      },
-    };
-  }, [item, api, poster, url]);
-
-  return videoSource;
-}
-
-export default Player;

app/+not-found.tsx

@@ -1,10 +1,13 @@
-import { Link, Stack } from "expo-router";
+import { Link, Stack, usePathname } from "expo-router";
 import { StyleSheet } from "react-native";
 
 import { ThemedText } from "@/components/ThemedText";
 import { ThemedView } from "@/components/ThemedView";
+import { useEffect } from "react";
 
 export default function NotFoundScreen() {
+  const pathname = usePathname();
+
   return (
     <>
       <Stack.Screen options={{ title: "Oops!" }} />

app/_layout.tsx

@@ -1,217 +1,27 @@
-import "@/augmentations";
+import { CurrentlyPlayingBar } from "@/components/CurrentlyPlayingBar";
-import { Text } from "@/components/common/Text";
+import { JellyfinProvider } from "@/providers/JellyfinProvider";
-import { DownloadProvider } from "@/providers/DownloadProvider";
-import {
-  getOrSetDeviceId,
-  getTokenFromStorage,
-  JellyfinProvider,
-} from "@/providers/JellyfinProvider";
 import { JobQueueProvider } from "@/providers/JobQueueProvider";
-import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
+import { PlaybackProvider } from "@/providers/PlaybackProvider";
-import { WebSocketProvider } from "@/providers/WebSocketProvider";
+import { useSettings } from "@/utils/atoms/settings";
-import { orientationAtom } from "@/utils/atoms/orientation";
-import { Settings, useSettings } from "@/utils/atoms/settings";
-import { BACKGROUND_FETCH_TASK } from "@/utils/background-tasks";
-import { LogProvider, writeToLog } from "@/utils/log";
-import { storage } from "@/utils/mmkv";
-import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server";
 import { ActionSheetProvider } from "@expo/react-native-action-sheet";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import {
-  checkForExistingDownloads,
-  completeHandler,
-  download,
-} from "@kesha-antonov/react-native-background-downloader";
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import * as BackgroundFetch from "expo-background-fetch";
-import * as FileSystem from "expo-file-system";
 import { useFonts } from "expo-font";
 import { useKeepAwake } from "expo-keep-awake";
-import * as Linking from "expo-linking";
+import { Stack, useRouter } from "expo-router";
-import * as Notifications from "expo-notifications";
-import { router, Stack } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import * as SplashScreen from "expo-splash-screen";
-import * as TaskManager from "expo-task-manager";
+import { StatusBar } from "expo-status-bar";
 import { Provider as JotaiProvider, useAtom } from "jotai";
 import { useEffect, useRef } from "react";
-import { Appearance, AppState, TouchableOpacity } from "react-native";
-import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
-import { I18nextProvider, useTranslation } from "react-i18next";
-import i18n from "@/i18n";
-import { getLocales } from "expo-localization";
 import "react-native-reanimated";
-import { Toaster } from "sonner-native";
+import * as Linking from "expo-linking";
+import { orientationAtom } from "@/utils/atoms/orientation";
 
 SplashScreen.preventAutoHideAsync();
 
-Notifications.setNotificationHandler({
-  handleNotification: async () => ({
-    shouldShowAlert: true,
-    shouldPlaySound: true,
-    shouldSetBadge: false,
-  }),
-});
-
-function useNotificationObserver() {
-  useEffect(() => {
-    let isMounted = true;
-
-    function redirect(notification: Notifications.Notification) {
-      const url = notification.request.content.data?.url;
-      if (url) {
-        router.push(url);
-      }
-    }
-
-    Notifications.getLastNotificationResponseAsync().then((response) => {
-      if (!isMounted || !response?.notification) {
-        return;
-      }
-      redirect(response?.notification);
-    });
-
-    const subscription = Notifications.addNotificationResponseReceivedListener(
-      (response) => {
-        redirect(response.notification);
-      }
-    );
-
-    return () => {
-      isMounted = false;
-      subscription.remove();
-    };
-  }, []);
-}
-
-TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
-  console.log("TaskManager ~ trigger");
-
-  const now = Date.now();
-
-  const settingsData = storage.getString("settings");
-
-  if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  const settings: Partial<Settings> = JSON.parse(settingsData);
-  const url = settings?.optimizedVersionsServerUrl;
-
-  if (!settings?.autoDownload || !url)
-    return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  const token = getTokenFromStorage();
-  const deviceId = getOrSetDeviceId();
-  const baseDirectory = FileSystem.documentDirectory;
-
-  if (!token || !deviceId || !baseDirectory)
-    return BackgroundFetch.BackgroundFetchResult.NoData;
-
-  const jobs = await getAllJobsByDeviceId({
-    deviceId,
-    authHeader: token,
-    url,
-  });
-
-  console.log("TaskManager ~ Active jobs: ", jobs.length);
-
-  for (let job of jobs) {
-    if (job.status === "completed") {
-      const downloadUrl = url + "download/" + job.id;
-      const tasks = await checkForExistingDownloads();
-
-      if (tasks.find((task) => task.id === job.id)) {
-        console.log("TaskManager ~ Download already in progress: ", job.id);
-        continue;
-      }
-
-      download({
-        id: job.id,
-        url: downloadUrl,
-        destination: `${baseDirectory}${job.item.Id}.mp4`,
-        headers: {
-          Authorization: token,
-        },
-      })
-        .begin(() => {
-          console.log("TaskManager ~ Download started: ", job.id);
-        })
-        .done(() => {
-          console.log("TaskManager ~ Download completed: ", job.id);
-          saveDownloadedItemInfo(job.item);
-          completeHandler(job.id);
-          cancelJobById({
-            authHeader: token,
-            id: job.id,
-            url: url,
-          });
-          Notifications.scheduleNotificationAsync({
-            content: {
-              title: job.item.Name,
-              body: "Download completed",
-              data: {
-                url: `/downloads`,
-              },
-            },
-            trigger: null,
-          });
-        })
-        .error((error) => {
-          console.log("TaskManager ~ Download error: ", job.id, error);
-          completeHandler(job.id);
-          Notifications.scheduleNotificationAsync({
-            content: {
-              title: job.item.Name,
-              body: "Download failed",
-              data: {
-                url: `/downloads`,
-              },
-            },
-            trigger: null,
-          });
-        });
-    }
-  }
-
-  console.log(`Auto download started: ${new Date(now).toISOString()}`);
-
-  // Be sure to return the successful result type!
-  return BackgroundFetch.BackgroundFetchResult.NewData;
-});
-
-const checkAndRequestPermissions = async () => {
-  try {
-    const hasAskedBefore = storage.getString(
-      "hasAskedForNotificationPermission"
-    );
-
-    if (hasAskedBefore !== "true") {
-      const { status } = await Notifications.requestPermissionsAsync();
-
-      if (status === "granted") {
-        writeToLog("INFO", "Notification permissions granted.");
-        console.log("Notification permissions granted.");
-      } else {
-        writeToLog("ERROR", "Notification permissions denied.");
-        console.log("Notification permissions denied.");
-      }
-
-      storage.set("hasAskedForNotificationPermission", "true");
-    } else {
-      console.log("Already asked for notification permissions before.");
-    }
-  } catch (error) {
-    writeToLog(
-      "ERROR",
-      "Error checking/requesting notification permissions:",
-      error
-    );
-    console.error("Error checking/requesting notification permissions:", error);
-  }
-};
-
 export default function RootLayout() {
   const [loaded] = useFonts({
     SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
@@ -223,45 +33,36 @@ export default function RootLayout() {
     }
   }, [loaded]);
 
-  Appearance.setColorScheme("dark");
-
   if (!loaded) {
     return null;
   }
 
   return (
     <JotaiProvider>
-      <I18nextProvider i18n={i18n}>
       <Layout />
-      </I18nextProvider>
     </JotaiProvider>
   );
 }
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: 0,
-      refetchOnMount: true,
-      refetchOnReconnect: true,
-      refetchOnWindowFocus: true,
-      retryOnMount: true,
-    },
-  },
-});
-
 function Layout() {
   const [settings, updateSettings] = useSettings();
   const [orientation, setOrientation] = useAtom(orientationAtom);
 
   useKeepAwake();
-  useNotificationObserver();
 
-  const { i18n } = useTranslation();
+  const queryClientRef = useRef<QueryClient>(
-
+    new QueryClient({
-  useEffect(() => {
+      defaultOptions: {
-    checkAndRequestPermissions();
+        queries: {
-  }, []);
+          staleTime: 60 * 1000,
+          refetchOnMount: true,
+          refetchOnReconnect: true,
+          refetchOnWindowFocus: true,
+          retryOnMount: true,
+        },
+      },
+    })
+  );
 
   useEffect(() => {
     if (settings?.autoRotate === true)
@@ -272,34 +73,10 @@ function Layout() {
       );
   }, [settings]);
 
-  useEffect(() => {
-    i18n.changeLanguage(
-      settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en"
-    );
-  }, [settings?.preferedLanguage, i18n]);
-
-  const appState = useRef(AppState.currentState);
-
-  useEffect(() => {
-    const subscription = AppState.addEventListener("change", (nextAppState) => {
-      if (
-        appState.current.match(/inactive|background/) &&
-        nextAppState === "active"
-      ) {
-        checkForExistingDownloads();
-      }
-    });
-
-    checkForExistingDownloads();
-
-    return () => {
-      subscription.remove();
-    };
-  }, []);
-
   useEffect(() => {
     const subscription = ScreenOrientation.addOrientationChangeListener(
       (event) => {
+        console.log(event.orientationInfo.orientation);
         setOrientation(event.orientationInfo.orientation);
       }
     );
@@ -321,16 +98,13 @@ function Layout() {
 
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
-      <QueryClientProvider client={queryClient}>
+      <QueryClientProvider client={queryClientRef.current}>
-        <ActionSheetProvider>
         <JobQueueProvider>
-            <JellyfinProvider>
+          <ActionSheetProvider>
-              <PlaySettingsProvider>
-                <LogProvider>
-                  <WebSocketProvider>
-                    <DownloadProvider>
             <BottomSheetModalProvider>
-                        <SystemBars style="light" hidden={false} />
+              <JellyfinProvider>
+                <PlaybackProvider>
+                  <StatusBar style="light" backgroundColor="#000" />
                   <ThemeProvider value={DarkTheme}>
                     <Stack initialRouteName="/home">
                       <Stack.Screen
@@ -338,72 +112,22 @@ function Layout() {
                         options={{
                           headerShown: false,
                           title: "",
-                                header: () => null,
-                              }}
-                            />
-                            <Stack.Screen
-                              name="(auth)/player"
-                              options={{
-                                headerShown: false,
-                                title: "",
-                                header: () => null,
                         }}
                       />
                       <Stack.Screen
                         name="login"
-                              options={{
+                        options={{ headerShown: false, title: "Login" }}
-                                headerShown: true,
-                                title: "",
-                                headerTransparent: true,
-                              }}
                       />
                       <Stack.Screen name="+not-found" />
                     </Stack>
-                          <Toaster
+                    <CurrentlyPlayingBar />
-                            duration={4000}
-                            toastOptions={{
-                              style: {
-                                backgroundColor: "#262626",
-                                borderColor: "#363639",
-                                borderWidth: 1,
-                              },
-                              titleStyle: {
-                                color: "white",
-                              },
-                            }}
-                            closeButton
-                          />
                   </ThemeProvider>
-                      </BottomSheetModalProvider>
+                </PlaybackProvider>
-                    </DownloadProvider>
-                  </WebSocketProvider>
-                </LogProvider>
-              </PlaySettingsProvider>
               </JellyfinProvider>
-          </JobQueueProvider>
+            </BottomSheetModalProvider>
           </ActionSheetProvider>
+        </JobQueueProvider>
       </QueryClientProvider>
     </GestureHandlerRootView>
   );
 }
-
-function saveDownloadedItemInfo(item: BaseItemDto) {
-  try {
-    const downloadedItems = storage.getString("downloadedItems");
-    let items: BaseItemDto[] = downloadedItems
-      ? JSON.parse(downloadedItems)
-      : [];
-
-    const existingItemIndex = items.findIndex((i) => i.Id === item.Id);
-    if (existingItemIndex !== -1) {
-      items[existingItemIndex] = item;
-    } else {
-      items.push(item);
-    }
-
-    storage.set("downloadedItems", JSON.stringify(items));
-  } catch (error) {
-    writeToLog("ERROR", "Failed to save downloaded item information:", error);
-    console.error("Failed to save downloaded item information:", error);
-  }
-}

app/login.tsx

@@ -1,31 +1,26 @@
 import { Button } from "@/components/Button";
 import { Input } from "@/components/common/Input";
 import { Text } from "@/components/common/Text";
-import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
-import { PreviousServersList } from "@/components/PreviousServersList";
-import { Colors } from "@/constants/Colors";
 import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons } from "@expo/vector-icons";
-import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
+import { useLocalSearchParams } from "expo-router";
-import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import {
   Alert,
   KeyboardAvoidingView,
   Platform,
   SafeAreaView,
-  TouchableOpacity,
   View,
 } from "react-native";
 
 import { z } from "zod";
-import { t } from 'i18next';
-const CredentialsSchema = z.object({
-  username: z.string().min(1, t("login.username_required")),});
 
-  const Login: React.FC = () => {
+const CredentialsSchema = z.object({
+  username: z.string().min(1, "Username is required"),
+});
+
+const Login: React.FC = () => {
   const { setServer, login, removeServer, initiateQuickConnect } =
     useJellyfin();
   const [api] = useAtom(apiAtom);
@@ -38,7 +33,7 @@ const CredentialsSchema = z.object({
   } = params as { apiUrl: string; username: string; password: string };
 
   const [serverURL, setServerURL] = useState<string>(_apiUrl);
-  const [serverName, setServerName] = useState<string>("");
+  const [error, setError] = useState<string>("");
   const [credentials, setCredentials] = useState<{
     username: string;
     password: string;
@@ -49,8 +44,6 @@ const CredentialsSchema = z.object({
 
   useEffect(() => {
     (async () => {
-      // we might re-use the checkUrl function here to check the url as well
-      // however, I don't think it should be necessary for now
       if (_apiUrl) {
         setServer({
           address: _apiUrl,
@@ -66,25 +59,6 @@ const CredentialsSchema = z.object({
     })();
   }, [_apiUrl, _username, _password]);
 
-  const navigation = useNavigation();
-  useEffect(() => {
-    navigation.setOptions({
-      headerTitle: serverName,
-      headerLeft: () =>
-        api?.basePath ? (
-          <TouchableOpacity
-            onPress={() => {
-              removeServer();
-            }}
-            className="flex flex-row items-center"
-          >
-            <Ionicons name="chevron-back" size={18} color={Colors.primary} />
-            <Text className="ml-2 text-purple-600">{t("login.change_server")}</Text>
-          </TouchableOpacity>
-        ) : null,
-    });
-  }, [serverName, navigation, api?.basePath]);
-
   const [loading, setLoading] = useState<boolean>(false);
 
   const handleLogin = async () => {
@@ -96,126 +70,79 @@ const CredentialsSchema = z.object({
       }
     } catch (error) {
       if (error instanceof Error) {
-        Alert.alert(t("login.connection_failed"), error.message);
+        setError(error.message);
       } else {
-        Alert.alert(t("login.connection_failed"), t("login.an_unexpected_error_occured"));
+        setError("An unexpected error occurred");
       }
     } finally {
       setLoading(false);
     }
   };
 
-  const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
+  const handleConnect = (url: string) => {
-
+    if (!url.startsWith("http")) {
-  /**
+      Alert.alert("Error", "URL needs to start with http or https.");
-   * Checks the availability and validity of a Jellyfin server URL.
-   *
-   * This function attempts to connect to a Jellyfin server using the provided URL.
-   * It tries both HTTPS and HTTP protocols, with a timeout to handle long 404 responses.
-   *
-   * @param {string} url - The base URL of the Jellyfin server to check.
-   * @returns {Promise<string | undefined>} A Promise that resolves to:
-   *   - The full URL (including protocol) if a valid Jellyfin server is found.
-   *   - undefined if no valid server is found at the given URL.
-   *
-   * Side effects:
-   * - Sets loadingServerCheck state to true at the beginning and false at the end.
-   * - Logs errors and timeout information to the console.
-   */
-  const checkUrl = useCallback(async (url: string) => {
-    setLoadingServerCheck(true);
-
-    try {
-      const response = await fetch(`${url}/System/Info/Public`, {
-        mode: "cors",
-      });
-
-      if (response.ok) {
-        const data = (await response.json()) as PublicSystemInfo;
-
-        setServerName(data.ServerName || "");
-        return url;
-      }
-
-      return undefined;
-    } catch {
-      return undefined;
-    } finally {
-      setLoadingServerCheck(false);
-    }
-  }, []);
-
-  /**
-   * Handles the connection attempt to a Jellyfin server.
-   *
-   * This function trims the input URL, checks its validity using the `checkUrl` function,
-   * and sets the server address if a valid connection is established.
-   *
-   * @param {string} url - The URL of the Jellyfin server to connect to.
-   *
-   * @returns {Promise<void>}
-   *
-   * Side effects:
-   * - Calls `checkUrl` to validate the server URL.
-   * - Shows an alert if the connection fails.
-   * - Sets the server address using `setServer` if the connection is successful.
-   *
-   */
-  const handleConnect = useCallback(async (url: string) => {
-    url = url.trim().replace(/\/$/, "");
-    const result = await checkUrl(url);
-
-    if (result === undefined) {
-      Alert.alert(
-        t("login.connection_failed"),
-        t("login.could_not_connect_to_server")
-      );
       return;
     }
-
+    setServer({ address: url.trim() });
-    setServer({ address: url });
+  };
-  }, []);
 
   const handleQuickConnect = async () => {
     try {
       const code = await initiateQuickConnect();
       if (code) {
-        Alert.alert(t("login.quick_connect"), t("login.enter_code_to_login", {code: code}), [
+        Alert.alert("Quick Connect", `Enter code ${code} to login`, [
           {
-            text: t("login.got_it"),
+            text: "Got It",
           },
         ]);
       }
     } catch (error) {
-      Alert.alert(t("login.error_title"), t("login.failed_to_initiate_quick_connect"));
+      Alert.alert("Error", "Failed to initiate Quick Connect");
     }
   };
 
+  if (api?.basePath) {
     return (
-    <SafeAreaView style={{ flex: 1, paddingBottom: 16 }}>
+      <SafeAreaView style={{ flex: 1 }}>
         <KeyboardAvoidingView
           behavior={Platform.OS === "ios" ? "padding" : "height"}
+          style={{ flex: 1, height: "100%" }}
         >
-        {api?.basePath ? (
+          <View className="flex flex-col justify-between px-4 h-full gap-y-2">
-          <>
+            <View></View>
-            <View className="flex flex-col h-full relative items-center justify-center">
+            <View>
-              <View className="px-4 -mt-20 w-full">
+              <View className="mb-4">
-                <View className="flex flex-col space-y-2">
+                <Text className="text-3xl font-bold mb-2">Streamyfin</Text>
-                <Text className="text-2xl font-bold -mb-2">
+                <Text className="text-neutral-500 mb-2">
-                  <>
+                  Server: {api.basePath}
-                    {serverName ? (
-                      <>
-                        {t("login.login_to_title") + " "}
-                        <Text className="text-purple-600">{serverName}</Text>
-                      </>
-                    ) : t("login.login_title")}
-                  </>
                 </Text>
-                  <Text className="text-xs text-neutral-400">
+                <Button
-                    {api.basePath}
+                  color="black"
+                  onPress={() => {
+                    removeServer();
+                    setServerURL("");
+                  }}
+                  justify="between"
+                  iconLeft={
+                    <Ionicons
+                      name="arrow-back-outline"
+                      size={18}
+                      color={"white"}
+                    />
+                  }
+                >
+                  Change server
+                </Button>
+              </View>
+
+              <View className="flex flex-col space-y-2">
+                <Text className="text-2xl font-bold">Log in</Text>
+                <Text className="text-neutral-500">
+                  Log in to any user account
                 </Text>
                 <Input
-                    placeholder={t("login.username_placeholder")}
+                  placeholder="Username"
                   onChangeText={(text) =>
                     setCredentials({ ...credentials, username: text })
                   }
@@ -231,7 +158,8 @@ const CredentialsSchema = z.object({
                 />
 
                 <Input
-                    placeholder={t("login.password_placeholder")}
+                  className="mb-2"
+                  placeholder="Password"
                   onChangeText={(text) =>
                     setCredentials({ ...credentials, password: text })
                   }
@@ -244,51 +172,44 @@ const CredentialsSchema = z.object({
                   clearButtonMode="while-editing"
                   maxLength={500}
                 />
-                  <View className="flex flex-row items-center justify-between">
-                    <Button
-                      onPress={handleLogin}
-                      loading={loading}
-                      className="flex-1 mr-2"
-                    >
-                      {t("login.login_button")}
-                    </Button>
-                    <TouchableOpacity
-                      onPress={handleQuickConnect}
-                      className="p-2 bg-neutral-900 rounded-xl h-12 w-12 flex items-center justify-center"
-                    >
-                      <MaterialCommunityIcons
-                        name="cellphone-lock"
-                        size={24}
-                        color="white"
-                      />
-                    </TouchableOpacity>
-                  </View>
-                </View>
               </View>
 
-              <View className="absolute bottom-0 left-0 w-full px-4 mb-2"></View>
+              <Text className="text-red-600 mb-2">{error}</Text>
             </View>
-          </>
+
-        ) : (
+            <View className="mt-auto mb-2">
-          <>
+              <Button
-            <View className="flex flex-col h-full items-center justify-center w-full">
+                color="black"
-              <View className="flex flex-col gap-y-2 px-4 w-full -mt-36">
+                onPress={handleQuickConnect}
-                <Image
+                className="mb-2"
-                  style={{
+              >
-                    width: 100,
+                Use Quick Connect
-                    height: 100,
+              </Button>
-                    marginLeft: -23,
+              <Button onPress={handleLogin} loading={loading}>
-                    marginBottom: -20,
+                Log in
-                  }}
+              </Button>
-                  source={require("@/assets/images/StreamyFinFinal.png")}
+            </View>
-                />
+          </View>
+        </KeyboardAvoidingView>
+      </SafeAreaView>
+    );
+  }
+
+  return (
+    <SafeAreaView style={{ flex: 1 }}>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        style={{ flex: 1 }}
+      >
+        <View className="flex flex-col px-4 justify-between h-full">
+          <View></View>
+          <View className="flex flex-col gap-y-2">
             <Text className="text-3xl font-bold">Streamyfin</Text>
             <Text className="text-neutral-500">
-                  {t("server.enter_url_to_jellyfin_server")}
+              Connect to your Jellyfin server
             </Text>
             <Input
-                  aria-label="Server URL"
+              placeholder="Server URL"
-                  placeholder={t("server.server_url_placeholder")}
               onChangeText={setServerURL}
               value={serverURL}
               keyboardType="url"
@@ -297,32 +218,14 @@ const CredentialsSchema = z.object({
               textContentType="URL"
               maxLength={500}
             />
-                <Button
+            <Text className="opacity-30">
-                  loading={loadingServerCheck}
+              Server URL requires http or https
-                  disabled={loadingServerCheck}
+            </Text>
-                  onPress={async () => await handleConnect(serverURL)}
+          </View>
-                  className="w-full grow"
+          <Button onPress={() => handleConnect(serverURL)} className="mb-2">
-                >
+            Connect
-                  {t("server.connect_button")}
           </Button>
-                <JellyfinServerDiscovery
-                  onServerSelect={(server) => {
-                    setServerURL(server.address);
-                    if (server.serverName) {
-                      setServerName(server.serverName);
-                    }
-                    handleConnect(server.address);
-                  }}
-                />
-                <PreviousServersList
-                  onServerSelect={(s) => {
-                    handleConnect(s.address);
-                  }}
-                />
         </View>
-            </View>
-          </>
-        )}
       </KeyboardAvoidingView>
     </SafeAreaView>
   );

assets/images/not-rotten-tomatoes.svg

@@ -1,65 +0,0 @@
-<svg
-  type="certified"
-  viewBox="0 0 80 80"
-  preserveAspectRatio="xMidYMid"
-  version="1.1"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
->
-  <g transform="translate(2.29, 0)">
-    <path
-      d="M42.1942857,18.8022857 C44.3794286,18.608 49.1565714,18.7177143 51.4902857,21.0057143 C51.6297143,21.1451429 51.5085714,21.4605714 51.3097143,21.408 C47.8902857,20.4868571 42.5577143,25.0217143 39.1017143,22.0891429 C39.008,22.9485714 38.2331429,27.0857143 32.3314286,26.4731429 C32.192,26.4594286 32.1371429,26.304 32.24,26.2171429 C33.1542857,25.44 34.2765714,23.2891429 33.3142857,21.9154286 C30.3108571,23.9085714 28.7565714,23.9954286 23.2182857,21.5954286 C23.0377143,21.5177143 23.1451429,21.2228571 23.3577143,21.1748571 C24.5074286,20.9165714 27.2434286,19.9222857 29.696,19.4582857 C30.1645714,19.3691429 30.624,19.3165714 31.0674286,19.312 C28.528,18.7062857 27.4217143,18.1805714 25.7485714,18.1874286 C25.5657143,18.1897143 25.4742857,17.9611429 25.6068571,17.8354286 C28.224,15.3188571 32.9691429,15.1885714 35.2548571,17.0628571 L33.2068571,12.7862857 L35.696,12.4114286 C35.696,12.4114286 36.3451429,14.6925714 36.9257143,16.7428571 C39.5177143,13.904 43.5268571,14.192 44.8777143,16.672 C44.9577143,16.8182857 44.8251429,16.992 44.6605714,16.9622857 C43.3005714,16.7314286 42.3702857,17.8628571 42.1737143,18.7977143 L42.1942857,18.8022857"
-      id="Fill-2"
-      fill="#00912D"
-    ></path>
-    <mask id="mask-2" fill="white">
-      <polygon
-        points="0.137142857 0.921142857 75.0534777 0.921142857 75.0534777 79.8628571 0.137142857 79.8628571"
-      ></polygon>
-    </mask>
-    <path
-      d="M13.0491429,59.1817143 C9.90628571,55.3554286 7.86971429,50.576 7.51771429,44.9622857 C6.912,35.2342857 10.2354286,26.0845714 23.1794286,21.4834286 C23.1908571,21.5245714 23.1725714,21.5748571 23.2182857,21.5954286 C23.0377143,21.5177143 23.1451429,21.2228571 23.3577143,21.1748571 C24.5074286,20.9165714 27.2434286,19.92 29.696,19.4582857 C30.1645714,19.3691429 30.624,19.3165714 31.0674286,19.3097143 C28.528,18.7062857 27.4217143,18.1805714 25.7485714,18.1874286 C25.5657143,18.1897143 25.4742857,17.9611429 25.6068571,17.8331429 C28.224,15.3165714 32.9691429,15.1885714 35.2548571,17.0628571 L33.2068571,12.784 L35.696,12.4114286 C35.696,12.4114286 36.3451429,14.6902857 36.9257143,16.7428571 C39.5177143,13.904 43.5268571,14.192 44.8777143,16.672 C44.9577143,16.8182857 44.8251429,16.992 44.6605714,16.9622857 C43.3005714,16.7314286 42.3702857,17.8628571 42.1737143,18.7977143 L42.1942857,18.8022857 C44.3794286,18.608 49.1565714,18.7177143 51.4902857,21.0057143 C51.328,20.8502857 51.1337143,20.7245714 50.9508571,20.5874286 C60.2765714,23.504 66.7474286,30.1531429 67.44,41.2251429 C67.8811429,48.2948571 65.5702857,54.3885714 61.568,59.1154286 C62.784,59.2891429 63.9931429,59.4925714 65.2045714,59.6937143 C70.304,53.4537143 73.2502857,45.5428571 73.2502857,37.056 C73.2502857,17.7165714 57.5337143,2.56685714 37.472,2.56685714 C17.4102857,2.56685714 1.69371429,17.7165714 1.69371429,37.056 C1.69371429,45.5565714 4.64,53.472 9.744,59.7097143 C10.8434286,59.5268571 11.9451429,59.3462857 13.0491429,59.1817143"
-      fill="#FFD700"
-      mask="url(#mask-2)"
-    ></path>
-    <path
-      d="M9.744,59.7097143 C4.64,53.472 1.69371429,45.5565714 1.69371429,37.056 C1.69371429,17.7165714 17.4102857,2.56685714 37.472,2.56685714 C57.5337143,2.56685714 73.2502857,17.7165714 73.2502857,37.056 C73.2502857,45.5428571 70.304,53.4537143 65.2045714,59.6937143 C65.8125714,59.7942857 66.4205714,59.8742857 67.0285714,59.984 C71.9497143,53.6457143 74.8937143,45.6982857 74.8937143,37.056 C74.8937143,16.3862857 58.1394286,0.921142857 37.472,0.921142857 C16.8022857,0.921142857 0.048,16.3862857 0.048,37.056 C0.048,45.7074286 2.99885714,53.6594286 7.92914286,59.9977143 C8.53257143,59.8902857 9.13828571,59.8102857 9.744,59.7097143"
-      fill="#FA6E0F"
-      mask="url(#mask-2)"
-    ></path>
-    <path
-      d="M58.2857143,74.9394286 C62.3748571,75.1954286 65.7874286,77.2137143 67.8468571,79.9474286 C67.9131429,80.0182857 68.0114286,80.016 68.0411429,79.9382857 C68.7451429,77.0971429 68.9394286,74.0662857 68.5851429,71.0125714 C68.5874286,70.9805714 68.6125714,70.9577143 68.6537143,70.9485714 C70.576,70.3428571 72.7017143,70.0137143 74.9645714,70.0457143 C75.0857143,70.0594286 75.0834286,69.9405714 74.9554286,69.8194286 C72.5577143,67.4994286 69.6297143,65.6914286 66.416,64.5417143 C65.3051429,67.68 64.2217143,70.816 63.1565714,73.9634286 C63.136,74.0228571 63.0514286,74.0594286 62.9645714,74.0434286 L58.2857143,74.9394286"
-      fill="#0AC855"
-      mask="url(#mask-2)"
-    ></path>
-    <path
-      d="M62.9645714,74.0434286 L58.2857143,74.9394286 C58.2857143,74.9394286 58.3451429,74.512 58.528,73.3325714 C60.9417143,73.6754286 62.9645714,74.0434286 62.9645714,74.0434286"
-      fill="#0B4902"
-    ></path>
-    <g transform="translate(0, 20.57)">
-      <mask id="mask-4" fill="white">
-        <polygon
-          points="0.137142857 0.016 67.4935952 0.016 67.4935952 59.2914286 0.137142857 59.2914286"
-        ></polygon>
-      </mask>
-      <path
-        d="M13.0765714,38.6057143 C29.1177143,36.2605714 45.5222857,36.2354286 61.568,38.544 C65.5702857,33.8171429 67.8811429,27.7234286 67.44,20.6537143 C66.7474286,9.58171429 60.2765714,2.93257143 50.9508571,0.016 C51.1337143,0.153142857 51.328,0.278857143 51.4902857,0.434285714 C51.6297143,0.573714286 51.5085714,0.889142857 51.3097143,0.836571429 C47.8902857,-0.0845714286 42.5577143,4.45028571 39.1017143,1.51771429 C39.008,2.37485714 38.2331429,6.51428571 32.3314286,5.90171429 C32.192,5.888 32.1371429,5.73257143 32.24,5.64571429 C33.1542857,4.86857143 34.2765714,2.71542857 33.3142857,1.344 C30.3108571,3.33714286 28.7565714,3.424 23.2182857,1.024 C23.1725714,1.00342857 23.1908571,0.953142857 23.1794286,0.912 C10.2354286,5.51314286 6.912,14.6628571 7.51771429,24.3908571 C7.86971429,30.0091429 9.93142857,34.7748571 13.0765714,38.6057143"
-        fill="#FA3200"
-        mask="url(#mask-4)"
-      ></path>
-      <path
-        d="M12.0868571,53.472 C12,53.488 11.9154286,53.4514286 11.8948571,53.392 C10.8274286,50.2445714 9.73485714,47.0971429 8.62171429,43.9611429 C5.41028571,45.1108571 2.49371429,46.9302857 0.0982857143,49.248 C-0.0297142857,49.3691429 -0.032,49.488 0.0891428571,49.4742857 C2.352,49.4422857 4.47771429,49.7714286 6.4,50.3771429 C6.44114286,50.3862857 6.46628571,50.4091429 6.46857143,50.4411429 C6.11428571,53.4948571 6.30857143,56.5257143 7.01257143,59.3668571 C7.04228571,59.4445714 7.14057143,59.4468571 7.20685714,59.376 C9.26628571,56.6422857 12.6742857,54.624 16.7657143,54.368 L12.0868571,53.472"
-        fill="#0AC855"
-        mask="url(#mask-4)"
-      ></path>
-    </g>
-    <path
-      d="M62.9645714,74.0434286 C46.192,71.104 28.8571429,71.104 12.0868571,74.0434286 C12,74.0594286 11.9154286,74.0228571 11.8948571,73.9634286 C10.3428571,69.3851429 8.74285714,64.8182857 7.09257143,60.2628571 C7.06971429,60.1988571 7.14057143,60.1257143 7.248,60.1074286 C27.1885714,56.464 47.8605714,56.464 67.8034286,60.1074286 C67.9108571,60.1257143 67.9817143,60.1988571 67.9565714,60.2628571 C66.3085714,64.8182857 64.7085714,69.3851429 63.1565714,73.9634286 C63.136,74.0228571 63.0514286,74.0594286 62.9645714,74.0434286"
-      fill="#00912D"
-    ></path>
-    <path
-      d="M12.0868571,74.0434286 L16.7657143,74.9394286 C16.7657143,74.9394286 16.704,74.512 16.5211429,73.3325714 C14.1074286,73.6754286 12.0868571,74.0434286 12.0868571,74.0434286"
-      fill="#0B4902"
-    ></path>
-  </g>
-</svg>

augmentations/api.ts

@@ -1,46 +0,0 @@
-import { Api, AUTHORIZATION_HEADER } from "@jellyfin/sdk";
-import { AxiosRequestConfig, AxiosResponse } from "axios";
-import { StreamyfinPluginConfig } from "@/utils/atoms/settings";
-
-declare module "@jellyfin/sdk" {
-  interface Api {
-    get<T, D = any>(
-      url: string,
-      config?: AxiosRequestConfig<D>
-    ): Promise<AxiosResponse<T>>;
-    post<T, D = any>(
-      url: string,
-      data: D,
-      config?: AxiosRequestConfig<D>
-    ): Promise<AxiosResponse<T>>;
-    getStreamyfinPluginConfig(): Promise<AxiosResponse<StreamyfinPluginConfig>>;
-  }
-}
-
-Api.prototype.get = function <T, D = any>(
-  url: string,
-  config: AxiosRequestConfig<D> = {}
-): Promise<AxiosResponse<T>> {
-  return this.axiosInstance.get<T>(`${this.basePath}${url}`, {
-    ...(config ?? {}),
-    headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
-  });
-};
-
-Api.prototype.post = function <T, D = any>(
-  url: string,
-  data: D,
-  config: AxiosRequestConfig<D>
-): Promise<AxiosResponse<T>> {
-  return this.axiosInstance.post<T>(`${this.basePath}${url}`, {
-    ...(config || {}),
-    data,
-    headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
-  });
-};
-
-Api.prototype.getStreamyfinPluginConfig = function (): Promise<
-  AxiosResponse<StreamyfinPluginConfig>
-> {
-  return this.get<StreamyfinPluginConfig>("/Streamyfin/config");
-};

augmentations/index.ts

@@ -1,4 +0,0 @@
-export * from "./api";
-export * from "./mmkv";
-export * from "./number";
-export * from "./string";

augmentations/mmkv.ts

@@ -1,22 +0,0 @@
-import {MMKV} from "react-native-mmkv";
-
-declare module "react-native-mmkv" {
-  interface MMKV {
-    get<T>(key: string): T | undefined
-    setAny(key: string, value: any | undefined): void
-  }
-}
-
-MMKV.prototype.get = function <T> (key: string): T | undefined {
-  const serializedItem = this.getString(key);
-  return serializedItem ? JSON.parse(serializedItem) : undefined;
-}
-
-MMKV.prototype.setAny = function (key: string, value: any | undefined): void {
-  if (value === undefined) {
-    this.delete(key)
-  }
-  else {
-    this.set(key, JSON.stringify(value));
-  }
-}

augmentations/number.ts

@@ -1,35 +0,0 @@
-declare global {
-  interface Number {
-    bytesToReadable(decimals?: number): string;
-    secondsToMilliseconds(): number;
-    minutesToMilliseconds(): number;
-    hoursToMilliseconds(): number;
-  }
-}
-
-Number.prototype.bytesToReadable = function (decimals: number = 2) {
-  const bytes = this.valueOf();
-  if (bytes === 0) return '0 Bytes';
-
-  const k = 1024;
-  const dm = decimals < 0 ? 0 : decimals;
-  const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
-};
-
-Number.prototype.secondsToMilliseconds = function () {
-  return this.valueOf() * 1000;
-};
-
-Number.prototype.minutesToMilliseconds = function () {
-  return this.valueOf() * (60).secondsToMilliseconds();
-};
-
-Number.prototype.hoursToMilliseconds = function () {
-  return this.valueOf() * (60).minutesToMilliseconds();
-};
-
-export {};

augmentations/string.ts

@@ -1,16 +0,0 @@
-declare global {
-  interface String {
-    toTitle(): string;
-  }
-}
-
-String.prototype.toTitle = function () {
-  return this
-    .replaceAll("_", " ")
-    .replace(
-      /\w\S*/g,
-      text => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase()
-    );
-}
-
-export {};

components/AddToFavorites.tsx

@@ -1,114 +0,0 @@
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { TouchableOpacityProps, View, ViewProps } from "react-native";
-import { RoundButton } from "./RoundButton";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-  type: "item" | "series";
-}
-
-export const AddToFavorites: React.FC<Props> = ({ item, type, ...props }) => {
-  const queryClient = useQueryClient();
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-
-  const isFavorite = useMemo(() => {
-    return item.UserData?.IsFavorite;
-  }, [item.UserData?.IsFavorite]);
-
-  const updateItemInQueries = (newData: Partial<BaseItemDto>) => {
-    queryClient.setQueryData<BaseItemDto | undefined>(
-      [type, item.Id],
-      (old) => {
-        if (!old) return old;
-        return {
-          ...old,
-          ...newData,
-          UserData: { ...old.UserData, ...newData.UserData },
-        };
-      }
-    );
-  };
-
-  const markFavoriteMutation = useMutation({
-    mutationFn: async () => {
-      if (api && user) {
-        await getUserLibraryApi(api).markFavoriteItem({
-          userId: user.Id,
-          itemId: item.Id!,
-        });
-      }
-    },
-    onMutate: async () => {
-      await queryClient.cancelQueries({ queryKey: [type, item.Id] });
-      const previousItem = queryClient.getQueryData<BaseItemDto>([
-        type,
-        item.Id,
-      ]);
-      updateItemInQueries({ UserData: { IsFavorite: true } });
-
-      return { previousItem };
-    },
-    onError: (err, variables, context) => {
-      if (context?.previousItem) {
-        queryClient.setQueryData([type, item.Id], context.previousItem);
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: [type, item.Id] });
-      queryClient.invalidateQueries({ queryKey: ["home", "favorites"] });
-    },
-  });
-
-  const unmarkFavoriteMutation = useMutation({
-    mutationFn: async () => {
-      if (api && user) {
-        await getUserLibraryApi(api).unmarkFavoriteItem({
-          userId: user.Id,
-          itemId: item.Id!,
-        });
-      }
-    },
-    onMutate: async () => {
-      await queryClient.cancelQueries({ queryKey: [type, item.Id] });
-      const previousItem = queryClient.getQueryData<BaseItemDto>([
-        type,
-        item.Id,
-      ]);
-      updateItemInQueries({ UserData: { IsFavorite: false } });
-
-      return { previousItem };
-    },
-    onError: (err, variables, context) => {
-      if (context?.previousItem) {
-        queryClient.setQueryData([type, item.Id], context.previousItem);
-      }
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: [type, item.Id] });
-      queryClient.invalidateQueries({ queryKey: ["home", "favorites"] });
-    },
-  });
-
-  return (
-    <View {...props}>
-      <RoundButton
-        size="large"
-        icon={isFavorite ? "heart" : "heart-outline"}
-        fillColor={isFavorite ? "primary" : undefined}
-        onPress={() => {
-          if (isFavorite) {
-            unmarkFavoriteMutation.mutate();
-          } else {
-            markFavoriteMutation.mutate();
-          }
-        }}
-      />
-    </View>
-  );
-};

components/AudioTrackSelector.tsx

@@ -1,14 +1,20 @@
-import { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
-import { useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
-import { useTranslation } from "react-i18next";
+import { atom, useAtom } from "jotai";
+import {
+  BaseItemDto,
+  MediaSourceInfo,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { useEffect, useMemo } from "react";
+import { MediaStream } from "@jellyfin/sdk/lib/generated-client/models";
+import { tc } from "@/utils/textTools";
+import { useSettings } from "@/utils/atoms/settings";
 
 interface Props extends React.ComponentProps<typeof View> {
-  source?: MediaSourceInfo;
+  source: MediaSourceInfo;
   onChange: (value: number) => void;
-  selected?: number | undefined;
+  selected: number;
 }
 
 export const AudioTrackSelector: React.FC<Props> = ({
@@ -17,8 +23,10 @@ export const AudioTrackSelector: React.FC<Props> = ({
   selected,
   ...props
 }) => {
+  const [settings] = useSettings();
+
   const audioStreams = useMemo(
-    () => source?.MediaStreams?.filter((x) => x.Type === "Audio"),
+    () => source.MediaStreams?.filter((x) => x.Type === "Audio"),
     [source]
   );
 
@@ -27,7 +35,23 @@ export const AudioTrackSelector: React.FC<Props> = ({
     [audioStreams, selected]
   );
 
-  const { t } = useTranslation();
+  useEffect(() => {
+    const defaultAudioIndex = audioStreams?.find(
+      (x) => x.Language === settings?.defaultAudioLanguage
+    )?.Index;
+    if (defaultAudioIndex !== undefined && defaultAudioIndex !== null) {
+      onChange(defaultAudioIndex);
+      return;
+    }
+    const index = source.DefaultAudioStreamIndex;
+    if (index !== undefined && index !== null) {
+      console.log("DefaultAudioStreamIndex", index);
+      onChange(index);
+      return;
+    }
+
+    onChange(0);
+  }, [audioStreams, settings]);
 
   return (
     <View
@@ -39,7 +63,7 @@ export const AudioTrackSelector: React.FC<Props> = ({
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
           <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.audio")}</Text>
+            <Text className="opacity-50 mb-1 text-xs">Audio</Text>
             <TouchableOpacity className="bg-neutral-900  h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
               <Text className="" numberOfLines={1}>
                 {selectedAudioSteam?.DisplayTitle}

components/BitrateSelector.tsx

@@ -2,14 +2,14 @@ import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
 import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
 
 export type Bitrate = {
   key: string;
   value: number | undefined;
+  height?: number;
 };
 
-export const BITRATES: Bitrate[] = [
+const BITRATES: Bitrate[] = [
   {
     key: "Max",
     value: undefined,
@@ -27,25 +27,24 @@ export const BITRATES: Bitrate[] = [
   {
     key: "2 Mb/s",
     value: 2000000,
-  },
+    height: 720,
-  {
-    key: "1 Mb/s",
-    value: 1000000,
   },
   {
     key: "500 Kb/s",
     value: 500000,
+    height: 480,
   },
   {
     key: "250 Kb/s",
     value: 250000,
+    height: 480,
   },
-].sort((a, b) => (b.value || Infinity) - (a.value || Infinity));
+];
 
 interface Props extends React.ComponentProps<typeof View> {
   onChange: (value: Bitrate) => void;
-  selected?: Bitrate | null;
+  selected: Bitrate;
-  inverted?: boolean | null;
+  inverted?: boolean;
 }
 
 export const BitrateSelector: React.FC<Props> = ({
@@ -64,8 +63,6 @@ export const BitrateSelector: React.FC<Props> = ({
     );
   }, []);
 
-  const { t } = useTranslation();
-
   return (
     <View
       className="flex shrink"
@@ -77,10 +74,10 @@ export const BitrateSelector: React.FC<Props> = ({
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
           <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.quality")}</Text>
+            <Text className="opacity-50 mb-1 text-xs">Quality</Text>
             <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
               <Text style={{}} className="" numberOfLines={1}>
-                {BITRATES.find((b) => b.value === selected?.value)?.key}
+                {BITRATES.find((b) => b.value === selected.value)?.key}
               </Text>
             </TouchableOpacity>
           </View>

components/Button.tsx

@@ -1,10 +1,9 @@
-import { useHaptic } from "@/hooks/useHaptic";
+import * as Haptics from "expo-haptics";
 import React, { PropsWithChildren, ReactNode, useMemo } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";
 
-export interface ButtonProps
+interface ButtonProps extends React.ComponentProps<typeof TouchableOpacity> {
-  extends React.ComponentProps<typeof TouchableOpacity> {
   onPress?: () => void;
   className?: string;
   textClassName?: string;
@@ -37,35 +36,31 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
       case "red":
         return "bg-red-600";
       case "black":
-        return "bg-neutral-900";
+        return "bg-neutral-900 border border-neutral-800";
       case "transparent":
         return "bg-transparent";
     }
   }, [color]);
 
-  const lightHapticFeedback = useHaptic("light");
-
   return (
     <TouchableOpacity
       className={`
         p-3 rounded-xl items-center justify-center
-        ${(loading || disabled) && "opacity-50"}
+        ${loading || (disabled && "opacity-50")}
         ${colorClasses}
         ${className}
       `}
       onPress={() => {
         if (!loading && !disabled && onPress) {
           onPress();
-          lightHapticFeedback();
+          Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
         }
       }}
       disabled={disabled || loading}
       {...props}
     >
       {loading ? (
-        <View className="p-0.5">
         <Loader />
-        </View>
       ) : (
         <View
           className={`

components/Chromecast.tsx

@@ -1,16 +1,14 @@
 import { Feather } from "@expo/vector-icons";
 import { BlurView } from "expo-blur";
-import React, { useCallback, useEffect } from "react";
+import React, { useEffect } from "react";
 import { Platform, TouchableOpacity, ViewProps } from "react-native";
 import GoogleCast, {
-  CastButton,
   CastContext,
   useCastDevice,
   useDevices,
   useMediaStatus,
   useRemoteMediaClient,
 } from "react-native-google-cast";
-import { RoundButton } from "./RoundButton";
 
 interface Props extends ViewProps {
   width?: number;
@@ -34,7 +32,6 @@ export const Chromecast: React.FC<Props> = ({
   useEffect(() => {
     (async () => {
       if (!discoveryManager) {
-        console.warn("DiscoveryManager is not initialized");
         return;
       }
 
@@ -42,45 +39,49 @@ export const Chromecast: React.FC<Props> = ({
     })();
   }, [client, devices, castDevice, sessionManager, discoveryManager]);
 
-  // Android requires the cast button to be present for startDiscovery to work
-  const AndroidCastButton = useCallback(
-    () =>
-      Platform.OS === "android" ? (
-        <CastButton tintColor="transparent" />
-      ) : (
-        <></>
-      ),
-    [Platform.OS]
-  );
-
   if (background === "transparent")
     return (
-      <RoundButton
+      <TouchableOpacity
-        size="large"
-        className="mr-2"
-        background={false}
         onPress={() => {
           if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
           else CastContext.showCastDialog();
         }}
+        className="rounded-full h-10 w-10 flex items-center justify-center b"
         {...props}
       >
-        <AndroidCastButton />
         <Feather name="cast" size={22} color={"white"} />
-      </RoundButton>
+      </TouchableOpacity>
+    );
+
+  if (Platform.OS === "android")
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
+          else CastContext.showCastDialog();
+        }}
+        className="rounded-full h-10 w-10 flex items-center justify-center bg-neutral-800/80"
+        {...props}
+      >
+        <Feather name="cast" size={22} color={"white"} />
+      </TouchableOpacity>
     );
 
   return (
-    <RoundButton
+    <TouchableOpacity
-      size="large"
       onPress={() => {
         if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
         else CastContext.showCastDialog();
       }}
       {...props}
     >
-      <AndroidCastButton />
+      <BlurView
+        intensity={100}
+        className="rounded-full overflow-hidden h-10 aspect-square flex items-center justify-center"
+        {...props}
+      >
         <Feather name="cast" size={22} color={"white"} />
-    </RoundButton>
+      </BlurView>
+    </TouchableOpacity>
   );
 };

components/ContinueWatchingPoster.tsx

@@ -1,30 +1,26 @@
 import { apiAtom } from "@/providers/JellyfinProvider";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { Image } from "expo-image";
-import { useAtomValue } from "jotai";
+import { useAtom } from "jotai";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { View } from "react-native";
 import { WatchedIndicator } from "./WatchedIndicator";
-import React from "react";
-import { Ionicons } from "@expo/vector-icons";
 
 type ContinueWatchingPosterProps = {
   item: BaseItemDto;
+  width?: number;
   useEpisodePoster?: boolean;
-  size?: "small" | "normal";
-  showPlayButton?: boolean;
 };
 
 const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
   item,
+  width = 176,
   useEpisodePoster = false,
-  size = "normal",
-  showPlayButton = false,
 }) => {
-  const api = useAtomValue(apiAtom);
+  const [api] = useAtom(apiAtom);
 
   /**
-   * Get horizontal poster for movie and episode, with failover to primary.
+   * Get horrizontal poster for movie and episode, with failover to primary.
    */
   const url = useMemo(() => {
     if (!api) return;
@@ -43,45 +39,29 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
       else
         return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
     }
-    if (item.Type === "Program") {
-      if (item.ImageTags?.["Thumb"])
-        return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.["Thumb"]}`;
-      else
-        return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
-    }
-
-    if (item.ImageTags?.["Thumb"])
-      return `${api?.basePath}/Items/${item.Id}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ImageTags?.["Thumb"]}`;
-    else
-      return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
   }, [item]);
 
-  const progress = useMemo(() => {
+  const [progress, setProgress] = useState(
-    if (item.Type === "Program") {
+    item.UserData?.PlayedPercentage || 0
-      const startDate = new Date(item.StartDate || "");
+  );
-      const endDate = new Date(item.EndDate || "");
-      const now = new Date();
-      const total = endDate.getTime() - startDate.getTime();
-      const elapsed = now.getTime() - startDate.getTime();
-      return (elapsed / total) * 100;
-    } else {
-      return item.UserData?.PlayedPercentage || 0;
-    }
-  }, [item]);
 
   if (!url)
     return (
-      <View className="aspect-video border border-neutral-800 w-44"></View>
+      <View
+        className="aspect-video border border-neutral-800"
+        style={{
+          width,
+        }}
+      ></View>
     );
 
   return (
     <View
-      className={`
+      style={{
-      relative w-44 aspect-video rounded-lg overflow-hidden border border-neutral-800
+        width,
-      ${size === "small" ? "w-32" : "w-44"}
+      }}
-    `}
+      className="relative aspect-video rounded-lg overflow-hidden border border-neutral-800"
     >
-      <View className="w-full h-full flex items-center justify-center">
       <Image
         key={item.Id}
         id={item.Id}
@@ -92,17 +72,14 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
         contentFit="cover"
         className="w-full h-full"
       />
-        {showPlayButton && (
-          <View className="absolute inset-0 flex items-center justify-center">
-            <Ionicons name="play-circle" size={40} color="white" />
-          </View>
-        )}
-      </View>
       {!progress && <WatchedIndicator item={item} />}
       {progress > 0 && (
         <>
           <View
-            className={`absolute w-100 bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full`}
+            style={{
+              width: `100%`,
+            }}
+            className={`absolute bottom-0 left-0 h-1 bg-neutral-700 opacity-80 w-full`}
           ></View>
           <View
             style={{

components/CurrentlyPlayingBar.tsx

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

components/DownloadItem.tsx

@@ -1,12 +1,11 @@
 import { useRemuxHlsToMp4 } from "@/hooks/useRemuxHlsToMp4";
-import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { runningProcesses } from "@/utils/atoms/downloads";
 import { queueActions, queueAtom } from "@/utils/atoms/queue";
-import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
+import { useSettings } from "@/utils/atoms/settings";
-import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import ios from "@/utils/profiles/ios";
-import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
+import native from "@/utils/profiles/native";
-import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
+import old from "@/utils/profiles/old";
-import download from "@/utils/profiles/download";
 import Ionicons from "@expo/vector-icons/Ionicons";
 import {
   BottomSheetBackdrop,
@@ -18,11 +17,12 @@ import {
   BaseItemDto,
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { Href, router, useFocusEffect } from "expo-router";
+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 React, { useCallback, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
-import { Alert, View, ViewProps } from "react-native";
+import { Alert, TouchableOpacity, View, ViewProps } from "react-native";
-import { toast } from "sonner-native";
 import { AudioTrackSelector } from "./AudioTrackSelector";
 import { Bitrate, BitrateSelector } from "./BitrateSelector";
 import { Button } from "./Button";
@@ -30,39 +30,22 @@ import { Text } from "./common/Text";
 import { Loader } from "./Loader";
 import { MediaSourceSelector } from "./MediaSourceSelector";
 import ProgressCircle from "./ProgressCircle";
-import { RoundButton } from "./RoundButton";
 import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
-import { t } from "i18next";
 
 interface DownloadProps extends ViewProps {
-  items: BaseItemDto[];
+  item: BaseItemDto;
-  MissingDownloadIconComponent: () => React.ReactElement;
-  DownloadedIconComponent: () => React.ReactElement;
-  title?: string;
-  subtitle?: string;
-  size?: "default" | "large";
 }
 
-export const DownloadItems: React.FC<DownloadProps> = ({
+export const DownloadItem: React.FC<DownloadProps> = ({ item, ...props }) => {
-  items,
-  MissingDownloadIconComponent,
-  DownloadedIconComponent,
-  title = "Download",
-  subtitle = "",
-  size = "default",
-  ...props
-}) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
+  const [process] = useAtom(runningProcesses);
   const [queue, setQueue] = useAtom(queueAtom);
   const [settings] = useSettings();
+  const { startRemuxing } = useRemuxHlsToMp4(item);
 
-  const { processes, startBackgroundDownload, downloadedFiles } = useDownload();
+  const [selectedMediaSource, setSelectedMediaSource] =
-  const { startRemuxing } = useRemuxHlsToMp4();
+    useState<MediaSourceInfo | null>(null);
-
-  const [selectedMediaSource, setSelectedMediaSource] = useState<
-    MediaSourceInfo | undefined | null
-  >(undefined);
   const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
   const [selectedSubtitleStream, setSelectedSubtitleStream] =
     useState<number>(0);
@@ -71,183 +54,136 @@ export const DownloadItems: React.FC<DownloadProps> = ({
     value: undefined,
   });
 
-  const userCanDownload = useMemo(
+  const userCanDownload = useMemo(() => {
-    () => user?.Policy?.EnableContentDownloading,
+    return user?.Policy?.EnableContentDownloading;
-    [user]
+  }, [user]);
-  );
-  const usingOptimizedServer = useMemo(
-    () => settings?.downloadMethod === DownloadMethod.Optimized,
-    [settings]
-  );
 
+  /**
+   * Bottom sheet
+   */
   const bottomSheetModalRef = useRef<BottomSheetModal>(null);
 
   const handlePresentModalPress = useCallback(() => {
     bottomSheetModalRef.current?.present();
   }, []);
 
-  const handleSheetChanges = useCallback((index: number) => {}, []);
+  const handleSheetChanges = useCallback((index: number) => {
+    console.log("handleSheetChanges", index);
+  }, []);
 
   const closeModal = useCallback(() => {
     bottomSheetModalRef.current?.dismiss();
   }, []);
 
-  const itemIds = useMemo(() => items.map((i) => i.Id), [items]);
+  /**
-
+   * Start download
-  const itemsNotDownloaded = useMemo(
+   */
-    () =>
+  const initiateDownload = useCallback(async () => {
-      items.filter((i) => !downloadedFiles?.some((f) => f.item.Id === i.Id)),
+    if (!api || !user?.Id || !item.Id || !selectedMediaSource?.Id) {
-    [items, downloadedFiles]
-  );
-
-  const allItemsDownloaded = useMemo(() => {
-    if (items.length === 0) return false;
-    return itemsNotDownloaded.length === 0;
-  }, [items, itemsNotDownloaded]);
-  const itemsProcesses = useMemo(
-    () => processes?.filter((p) => itemIds.includes(p.item.Id)),
-    [processes, itemIds]
-  );
-
-  const progress = useMemo(() => {
-    if (itemIds.length == 1)
-      return itemsProcesses.reduce((acc, p) => acc + p.progress, 0);
-    return (
-      ((itemIds.length -
-        queue.filter((q) => itemIds.includes(q.item.Id)).length) /
-        itemIds.length) *
-      100
-    );
-  }, [queue, itemsProcesses, itemIds]);
-
-  const itemsQueued = useMemo(() => {
-    return (
-      itemsNotDownloaded.length > 0 &&
-      itemsNotDownloaded.every((p) => queue.some((q) => p.Id == q.item.Id))
-    );
-  }, [queue, itemsNotDownloaded]);
-  const navigateToDownloads = () => router.push("/downloads");
-
-  const onDownloadedPress = () => {
-    const firstItem = items?.[0];
-    router.push(
-      firstItem.Type !== "Episode"
-        ? "/downloads"
-        : ({
-            pathname: `/downloads/${firstItem.SeriesId}`,
-            params: {
-              episodeSeasonIndex: firstItem.ParentIndexNumber,
-            },
-          } as Href)
-    );
-  };
-
-  const acceptDownloadOptions = useCallback(() => {
-    if (userCanDownload === true) {
-      if (itemsNotDownloaded.some((i) => !i.Id)) {
-        throw new Error("No item id");
-      }
-      closeModal();
-
-      if (usingOptimizedServer) initiateDownload(...itemsNotDownloaded);
-      else {
-        queueActions.enqueue(
-          queue,
-          setQueue,
-          ...itemsNotDownloaded.map((item) => ({
-            id: item.Id!,
-            execute: async () => await initiateDownload(item),
-            item,
-          }))
-        );
-      }
-    } else {
-      toast.error(t("home.downloads.toasts.you_are_not_allowed_to_download_files"));
-    }
-  }, [
-    queue,
-    setQueue,
-    itemsNotDownloaded,
-    usingOptimizedServer,
-    userCanDownload,
-    maxBitrate,
-    selectedMediaSource,
-    selectedAudioStream,
-    selectedSubtitleStream,
-  ]);
-
-  const initiateDownload = useCallback(
-    async (...items: BaseItemDto[]) => {
-      if (
-        !api ||
-        !user?.Id ||
-        items.some((p) => !p.Id) ||
-        (itemsNotDownloaded.length === 1 && !selectedMediaSource?.Id)
-      ) {
       throw new Error(
         "DownloadItem ~ initiateDownload: No api or user or item"
       );
     }
-      let mediaSource = selectedMediaSource;
-      let audioIndex: number | undefined = selectedAudioStream;
-      let subtitleIndex: number | undefined = selectedSubtitleStream;
 
-      for (const item of items) {
+    let deviceProfile: any = ios;
-        if (itemsNotDownloaded.length > 1) {
+
-          ({ mediaSource, audioIndex, subtitleIndex } = getDefaultPlaySettings(
+    if (settings?.deviceProfile === "Native") {
-            item,
+      deviceProfile = native;
-            settings!
+    } else if (settings?.deviceProfile === "Old") {
-          ));
+      deviceProfile = old;
     }
 
-        const res = await getStreamUrl({
+    const response = await api.axiosInstance.post(
-          api,
+      `${api.basePath}/Items/${item.Id}/PlaybackInfo`,
-          item,
+      {
-          startTimeTicks: 0,
+        DeviceProfile: deviceProfile,
-          userId: user?.Id,
+        UserId: user.Id,
-          audioStreamIndex: audioIndex,
+        MaxStreamingBitrate: maxBitrate.value,
-          maxStreamingBitrate: maxBitrate.value,
+        StartTimeTicks: 0,
-          mediaSourceId: mediaSource?.Id,
+        EnableTranscoding: maxBitrate.value ? true : undefined,
-          subtitleStreamIndex: subtitleIndex,
+        AutoOpenLiveStream: true,
-          deviceProfile: download,
+        AllowVideoStreamCopy: maxBitrate.value ? false : true,
-        });
+        MediaSourceId: selectedMediaSource?.Id,
-
+        AudioStreamIndex: selectedAudioStream,
-        if (!res) {
+        SubtitleStreamIndex: selectedSubtitleStream,
-          Alert.alert(
-            t("home.downloads.something_went_wrong"),
-            t("home.downloads.could_not_get_stream_url_from_jellyfin")
-          );
-          continue;
-        }
-
-        const { mediaSource: source, url } = res;
-
-        if (!url || !source) throw new Error("No url");
-
-        saveDownloadItemInfoToDiskTmp(item, source, url);
-
-        if (usingOptimizedServer) {
-          await startBackgroundDownload(url, item, source);
-        } else {
-          await startRemuxing(item, url, source);
-        }
-      }
       },
-    [
+      {
+        headers: {
+          Authorization: `MediaBrowser DeviceId="${api.deviceInfo.id}", Token="${api.accessToken}"`,
+        },
+      }
+    );
+
+    let url: string | undefined = undefined;
+
+    const mediaSource: MediaSourceInfo = response.data.MediaSources.find(
+      (source: MediaSourceInfo) => source.Id === selectedMediaSource?.Id
+    );
+
+    if (!mediaSource) {
+      throw new Error("No media source");
+    }
+
+    if (mediaSource.SupportsDirectPlay) {
+      if (item.MediaType === "Video") {
+        console.log("Using direct stream for video!");
+        url = `${api.basePath}/Videos/${item.Id}/stream.mp4?mediaSourceId=${item.Id}&static=true&mediaSourceId=${mediaSource.Id}&deviceId=${api.deviceInfo.id}&api_key=${api.accessToken}`;
+      } else if (item.MediaType === "Audio") {
+        console.log("Using direct stream for audio!");
+        const searchParams = new URLSearchParams({
+          UserId: user.Id,
+          DeviceId: api.deviceInfo.id,
+          MaxStreamingBitrate: "140000000",
+          Container:
+            "opus,webm|opus,mp3,aac,m4a|aac,m4b|aac,flac,webma,webm|webma,wav,ogg",
+          TranscodingContainer: "mp4",
+          TranscodingProtocol: "hls",
+          AudioCodec: "aac",
+          api_key: api.accessToken,
+          StartTimeTicks: "0",
+          EnableRedirection: "true",
+          EnableRemoteMedia: "false",
+        });
+        url = `${api.basePath}/Audio/${
+          item.Id
+        }/universal?${searchParams.toString()}`;
+      }
+    } else if (mediaSource.TranscodingUrl) {
+      console.log("Using transcoded stream!");
+      url = `${api.basePath}${mediaSource.TranscodingUrl}`;
+    }
+
+    if (!url) throw new Error("No url");
+
+    return await startRemuxing(url);
+  }, [
     api,
+    item,
+    startRemuxing,
     user?.Id,
-      itemsNotDownloaded,
     selectedMediaSource,
     selectedAudioStream,
     selectedSubtitleStream,
-      settings,
     maxBitrate,
-      usingOptimizedServer,
+  ]);
-      startBackgroundDownload,
+
-      startRemuxing,
+  /**
-    ]
+   * Check if item is downloaded
+   */
+  const { data: downloaded, isFetching } = 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,
+  });
+
   const renderBackdrop = useCallback(
     (props: BottomSheetBackdropProps) => (
       <BottomSheetBackdrop
@@ -258,61 +194,55 @@ export const DownloadItems: React.FC<DownloadProps> = ({
     ),
     []
   );
-  useFocusEffect(
-    useCallback(() => {
-      if (!settings) return;
-      if (itemsNotDownloaded.length !== 1) return;
-      const { bitrate, mediaSource, audioIndex, subtitleIndex } =
-        getDefaultPlaySettings(items[0], settings);
 
-      setSelectedMediaSource(mediaSource ?? undefined);
+  return (
-      setSelectedAudioStream(audioIndex ?? 0);
+    <View
-      setSelectedSubtitleStream(subtitleIndex ?? -1);
+      className="bg-neutral-800/80 rounded-full h-10 w-10 flex items-center justify-center"
-      setMaxBitrate(bitrate);
+      {...props}
-    }, [items, itemsNotDownloaded, settings])
+    >
-  );
+      {isFetching ? (
-
+        <Loader />
-  const renderButtonContent = () => {
+      ) : process && process?.item.Id === item.Id ? (
-    if (processes && itemsProcesses.length > 0) {
+        <TouchableOpacity
-      return progress === 0 ? (
+          onPress={() => {
+            router.push("/downloads");
+          }}
+        >
+          {process.progress === 0 ? (
             <Loader />
           ) : (
             <View className="-rotate-45">
               <ProgressCircle
                 size={24}
-            fill={progress}
+                fill={process.progress}
                 width={4}
                 tintColor="#9334E9"
                 backgroundColor="#bdc3c7"
               />
             </View>
-      );
+          )}
-    } else if (itemsQueued) {
+        </TouchableOpacity>
-      return <Ionicons name="hourglass" size={24} color="white" />;
+      ) : queue.some((i) => i.id === item.Id) ? (
-    } else if (allItemsDownloaded) {
+        <TouchableOpacity
-      return <DownloadedIconComponent />;
+          onPress={() => {
-    } else {
+            router.push("/downloads");
-      return <MissingDownloadIconComponent />;
+          }}
-    }
+        >
-  };
+          <Ionicons name="hourglass" size={24} color="white" />
-
+        </TouchableOpacity>
-  const onButtonPress = () => {
+      ) : downloaded ? (
-    if (processes && itemsProcesses.length > 0) {
+        <TouchableOpacity
-      navigateToDownloads();
+          onPress={() => {
-    } else if (itemsQueued) {
+            router.push("/downloads");
-      navigateToDownloads();
+          }}
-    } else if (allItemsDownloaded) {
+        >
-      onDownloadedPress();
+          <Ionicons name="cloud-download" size={26} color="#9333ea" />
-    } else {
+        </TouchableOpacity>
-      handlePresentModalPress();
+      ) : (
-    }
+        <TouchableOpacity onPress={handlePresentModalPress}>
-  };
+          <Ionicons name="cloud-download-outline" size={24} color="white" />
-
+        </TouchableOpacity>
-  return (
+      )}
-    <View {...props}>
-      <RoundButton size={size} onPress={onButtonPress}>
-        {renderButtonContent()}
-      </RoundButton>
       <BottomSheetModal
         ref={bottomSheetModalRef}
         enableDynamicSizing
@@ -327,24 +257,17 @@ export const DownloadItems: React.FC<DownloadProps> = ({
       >
         <BottomSheetView>
           <View className="flex flex-col space-y-4 px-4 pb-8 pt-2">
-            <View>
+            <Text className="font-bold text-2xl text-neutral-10">
-              <Text className="font-bold text-2xl text-neutral-100">
+              Download options
-                {title}
             </Text>
-              <Text className="text-neutral-300">
-                {subtitle || t("item_card.download.download_x_item", {item_count: itemsNotDownloaded.length})}
-              </Text>
-            </View>
             <View className="flex flex-col space-y-2 w-full items-start">
               <BitrateSelector
                 inverted
-                onChange={setMaxBitrate}
+                onChange={(val) => setMaxBitrate(val)}
                 selected={maxBitrate}
               />
-              {itemsNotDownloaded.length === 1 && (
-                <>
               <MediaSourceSelector
-                    item={items[0]}
+                item={item}
                 onChange={setSelectedMediaSource}
                 selected={selectedMediaSource}
               />
@@ -362,48 +285,33 @@ export const DownloadItems: React.FC<DownloadProps> = ({
                   />
                 </View>
               )}
-                </>
-              )}
             </View>
             <Button
               className="mt-auto"
-              onPress={acceptDownloadOptions}
+              onPress={() => {
+                if (userCanDownload === true) {
+                  closeModal();
+                  queueActions.enqueue(queue, setQueue, {
+                    id: item.Id!,
+                    execute: async () => {
+                      await initiateDownload();
+                    },
+                    item,
+                  });
+                } else {
+                  Alert.alert(
+                    "Disabled",
+                    "This user is not allowed to download files."
+                  );
+                }
+              }}
               color="purple"
             >
-              {t("item_card.download.download_button")}
+              Download
             </Button>
-            <View className="opacity-70 text-center w-full flex items-center">
-              <Text className="text-xs">
-                {usingOptimizedServer
-                  ? t("item_card.download.using_optimized_server")
-                  : t("item_card.download.using_default_method")}
-              </Text>
-            </View>
           </View>
         </BottomSheetView>
       </BottomSheetModal>
     </View>
   );
 };
-
-export const DownloadSingleItem: React.FC<{
-  size?: "default" | "large";
-  item: BaseItemDto;
-}> = ({ item, size = "default" }) => {
-  return (
-    <DownloadItems
-      size={size}
-      title={item.Type == "Episode"
-        ? t("item_card.download.download_episode")
-        : t("item_card.download.download_movie")}
-      subtitle={item.Name!}
-      items={[item]}
-      MissingDownloadIconComponent={() => (
-        <Ionicons name="cloud-download-outline" size={24} color="white" />
-      )}
-      DownloadedIconComponent={() => (
-        <Ionicons name="cloud-download" size={26} color="#9333ea" />
-      )}
-    />
-  );
-};

components/GenreTags.tsx

@@ -1,44 +0,0 @@
-// GenreTags.tsx
-import React from "react";
-import {StyleProp, TextStyle, View, ViewProps} from "react-native";
-import { Text } from "./common/Text";
-
-interface TagProps {
-  tags?: string[];
-  textClass?: ViewProps["className"]
-}
-
-export const Tag: React.FC<{ text: string, textClass?: ViewProps["className"], textStyle?: StyleProp<TextStyle>} & ViewProps> = ({
-  text,
-  textClass,
-  textStyle,
-  ...props
-}) => {
-  return (
-    <View className="bg-neutral-800 rounded-full px-2 py-1" {...props}>
-      <Text className={textClass} style={textStyle}>{text}</Text>
-    </View>
-  );
-};
-
-export const Tags: React.FC<TagProps & ViewProps> = ({ tags, textClass = "text-xs", ...props }) => {
-  if (!tags || tags.length === 0) return null;
-
-  return (
-    <View className={`flex flex-row flex-wrap gap-1 ${props.className}`} {...props}>
-      {tags.map((tag, idx) => (
-        <View key={idx}>
-          <Tag key={idx} textClass={textClass} text={tag}/>
-        </View>
-      ))}
-    </View>
-  );
-};
-
-export const GenreTags: React.FC<{ genres?: string[]}> = ({ genres }) => {
-  return (
-    <View className="mt-2">
-      <Tags tags={genres}/>
-    </View>
-  );
-};

components/ItemCardText.tsx

@@ -10,16 +10,15 @@ type ItemCardProps = {
 
 export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
   return (
-    <View className="mt-2 flex flex-col">
+    <View className="mt-2 flex flex-col h-12">
       {item.Type === "Episode" ? (
         <>
-          <Text numberOfLines={1} className="">
+          <Text numberOfLines={2} className="">
-            {item.Name}
+            {item.SeriesName}
           </Text>
           <Text numberOfLines={1} className="text-xs opacity-50">
-            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}
+            {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}{" "}
-            {" - "}
+            {item.Name}
-            {item.SeriesName}
           </Text>
         </>
       ) : (

components/ItemContent.tsx

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

components/ItemHeader.tsx

@@ -1,11 +1,8 @@
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import React from "react";
 import { View, ViewProps } from "react-native";
-import { GenreTags } from "./GenreTags";
 import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
 import { Ratings } from "./Ratings";
 import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader";
-import { ItemActions } from "./series/SeriesActions";
 
 interface Props extends ViewProps {
   item?: BaseItemDto | null;
@@ -15,7 +12,7 @@ export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
   if (!item)
     return (
       <View
-        className="flex flex-col space-y-1.5 w-full items-start h-32"
+        className="flex flex-col space-y-1.5 w-full items-start h-24"
         {...props}
       >
         <View className="w-1/3 h-6 bg-neutral-900 rounded" />
@@ -26,25 +23,16 @@ export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
     );
 
   return (
-    <View className="flex flex-col" {...props}>
+    <View
-      <View className="flex flex-col" {...props}>
+      style={{
-        <View className="flex flex-row items-center justify-between">
+        minHeight: 96,
+      }}
+      className="flex flex-col"
+      {...props}
+    >
       <Ratings item={item} className="mb-2" />
-          <ItemActions item={item} />
+      {item.Type === "Episode" && <EpisodeTitleHeader item={item} />}
-        </View>
+      {item.Type === "Movie" && <MoviesTitleHeader item={item} />}
-        {item.Type === "Episode" && (
-          <>
-            <EpisodeTitleHeader item={item} />
-            <GenreTags genres={item.Genres!} />
-          </>
-        )}
-        {item.Type === "Movie" && (
-          <>
-            <MoviesTitleHeader item={item} />
-            <GenreTags genres={item.Genres!} />
-          </>
-        )}
-      </View>
     </View>
   );
 };

components/ItemTechnicalDetails.tsx

@@ -1,240 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import {
-  MediaSourceInfo,
-  type MediaStream,
-} from "@jellyfin/sdk/lib/generated-client";
-import React, { useMemo, useRef } from "react";
-import { TouchableOpacity, View } from "react-native";
-import { Badge } from "./Badge";
-import { Text } from "./common/Text";
-import {
-  BottomSheetModal,
-  BottomSheetBackdropProps,
-  BottomSheetBackdrop,
-  BottomSheetView,
-  BottomSheetScrollView,
-} from "@gorhom/bottom-sheet";
-import { Button } from "./Button";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  source?: MediaSourceInfo;
-}
-
-export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
-  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-  const { t } = useTranslation();
-
-  return (
-    <View className="px-4 mt-2 mb-4">
-      <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
-      <TouchableOpacity onPress={() => bottomSheetModalRef.current?.present()}>
-        <View className="flex flex-row space-x-2">
-          <VideoStreamInfo source={source} />
-        </View>
-        <Text className="text-purple-600">{t("item_card.more_details")}</Text>
-      </TouchableOpacity>
-      <BottomSheetModal
-        ref={bottomSheetModalRef}
-        snapPoints={["80%"]}
-        handleIndicatorStyle={{
-          backgroundColor: "white",
-        }}
-        backgroundStyle={{
-          backgroundColor: "#171717",
-        }}
-        backdropComponent={(props: BottomSheetBackdropProps) => (
-          <BottomSheetBackdrop
-            {...props}
-            disappearsOnIndex={-1}
-            appearsOnIndex={0}
-          />
-        )}
-      >
-        <BottomSheetScrollView>
-          <View className="flex flex-col space-y-2 p-4 mb-4">
-            <View className="">
-              <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
-              <View className="flex flex-row space-x-2">
-                <VideoStreamInfo source={source} />
-              </View>
-            </View>
-
-            <View className="">
-              <Text className="text-lg font-bold mb-2">{t("item_card.audio")}</Text>
-              <AudioStreamInfo
-                audioStreams={
-                  source?.MediaStreams?.filter(
-                    (stream) => stream.Type === "Audio"
-                  ) || []
-                }
-              />
-            </View>
-
-            <View className="">
-              <Text className="text-lg font-bold mb-2">{t("item_card.subtitles")}</Text>
-              <SubtitleStreamInfo
-                subtitleStreams={
-                  source?.MediaStreams?.filter(
-                    (stream) => stream.Type === "Subtitle"
-                  ) || []
-                }
-              />
-            </View>
-          </View>
-        </BottomSheetScrollView>
-      </BottomSheetModal>
-    </View>
-  );
-};
-
-const SubtitleStreamInfo = ({
-  subtitleStreams,
-}: {
-  subtitleStreams: MediaStream[];
-}) => {
-  return (
-    <View className="flex flex-col">
-      {subtitleStreams.map((stream, index) => (
-        <View key={stream.Index} className="flex flex-col">
-          <Text className="text-xs mb-3 text-neutral-400">
-            {stream.DisplayTitle}
-          </Text>
-          <View className="flex flex-row flex-wrap gap-2">
-            <Badge
-              variant="gray"
-              iconLeft={
-                <Ionicons name="language-outline" size={16} color="white" />
-              }
-              text={stream.Language}
-            />
-            <Badge
-              variant="gray"
-              text={stream.Codec}
-              iconLeft={
-                <Ionicons name="layers-outline" size={16} color="white" />
-              }
-            />
-          </View>
-        </View>
-      ))}
-    </View>
-  );
-};
-
-const AudioStreamInfo = ({ audioStreams }: { audioStreams: MediaStream[] }) => {
-  return (
-    <View className="flex flex-col">
-      {audioStreams.map((audioStreams, index) => (
-        <View key={index} className="flex flex-col">
-          <Text className="mb-3 text-neutral-400 text-xs">
-            {audioStreams.DisplayTitle}
-          </Text>
-          <View className="flex-row flex-wrap gap-2">
-            <Badge
-              variant="gray"
-              iconLeft={
-                <Ionicons name="language-outline" size={16} color="white" />
-              }
-              text={audioStreams.Language}
-            />
-            <Badge
-              variant="gray"
-              iconLeft={
-                <Ionicons
-                  name="musical-notes-outline"
-                  size={16}
-                  color="white"
-                />
-              }
-              text={audioStreams.Codec}
-            />
-            <Badge
-              variant="gray"
-              iconLeft={<Ionicons name="mic-outline" size={16} color="white" />}
-              text={audioStreams.ChannelLayout}
-            />
-            <Badge
-              variant="gray"
-              iconLeft={
-                <Ionicons name="speedometer-outline" size={16} color="white" />
-              }
-              text={formatBitrate(audioStreams.BitRate)}
-            />
-          </View>
-        </View>
-      ))}
-    </View>
-  );
-};
-
-const VideoStreamInfo = ({ source }: { source?: MediaSourceInfo }) => {
-  if (!source) return null;
-
-  const videoStream = useMemo(() => {
-    return source.MediaStreams?.find(
-      (stream) => stream.Type === "Video"
-    ) as MediaStream;
-  }, [source.MediaStreams]);
-
-  if (!videoStream) return null;
-
-  return (
-    <View className="flex-row flex-wrap gap-2">
-      <Badge
-        variant="gray"
-        iconLeft={<Ionicons name="film-outline" size={16} color="white" />}
-        text={formatFileSize(source.Size)}
-      />
-      <Badge
-        variant="gray"
-        iconLeft={<Ionicons name="film-outline" size={16} color="white" />}
-        text={`${videoStream.Width}x${videoStream.Height}`}
-      />
-      <Badge
-        variant="gray"
-        iconLeft={
-          <Ionicons name="color-palette-outline" size={16} color="white" />
-        }
-        text={videoStream.VideoRange}
-      />
-      <Badge
-        variant="gray"
-        iconLeft={
-          <Ionicons name="code-working-outline" size={16} color="white" />
-        }
-        text={videoStream.Codec}
-      />
-      <Badge
-        variant="gray"
-        iconLeft={
-          <Ionicons name="speedometer-outline" size={16} color="white" />
-        }
-        text={formatBitrate(videoStream.BitRate)}
-      />
-      <Badge
-        variant="gray"
-        iconLeft={<Ionicons name="play-outline" size={16} color="white" />}
-        text={`${videoStream.AverageFrameRate?.toFixed(0)} fps`}
-      />
-    </View>
-  );
-};
-
-const formatFileSize = (bytes?: number | null) => {
-  if (!bytes) return "N/A";
-
-  const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
-  if (bytes === 0) return "0 Byte";
-  const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)).toString());
-  return Math.round((bytes / Math.pow(1024, i)) * 100) / 100 + " " + sizes[i];
-};
-
-const formatBitrate = (bitrate?: number | null) => {
-  if (!bitrate) return "N/A";
-
-  const sizes = ["bps", "Kbps", "Mbps", "Gbps", "Tbps"];
-  if (bitrate === 0) return "0 bps";
-  const i = parseInt(Math.floor(Math.log(bitrate) / Math.log(1000)).toString());
-  return Math.round((bitrate / Math.pow(1000, i)) * 100) / 100 + " " + sizes[i];
-};

components/JellyfinServerDiscovery.tsx

@@ -1,46 +0,0 @@
-import React from "react";
-import { View, Text, TouchableOpacity } from "react-native";
-import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery";
-import { Button } from "./Button";
-import { ListGroup } from "./list/ListGroup";
-import { ListItem } from "./list/ListItem";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  onServerSelect?: (server: { address: string; serverName?: string }) => void;
-}
-
-const JellyfinServerDiscovery: React.FC<Props> = ({ onServerSelect }) => {
-  const { servers, isSearching, startDiscovery } = useJellyfinDiscovery();
-  const { t } = useTranslation();
-
-  return (
-    <View className="mt-2">
-      <Button onPress={startDiscovery} color="black">
-        <Text className="text-white text-center">
-          {isSearching ? t("server.searching") : t("server.search_for_local_servers")}
-        </Text>
-      </Button>
-
-      {servers.length ? (
-        <ListGroup title={t("server.servers")} className="mt-4">
-          {servers.map((server) => (
-            <ListItem
-              key={server.address}
-              onPress={() =>
-                onServerSelect?.({
-                  address: server.address,
-                  serverName: server.serverName,
-                })
-              }
-              title={server.address}
-              showArrow
-            />
-          ))}
-        </ListGroup>
-      ) : null}
-    </View>
-  );
-};
-
-export default JellyfinServerDiscovery;

components/List.tsx

@@ -0,0 +1,19 @@
+import { View, ViewProps } from "react-native";
+import { Text } from "@/components/common/Text";
+import { PropsWithChildren } from "react";
+
+interface Props extends ViewProps {}
+
+export const List: React.FC<PropsWithChildren<Props>> = ({
+  children,
+  ...props
+}) => {
+  return (
+    <View
+      className="flex flex-col rounded-xl overflow-hidden border-neutral-800 divide-y-2 divide-solid divide-neutral-800"
+      {...props}
+    >
+      {children}
+    </View>
+  );
+};

components/ListItem.tsx

@@ -0,0 +1,36 @@
+import { PropsWithChildren, ReactNode } from "react";
+import {
+  TouchableOpacity,
+  TouchableOpacityProps,
+  View,
+  ViewProps,
+} from "react-native";
+import { Text } from "./common/Text";
+
+interface Props extends TouchableOpacityProps {
+  title?: string | null | undefined;
+  subTitle?: string | null | undefined;
+  children?: ReactNode;
+  iconAfter?: ReactNode;
+}
+
+export const ListItem: React.FC<PropsWithChildren<Props>> = ({
+  title,
+  subTitle,
+  iconAfter,
+  children,
+  ...props
+}) => {
+  return (
+    <TouchableOpacity
+      className="flex flex-row items-center justify-between bg-neutral-900 p-4"
+      {...props}
+    >
+      <View className="flex flex-col">
+        <Text className="font-bold ">{title}</Text>
+        {subTitle && <Text className="text-xs">{subTitle}</Text>}
+      </View>
+      {iconAfter}
+    </TouchableOpacity>
+  );
+};

components/MediaSourceSelector.tsx

@@ -1,17 +1,17 @@
+import { tc } from "@/utils/textTools";
 import {
   BaseItemDto,
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { useMemo } from "react";
+import { useEffect, useMemo } from "react";
 import { TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "./common/Text";
-import { useTranslation } from "react-i18next";
 
 interface Props extends React.ComponentProps<typeof View> {
   item: BaseItemDto;
   onChange: (value: MediaSourceInfo) => void;
-  selected?: MediaSourceInfo | null;
+  selected: MediaSourceInfo | null;
 }
 
 export const MediaSourceSelector: React.FC<Props> = ({
@@ -20,35 +20,28 @@ export const MediaSourceSelector: React.FC<Props> = ({
   selected,
   ...props
 }) => {
-  const selectedName = useMemo(
+  const mediaSources = useMemo(() => {
+    return item.MediaSources;
+  }, [item]);
+
+  const selectedMediaSource = useMemo(
     () =>
-      item.MediaSources?.find((x) => x.Id === selected?.Id)?.MediaStreams?.find(
+      mediaSources
-        (x) => x.Type === "Video"
+        ?.find((x) => x.Id === selected?.Id)
-      )?.DisplayTitle || "",
+        ?.MediaStreams?.find((x) => x.Type === "Video")?.DisplayTitle || "",
-    [item, selected]
+    [mediaSources, selected]
   );
 
-  const { t } = useTranslation();
+  useEffect(() => {
-
+    if (mediaSources?.length) onChange(mediaSources[0]);
-  const commonPrefix = useMemo(() => {
+  }, [mediaSources]);
-    const mediaSources = item.MediaSources || [];
-    if (!mediaSources.length) return "";
-
-    let commonPrefix = "";
-    for (let i = 0; i < mediaSources[0].Name!.length; i++) {
-      const char = mediaSources[0].Name![i];
-      if (mediaSources.every((source) => source.Name![i] === char)) {
-        commonPrefix += char;
-      } else {
-        commonPrefix = commonPrefix.slice(0, -1);
-        break;
-      }
-    }
-    return commonPrefix;
-  }, [item.MediaSources]);
 
   const name = (name?: string | null) => {
-    return name?.replace(commonPrefix, "").toLowerCase();
+    if (name && name.length > 40)
+      return (
+        name.substring(0, 20) + " [...] " + name.substring(name.length - 20)
+      );
+    return name;
   };
 
   return (
@@ -61,9 +54,9 @@ export const MediaSourceSelector: React.FC<Props> = ({
       <DropdownMenu.Root>
         <DropdownMenu.Trigger>
           <View className="flex flex-col" {...props}>
-            <Text className="opacity-50 mb-1 text-xs">{t("item_card.video")}</Text>
+            <Text className="opacity-50 mb-1 text-xs">Video</Text>
-            <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center">
+            <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center ">
-              <Text numberOfLines={1}>{selectedName}</Text>
+              <Text numberOfLines={1}>{selectedMediaSource}</Text>
             </TouchableOpacity>
           </View>
         </DropdownMenu.Trigger>
@@ -77,7 +70,7 @@ export const MediaSourceSelector: React.FC<Props> = ({
           sideOffset={8}
         >
           <DropdownMenu.Label>Media sources</DropdownMenu.Label>
-          {item.MediaSources?.map((source, idx: number) => (
+          {mediaSources?.map((source, idx: number) => (
             <DropdownMenu.Item
               key={idx.toString()}
               onSelect={() => {
@@ -85,7 +78,7 @@ export const MediaSourceSelector: React.FC<Props> = ({
               }}
             >
               <DropdownMenu.ItemTitle>
-                {`${name(source.Name)}`}
+                {name(source.Name)}
               </DropdownMenu.ItemTitle>
             </DropdownMenu.Item>
           ))}

components/MoreMoviesWithActor.tsx

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

components/OfflineVideoPlayer.tsx

@@ -0,0 +1,37 @@
+import React, { useEffect, useRef } from "react";
+import Video, { VideoRef } from "react-native-video";
+
+type VideoPlayerProps = {
+  url: string;
+};
+
+export const OfflineVideoPlayer: React.FC<VideoPlayerProps> = ({ url }) => {
+  const videoRef = useRef<VideoRef | null>(null);
+
+  const onError = (error: any) => {
+    console.error("Video Error: ", error);
+  };
+
+  useEffect(() => {
+    if (videoRef.current) {
+      videoRef.current.resume();
+    }
+    setTimeout(() => {
+      if (videoRef.current) {
+        videoRef.current.presentFullscreenPlayer();
+      }
+    }, 500);
+  }, []);
+
+  return (
+    <Video
+      source={{
+        uri: url,
+        isNetwork: false,
+      }}
+      ref={videoRef}
+      onError={onError}
+      ignoreSilentSwitch="ignore"
+    />
+  );
+};

components/OverviewText.tsx

@@ -2,7 +2,6 @@ import { TouchableOpacity, View, ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
 import { tc } from "@/utils/textTools";
 import { useState } from "react";
-import { useTranslation } from "react-i18next";
 
 interface Props extends ViewProps {
   text?: string | null;
@@ -15,13 +14,12 @@ export const OverviewText: React.FC<Props> = ({
   ...props
 }) => {
   const [limit, setLimit] = useState(characterLimit);
-  const { t } = useTranslation();
 
   if (!text) return null;
 
   return (
     <View className="flex flex-col" {...props}>
-      <Text className="text-lg font-bold mb-2">{t("item_card.overview")}</Text>
+      <Text className="text-xl font-bold mb-2">Overview</Text>
       <TouchableOpacity
         onPress={() =>
           setLimit((prev) =>
@@ -33,7 +31,7 @@ export const OverviewText: React.FC<Props> = ({
           <Text>{tc(text, limit)}</Text>
           {text.length > characterLimit && (
             <Text className="text-purple-600 mt-1">
-              {limit === characterLimit ? t("item_card.show_more") : t("item_card.show_less")}
+              {limit === characterLimit ? "Show more" : "Show less"}
             </Text>
           )}
         </View>

components/ParallaxPage.tsx

@@ -1,6 +1,6 @@
 import { LinearGradient } from "expo-linear-gradient";
 import { type PropsWithChildren, type ReactElement } from "react";
-import {NativeScrollEvent, NativeSyntheticEvent, View, ViewProps} from "react-native";
+import { View, ViewProps } from "react-native";
 import Animated, {
   interpolate,
   useAnimatedRef,
@@ -13,7 +13,6 @@ interface Props extends ViewProps {
   logo?: ReactElement;
   episodePoster?: ReactElement;
   headerHeight?: number;
-  onEndReached?: (() => void) | null | undefined;
 }
 
 export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
@@ -22,7 +21,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
   episodePoster,
   headerHeight = 400,
   logo,
-  onEndReached,
   ...props
 }: Props) => {
   const scrollRef = useAnimatedRef<Animated.ScrollView>();
@@ -49,11 +47,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
     };
   });
 
-
-  function isCloseToBottom({layoutMeasurement, contentOffset, contentSize}: NativeScrollEvent) {
-    return layoutMeasurement.height + contentOffset.y >= contentSize.height - 20;
-  }
-
   return (
     <View className="flex-1" {...props}>
       <Animated.ScrollView
@@ -62,10 +55,6 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
         }}
         ref={scrollRef}
         scrollEventThrottle={16}
-        onScroll={e => {
-          if (isCloseToBottom(e.nativeEvent))
-            onEndReached?.()
-        }}
       >
         {logo && (
           <View

components/PlatformBlurView.tsx

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