merge upstream

We might need to revert this later. this were the required deps updates to make build on android work

.claude/settings.local.json

@@ -1,14 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(find:*)",
-      "Bash(bun install:*)",
-      "Bash(bunx expo prebuild:*)",
-      "Bash(bunx expo run:*)",
-      "Bash(npx expo prebuild:*)",
-      "Bash(npx expo run:*)",
-      "Bash(xcodebuild:*)"
-    ],
-    "deny": []
-  }
-}

.cursor/rules/no-custom-ios-folder-logic.mdc

@@ -1,7 +0,0 @@
----
-description: Don't write code directly in the ios folder. 
-globs:
-alwaysApply: true
----
-
-We never write code directly in the ios folder. This code is generated by expo plugins.

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["next/core-web-vitals"]
+}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -43,7 +43,7 @@ body:
       label: Version
       description: What version of Streamyfin are you running?
       options:
-        - 0.29.0
+        - 0.28.1
         - 0.28.0
         - 0.27.0
         - 0.26.1

.github/workflows/build-android.yml

@@ -1,102 +0,0 @@
-name: 🤖 Android APK Build (Phone + TV)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [develop, master]
-  push:
-    branches: [develop, master]
-
-jobs:
-  build-android:
-    runs-on: ubuntu-24.04
-    name: 🏗️ Build Android APK
-    permissions:
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [phone, tv]
-
-    steps:
-      - name: 📥 Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          submodules: recursive
-          show-progress: false
-
-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
-        with:
-          bun-version: latest
-
-      - name: 💾 Cache Bun dependencies
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-develop
-            ${{ runner.os }}-bun-develop
-
-      - name: 💾 Cache node_modules
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-modules-latest-develop-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-modules-latest-develop
-            ${{ runner.os }}-${{ runner.arch }}-modules-develop
-            ${{ runner.os }}-modules-develop
-
-      - name: 📦 Install dependencies and reload submodules
-        run: |
-          bun install --frozen-lockfile
-          bun run submodule-reload
-
-      - name: 💾 Cache Gradle global
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-develop
-
-      - name: 🛠️ Generate project files
-        run: |
-          if [ "${{ matrix.target }}" = "tv" ]; then
-            bun run prebuild:tv
-          else
-            bun run prebuild
-          fi
-
-      - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: android/.gradle
-          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-android-gradle-develop
-
-      - name: 🚀 Build APK
-        env:
-          EXPO_TV: ${{ matrix.target == 'tv' && 1 || 0 }}
-        run: bun run build:android:local
-
-      - name: 📅 Set date tag
-        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
-
-      - name: 📤 Upload APK artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: streamyfin-android-${{ matrix.target }}-apk-${{ env.DATE_TAG }}
-          path: |
-            android/app/build/outputs/apk/release/*.apk
-          retention-days: 7

.github/workflows/build-android_Miron.yml

@@ -0,0 +1,82 @@
+name: 🤖 Android APK Build
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [develop, master,ninjalama-patch-1]
+  push:
+    branches: [develop, master, ninjalama-patch-1]
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    name: 🏗️ Build Android APK
+    permissions:
+      contents: read
+
+    steps:
+      - name: 📥 Checkout code
+        uses: actions/checkout@v4 # v4.2.2
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          show-progress: false
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: 🍞 Setup Bun
+        uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
+        with:
+          bun-version: '1.2.17'
+
+      - name: ☕ Setup JDK
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: 💾 Cache Bun dependencies
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-cache-
+
+      - name: 📦 Install dependencies
+        run: |
+          bun install --frozen-lockfile
+          bun run submodule-reload
+
+      - name: 💾 Cache Android dependencies
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        with:
+          path: |
+            android/.gradle
+          key: ${{ runner.os }}-android-deps-${{ hashFiles('android/**/build.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-android-deps-
+
+      - name: 🛠️ Generate project files
+        run: bun run prebuild
+
+      - name: 🚀 Build APK via Bun
+        run: bun run build:android:local
+
+      - name: 📅 Set date tag
+        run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
+
+      - name: 📤 Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: streamyfin-apk-${{ env.DATE_TAG }}
+          path: |
+            android/app/build/outputs/apk/release/*.apk
+            android/app/build/outputs/bundle/release/*.aab
+          retention-days: 7

.github/workflows/build-ios.yml

@@ -1,4 +1,4 @@
-name: 🤖 iOS IPA Build (Phone + TV)
+name: 🤖 iOS IPA Build
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,71 +12,51 @@ on:
     branches: [develop, master]
 
 jobs:
-  build-ios:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'
+  build:
     runs-on: macos-15
     name: 🏗️ Build iOS IPA
     permissions:
       contents: read
 
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [phone, tv]
-
     steps:
-      - name: 📥 Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: 📥 Check out repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          submodules: recursive
           show-progress: false
+          submodules: recursive
+          fetch-depth: 0
 
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
         with:
-          bun-version: latest
+          bun-version: '1.2.17'
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-bun-cache-
 
-      - name: 📦 Install dependencies and reload submodules
+      - name: 📦 Install & Prepare
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
       - name: 🛠️ Generate project files
-        run: |
-          if [ "${{ matrix.target }}" = "tv" ]; then
-            bun run prebuild:tv
-          else
-            bun run prebuild
-          fi
+        run: bun run prebuild
 
-      - name: 🏗️ Setup EAS
+      - name: 🏗 Setup EAS
         uses: expo/expo-github-action@main
         with:
-          eas-version: latest
+          eas-version: 16.7.1
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⚙️ Ensure iOS/tvOS SDKs installed
+      - name: 🏗️ Build iOS app
         run: |
-          if [ "${{ matrix.target }}" = "tv" ]; then
-            xcodebuild -downloadPlatform tvOS
-          else
-            xcodebuild -downloadPlatform iOS
-          fi
-
-      - name: 🚀 Build iOS app
-        env:
-          EXPO_TV: ${{ matrix.target == 'tv' && 1 || 0 }}
-        run: eas build -p ios --local --non-interactive
+          eas build -p ios --local --non-interactive
 
       - name: 📅 Set date tag
         run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -84,6 +64,7 @@ jobs:
       - name: 📤 Upload IPA artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: streamyfin-ios-${{ matrix.target }}-ipa-${{ env.DATE_TAG }}
-          path: build-*.ipa
+          name: streamyfin-ipa-${{ env.DATE_TAG }}
+          path: |
+            build-*.ipa
           retention-days: 7

.github/workflows/check-lockfile.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           show-progress: false
@@ -29,10 +29,10 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
         with:
-          bun-version: latest
+          bun-version: '1.2.17'
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.bun/install/cache

.github/workflows/ci-codeql.yml

@@ -20,24 +20,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript-typescript', 'actions' ]
+        language: [ 'javascript-typescript' ]
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           show-progress: false
           fetch-depth: 0
 
       - name: 🏁 Initialize CodeQL
-        uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           queries: +security-extended,security-and-quality
 
       - name: 🛠️ Autobuild
-        uses: github/codeql-action/autobuild@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
 
       - name: 🧪 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

.github/workflows/linting.yml

@@ -1,12 +1,10 @@
 name: 🚦 Security & Quality Gate
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, edited, synchronize, reopened]
     branches: [develop, master]
   workflow_dispatch:
-  push:
-    branches: [develop]
 
 permissions:
   contents: read
@@ -14,18 +12,17 @@ permissions:
 jobs:
   validate_pr_title:
     name: "📝 Validate PR Title"
-    if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
       contents: read
     steps:
-      - uses: amannn/action-semantic-pull-request@7f33ba792281b034f64e96f4c0b5496782dd3b37 # v6.1.0
+      - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
         id: lint_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
+      - uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 # v2.9.3
         if: always() && (steps.lint_pr_title.outputs.error_message != null)
         with:
           header: pr-title-lint-error
@@ -39,7 +36,7 @@ jobs:
             ```
 
       - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
+        uses: marocchino/sticky-pull-request-comment@d2ad0de260ae8b0235ce059e63f2949ba9e05943 # v2.9.3
         with:
           header: pr-title-lint-error
           delete: true
@@ -51,41 +48,19 @@ jobs:
       contents: read
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
+        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
         with:
           fail-on-severity: high
           deny-licenses: GPL-3.0, AGPL-3.0
           base-ref: ${{ github.event.pull_request.base.sha || 'develop' }}
           head-ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
-  expo-doctor:
-    name: 🚑 Expo Doctor Check
-    runs-on: ubuntu-24.04
-    steps:
-      - name: 🛒 Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
-        with:
-          bun-version: latest
-
-      - name: 📦 Install dependencies (bun)
-        run: bun install --frozen-lockfile
-
-      - name: 🚑 Run Expo Doctor
-        run: bun expo-doctor
-
   code_quality:
     name: "🔍 Lint & Test (${{ matrix.command }})"
     runs-on: ubuntu-latest
@@ -95,10 +70,9 @@ jobs:
         command:
           - "lint"
           - "check"
-          - "format"
     steps:
       - name: "📥 Checkout PR code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           submodules: recursive
@@ -107,12 +81,12 @@ jobs:
       - name: "🟢 Setup Node.js"
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version: '24.x'
+          node-version: '22.x'
 
       - name: "🍞 Setup Bun"
         uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
         with:
-          bun-version: latest
+          bun-version: '1.2.17'
 
       - name: "📦 Install dependencies"
         run: bun install --frozen-lockfile

.github/workflows/notification.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: 🛎️ Notify Discord
-        uses: Ilshidur/action-discord@d2594079a10f1d6739ee50a2471f0ca57418b554 # 0.4.0
+        uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9 # 0.3.2
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }}
           DISCORD_AVATAR: https://avatars.githubusercontent.com/u/193271640

.gitignore

@@ -10,6 +10,7 @@ npm-debug.*
 *.orig.*
 web-build/
 modules/vlc-player/android/build
+modules/vlc-player/android/.gradle
 
 # macOS
 .DS_Store
@@ -45,4 +46,3 @@ streamyfin-4fec1-firebase-adminsdk.json
 .env
 .env.local
 *.aab
-/version-backup-*

.vscode/settings.json

@@ -4,7 +4,7 @@
     "editor.formatOnSave": true
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome",
+    "editor.defaultFormatter": "vscode.typescript-language-features",
     "editor.formatOnSave": true
   },
   "prettier.printWidth": 120,

README.md

@@ -1,24 +1,15 @@
+# 📺 Streamyfin
+
 <a href="https://www.buymeacoffee.com/fredrikbur3" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
 
+A simple and user-friendly Jellyfin video streaming client built with Expo. If you are looking for an alternative to other Jellyfin clients, we hope you find Streamyfin a useful addition to your media streaming toolbox.
 
-<p align="center">
-  <img src="https://raw.githubusercontent.com/streamyfin/.github/refs/heads/main/streamyfin-github-banner.png" alt="Streamyfin" width="100%">
-</p>
-
-**Streamyfin is a simple, user-friendly Jellyfin video streaming client built with Expo. Designed as an alternative to other Jellyfin clients, it aims to offer a smooth and reliable streaming experience. We hope you'll find it a valuable addition to your media streaming toolbox.**
-
----
-
-<p align="center">
-  <img src="./assets/images/screenshots/screenshot1.png" width="22%">
-  &nbsp;
-  <img src="./assets/images/screenshots/screenshot3.png" width="22%">
-  &nbsp;
-  <img src="./assets/images/screenshots/screenshot2.png" width="22%">
-  &nbsp;
-  <img src="./assets/images/jellyseerr.PNG" width="23%">
-</p>
-
+<div style="display: flex; flex-direction: row; gap: 8px">
+  <img width=150 src="./assets/images/screenshots/screenshot1.png" />
+  <img width=150 src="./assets/images/screenshots/screenshot3.png" />
+  <img width=150 src="./assets/images/screenshots/screenshot2.png" />
+  <img width=159 src="./assets/images/jellyseerr.PNG"/>
+</div>
 
 ## 🌟 Features
 
@@ -56,7 +47,7 @@ The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that ho
 
 ### 🔍 Jellysearch
 
-[Jellysearch](https://gitlab.com/DomiStyle/jellysearch) now works with Streamyfin!
+[Jellysearch](https://gitlab.com/DomiStyle/jellysearch) now works with Streamyfin! 🚀
 
 > A fast full-text search proxy for Jellyfin. Integrates seamlessly with most Jellyfin clients.
 
@@ -116,13 +107,13 @@ Key points of the MPL-2.0:
 - You must disclose your source code for any modifications to the covered files
 - Larger works may combine MPL code with code under other licenses
 - MPL-licensed components must remain under the MPL, but the larger work can be under a different license
-- For the full text of the license, please see the LICENSE file in this repository
+- For the full text of the license, please see the LICENSE file in this repository.
 
 ## 🌐 Connect with Us
 
-Join our Discord: [![](https://dcbadge.limes.pink/api/server/https://discord.gg/BuGG9ZNhaE)](https://discord.gg/BuGG9ZNhaE)
+Join our Discord: [https://discord.gg/aJvAYeycyY](https://discord.gg/aJvAYeycyY)
 
-Need support or have questions:
+If you have questions or need support, feel free to reach out:
 
 - GitHub Issues: Report bugs or request features here.
 - Email: [fredrik.burmester@gmail.com](mailto:fredrik.burmester@gmail.com)
@@ -148,86 +139,77 @@ Special shoutout to the JF official clients for being an inspiration to ours.
 
 Thanks to the following contributors for their significant contributions:
 
-<div align="left">
 <table>
-  <tr>
+  <tr
+    style="
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      flex-wrap: wrap;
+    "
+  >
     <td align="center">
       <a href="https://github.com/Alexk2309">
-        <img src="https://github.com/Alexk2309.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/Alexk2309.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@Alexk2309</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/herrrta">
-        <img src="https://github.com/herrrta.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/herrrta.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@herrrta</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/lostb1t">
-        <img src="https://github.com/lostb1t.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/lostb1t.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@lostb1t</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/Simon-Eklundh">
-        <img src="https://github.com/Simon-Eklundh.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/Simon-Eklundh.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@Simon-Eklundh</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/topiga">
-        <img src="https://github.com/topiga.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/topiga.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@topiga</b></sub>
       </a>
     </td>
-    <td align="center">
-      <a href="https://github.com/lancechant">
-        <img src="https://github.com/lancechant.png?size=55" width="55" style="border-radius: 50%;" />
-        <br /><sub><b>@lancechant</b></sub>
-      </a>
-    </td>
-  </tr>
-  <tr>
     <td align="center">
       <a href="https://github.com/simoncaron">
-        <img src="https://github.com/simoncaron.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/simoncaron.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@simoncaron</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/jakequade">
-        <img src="https://github.com/jakequade.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/jakequade.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@jakequade</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/Ryan0204">
-        <img src="https://github.com/Ryan0204.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/Ryan0204.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@Ryan0204</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/retardgerman">
-        <img src="https://github.com/retardgerman.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/retardgerman.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@retardgerman</b></sub>
       </a>
     </td>
     <td align="center">
       <a href="https://github.com/whoopsi-daisy">
-        <img src="https://github.com/whoopsi-daisy.png?size=55" width="55" style="border-radius: 50%;" />
+        <img src="https://github.com/whoopsi-daisy.png?size=80" width="80" style="border-radius: 50%;" />
         <br /><sub><b>@whoopsi-daisy</b></sub>
       </a>
     </td>
-    <td align="center">
-      <a href="https://github.com/Gauvino">
-        <img src="https://github.com/Gauvino.png?size=55" width="55" style="border-radius: 50%;" />
-        <br /><sub><b>@Gauvino</b></sub>
-      </a>
-    </td>
   </tr>
 </table>
-</div>
 
 And all other developers who have contributed to Streamyfin, thank you for your contributions.
 
@@ -246,4 +228,4 @@ I'd also like to thank the following people and projects for their contributions
 Streamyfin does not promote, support, or condone piracy in any form. The app is intended solely for streaming media that you personally own and control. It does not provide or include any media content. Any discussions or support requests related to piracy are strictly prohibited across all our channels.
 
 ## 🤝 Sponsorship
-VPS hosting generously provided by [Hexabyte](https://hexabyte.se/en/vps/?currency=eur) and [SweHosting](https://swehosting.se/en/#tj%C3%A4nster)
+VPS hosting generously provided by [Hexabyte](https://hexabyte.se/en/vps/?currency=eur)

app.config.js

@@ -4,9 +4,6 @@ module.exports = ({ config }) => {
       "react-native-google-cast",
       { useDefaultExpandedMediaControls: true },
     ]);
-
-    // Add the background downloader plugin only for non-TV builds
-    config.plugins.push("./plugins/withRNBackgroundDownloader.js");
   }
   return {
     android: {

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.32.1",
+    "version": "0.28.1",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
@@ -29,19 +29,18 @@
       "supportsTablet": true,
       "bundleIdentifier": "com.fredrikburmester.streamyfin",
       "icon": {
-        "dark": "./assets/images/icon-ios-plain.png",
+        "dark": "./assets/images/icon-plain.png",
         "light": "./assets/images/icon-ios-light.png",
         "tinted": "./assets/images/icon-ios-tinted.png"
-      },
-      "appleTeamId": "MWD5K362T8"
+      }
     },
     "android": {
       "jsEngine": "hermes",
-      "versionCode": 62,
+      "versionCode": 56,
       "adaptiveIcon": {
-        "foregroundImage": "./assets/images/icon-android-plain.png",
-        "monochromeImage": "./assets/images/icon-android-themed.png",
-        "backgroundColor": "#2E2E2E"
+        "foregroundImage": "./assets/images/icon-plain.png",
+        "monochromeImage": "./assets/images/icon-mono.png",
+        "backgroundColor": "#464646"
       },
       "package": "com.fredrikburmester.streamyfin",
       "permissions": [
@@ -114,15 +113,17 @@
           }
         }
       ],
+      ["react-native-bottom-tabs"],
       ["./plugins/withChangeNativeAndroidTextToWhite.js"],
       ["./plugins/withAndroidManifest.js"],
       ["./plugins/withTrustLocalCerts.js"],
       ["./plugins/withGradleProperties.js"],
+      ["./plugins/withRNBackgroundDownloader.js"],
       [
         "expo-splash-screen",
         {
           "backgroundColor": "#2e2e2e",
-          "image": "./assets/images/icon-ios-plain.png",
+          "image": "./assets/images/StreamyFinFinal.png",
           "imageWidth": 100
         }
       ],
@@ -133,8 +134,12 @@
           "color": "#9333EA"
         }
       ],
-      "./plugins/with-runtime-framework-headers.js",
-      "react-native-bottom-tabs"
+      [
+        "react-native-google-cast",
+        {
+          "useDefaultExpandedMediaControls": true
+        }
+      ]
     ],
     "experiments": {
       "typedRoutes": true

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

@@ -1,12 +1,13 @@
-import Ionicons from "@expo/vector-icons/Ionicons";
-import { useAtom } from "jotai/index";
-import { useCallback, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { FlatList, Platform, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { ListItem } from "@/components/list/ListItem";
 import { apiAtom } from "@/providers/JellyfinProvider";
+import Ionicons from "@expo/vector-icons/Ionicons";
+import { useAtom } from "jotai/index";
+import React, { useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform } from "react-native";
+import { FlatList, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 const WebBrowser = !Platform.isTV ? require("expo-web-browser") : null;
 

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

@@ -1,7 +1,7 @@
+import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { Stack } from "expo-router";
 import { useTranslation } from "react-i18next";
 import { Platform } from "react-native";
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 
 export default function SearchLayout() {
   const { t } = useTranslation();
@@ -10,7 +10,7 @@ export default function SearchLayout() {
       <Stack.Screen
         name='index'
         options={{
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerLargeTitle: true,
           headerTitle: t("tabs.favorites"),
           headerLargeStyle: {

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

@@ -1,8 +1,8 @@
-import { useCallback, useState } from "react";
-import { RefreshControl, ScrollView, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 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();

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

@@ -1,17 +1,15 @@
+import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
 import { Feather, Ionicons } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-
 const Chromecast = Platform.isTV ? null : require("@/components/Chromecast");
-
-import { useAtom } from "jotai";
 import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
 import { userAtom } from "@/providers/JellyfinProvider";
+import { useAtom } from "jotai";
 
 export default function IndexLayout() {
-  const _router = useRouter();
+  const router = useRouter();
   const [user] = useAtom(userAtom);
   const { t } = useTranslation();
 
@@ -20,7 +18,7 @@ export default function IndexLayout() {
       <Stack.Screen
         name='index'
         options={{
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerLargeTitle: true,
           headerTitle: t("tabs.home"),
           headerBlurEffect: "prominent",

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

@@ -1,8 +1,3 @@
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { router, useLocalSearchParams, useNavigation } from "expo-router";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { EpisodeCard } from "@/components/downloads/EpisodeCard";
 import {
@@ -11,6 +6,11 @@ import {
 } from "@/components/series/SeasonDropdown";
 import { useDownload } from "@/providers/DownloadProvider";
 import { storage } from "@/utils/mmkv";
+import { Ionicons } from "@expo/vector-icons";
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
 
 export default function page() {
   const navigation = useNavigation();
@@ -23,12 +23,12 @@ export default function page() {
   const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>(
     {},
   );
-  const { getDownloadedItems, deleteItems } = useDownload();
+  const { downloadedFiles, deleteItems } = useDownload();
 
   const series = useMemo(() => {
     try {
       return (
-        getDownloadedItems()
+        downloadedFiles
           ?.filter((f) => f.item.SeriesId === seriesId)
           ?.sort(
             (a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!,
@@ -37,37 +37,7 @@ export default function page() {
     } catch {
       return [];
     }
-  }, [getDownloadedItems]);
-
-  // Group episodes by season in a single pass
-  const seasonGroups = useMemo(() => {
-    const groups: Record<number, BaseItemDto[]> = {};
-
-    series.forEach((episode) => {
-      const seasonNumber = episode.item.ParentIndexNumber;
-      if (seasonNumber !== undefined && seasonNumber !== null) {
-        if (!groups[seasonNumber]) {
-          groups[seasonNumber] = [];
-        }
-        groups[seasonNumber].push(episode.item);
-      }
-    });
-
-    // Sort episodes within each season
-    Object.values(groups).forEach((episodes) => {
-      episodes.sort((a, b) => (a.IndexNumber || 0) - (b.IndexNumber || 0));
-    });
-
-    return groups;
-  }, [series]);
-
-  // Get unique seasons (just the season numbers, sorted)
-  const uniqueSeasons = useMemo(() => {
-    const seasonNumbers = Object.keys(seasonGroups)
-      .map(Number)
-      .sort((a, b) => a - b);
-    return seasonNumbers.map((seasonNum) => seasonGroups[seasonNum][0]); // First episode of each season
-  }, [seasonGroups]);
+  }, [downloadedFiles]);
 
   const seasonIndex =
     seasonIndexState[series?.[0]?.item?.ParentId ?? ""] ||
@@ -75,8 +45,20 @@ export default function page() {
     "";
 
   const groupBySeason = useMemo<BaseItemDto[]>(() => {
-    return seasonGroups[Number(seasonIndex)] ?? [];
-  }, [seasonGroups, seasonIndex]);
+    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(
     () =>
@@ -120,7 +102,7 @@ export default function page() {
         <View className='flex flex-row items-center justify-start my-2 px-4'>
           <SeasonDropdown
             item={series[0].item}
-            seasons={uniqueSeasons}
+            seasons={series.map((s) => s.item)}
             state={seasonIndexState}
             initialSeasonIndex={initialSeasonIndex!}
             onSelect={(season) => {

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

@@ -7,9 +7,10 @@ import {
 } from "@gorhom/bottom-sheet";
 import { useNavigation, useRouter } from "expo-router";
 import { useAtom } from "jotai";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
 import { Button } from "@/components/Button";
 import { Text } from "@/components/common/Text";
@@ -21,56 +22,42 @@ import { SeriesCard } from "@/components/downloads/SeriesCard";
 import { useDownload } from "@/providers/DownloadProvider";
 import { type DownloadedItem } from "@/providers/Downloads/types";
 import { queueAtom } from "@/utils/atoms/queue";
+import { useSettings } from "@/utils/atoms/settings";
 import { writeToLog } from "@/utils/log";
 
+function migration_20241124(
+  deleteAllFiles: () => Promise<void>,
+  router: any,
+  t: any,
+) {
+  Alert.alert(
+    t("home.downloads.new_app_version_requires_re_download"),
+    undefined,
+    [
+      {
+        text: t("common.cancel"),
+        onPress: () => router.back(),
+        style: "cancel",
+      },
+      {
+        text: t("common.continue"),
+        onPress: () => deleteAllFiles(),
+      },
+    ],
+  );
+}
+
 export default function page() {
   const navigation = useNavigation();
   const { t } = useTranslation();
   const [queue, setQueue] = useAtom(queueAtom);
-  const {
-    removeProcess,
-    getDownloadedItems,
-    deleteFileByType,
-    deleteAllFiles,
-  } = useDownload();
+  const { deleteFileByType, downloadedFiles, removeProcess, deleteAllFiles } = useDownload();
   const router = useRouter();
+  const [settings] = useSettings();
   const bottomSheetModalRef = useRef<BottomSheetModal>(null);
 
-  const [showMigration, setShowMigration] = useState(false);
-
-  const migration_20241124 = () => {
-    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: () => {
-            setShowMigration(false);
-            router.back();
-          },
-        },
-        {
-          text: t("home.downloads.delete"),
-          style: "destructive",
-          onPress: async () => {
-            await deleteAllFiles();
-            setShowMigration(false);
-          },
-        },
-      ],
-    );
-  };
-
-  const downloadedFiles = getDownloadedItems();
-
   const movies = useMemo(() => {
-    try {
-      return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
-    } catch {
-      setShowMigration(true);
-      return [];
-    }
+    return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
   }, [downloadedFiles]);
 
   const groupedBySeries = useMemo(() => {
@@ -85,10 +72,12 @@ export default function page() {
       });
       return Object.values(series);
     } catch {
-      setShowMigration(true);
+      migration_20241124(deleteAllFiles, router, t);
       return [];
     }
-  }, [downloadedFiles]);
+  }, [downloadedFiles, deleteAllFiles, router, t]);
+
+  const _insets = useSafeAreaInsets();
 
   useEffect(() => {
     navigation.setOptions({
@@ -100,12 +89,6 @@ export default function page() {
     });
   }, [downloadedFiles]);
 
-  useEffect(() => {
-    if (showMigration) {
-      migration_20241124();
-    }
-  }, [showMigration]);
-
   const deleteMovies = () =>
     deleteFileByType("Movie")
       .then(() =>

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

@@ -1,12 +1,12 @@
+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, Platform, TouchableOpacity, View } from "react-native";
-import { Button } from "@/components/Button";
-import { Text } from "@/components/common/Text";
-import { storage } from "@/utils/mmkv";
+import { Linking, TouchableOpacity, View } from "react-native";
 
 export default function page() {
   const router = useRouter();
@@ -19,9 +19,7 @@ export default function page() {
   );
 
   return (
-    <View
-      className={`bg-neutral-900 h-full ${Platform.isTV ? "py-5 space-y-4" : "py-16 space-y-8"} px-4`}
-    >
+    <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")}
@@ -51,50 +49,42 @@ export default function page() {
             </Text>
           </View>
         </View>
-        {!Platform.isTV && (
-          <>
-            <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'
+          >
+            <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={{
@@ -109,22 +99,19 @@ export default function page() {
             <Text className='font-bold mb-1'>
               {t("home.intro.centralised_settings_plugin_title")}
             </Text>
-            <View className='flex-row flex-wrap items-baseline'>
-              <Text className='shrink text-xs'>
-                {t("home.intro.centralised_settings_plugin_description")}{" "}
-              </Text>
-              <TouchableOpacity
+            <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",
                   );
                 }}
               >
-                <Text className='text-xs text-purple-600 underline'>
-                  {t("home.intro.read_more")}
-                </Text>
-              </TouchableOpacity>
-            </View>
+                {t("home.intro.read_more")}
+              </Text>
+            </Text>
           </View>
         </View>
       </View>

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

@@ -1,4 +1,19 @@
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Badge } from "@/components/Badge";
+import { Loader } from "@/components/Loader";
+import { Text } from "@/components/common/Text";
+import Poster from "@/components/posters/Poster";
+import { useInterval } from "@/hooks/useInterval";
+import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { formatBitrate } from "@/utils/bitrate";
+import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
+import { formatTimeString } from "@/utils/time";
+import {
+  AntDesign,
+  Entypo,
+  Ionicons,
+  MaterialCommunityIcons,
+} from "@expo/vector-icons";
 import {
   HardwareAccelerationType,
   type SessionInfoDto,
@@ -11,19 +26,10 @@ import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
 import { FlashList } from "@shopify/flash-list";
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
-import { useEffect, useMemo, useState } from "react";
+import { get } from "lodash";
+import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TouchableOpacity, View } from "react-native";
-import { Badge } from "@/components/Badge";
-import { Text } from "@/components/common/Text";
-import { Loader } from "@/components/Loader";
-import Poster from "@/components/posters/Poster";
-import { useInterval } from "@/hooks/useInterval";
-import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { formatBitrate } from "@/utils/bitrate";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
-import { formatTimeString } from "@/utils/time";
 
 export default function page() {
   const { sessions, isLoading } = useSessions({} as useSessionsProps);
@@ -434,6 +440,8 @@ const TranscodingStreamView = ({
   isTranscoding,
   properties,
   transcodeProperties,
+  value,
+  transcodeValue,
 }: TranscodingStreamViewProps) => {
   return (
     <View className='flex flex-col pt-2 first:pt-0'>
@@ -446,18 +454,20 @@ const TranscodingStreamView = ({
         </Text>
       </View>
       {isTranscoding && transcodeProperties ? (
-        <View className='flex flex-row'>
-          <Text className='-mt-0 text-xs opacity-50 w-20 font-bold text-right pr-4'>
-            <MaterialCommunityIcons
-              name='arrow-right-bottom'
-              size={14}
-              color='white'
-            />
-          </Text>
-          <Text className='flex-1 text-sm mt-1'>
-            <TranscodingBadges properties={transcodeProperties} />
-          </Text>
-        </View>
+        <>
+          <View className='flex flex-row'>
+            <Text className='-mt-0 text-xs opacity-50 w-20 font-bold text-right pr-4'>
+              <MaterialCommunityIcons
+                name='arrow-right-bottom'
+                size={14}
+                color='white'
+              />
+            </Text>
+            <Text className='flex-1 text-sm mt-1'>
+              <TranscodingBadges properties={transcodeProperties} />
+            </Text>
+          </View>
+        </>
       ) : null}
     </View>
   );

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

@@ -1,9 +1,3 @@
-import { useNavigation, useRouter } from "expo-router";
-import { t } from "i18next";
-import { useAtom } from "jotai";
-import { useEffect } from "react";
-import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -20,14 +14,21 @@ import { StorageSettings } from "@/components/settings/StorageSettings";
 import { SubtitleToggles } from "@/components/settings/SubtitleToggles";
 import { UserInfo } from "@/components/settings/UserInfo";
 import { useHaptic } from "@/hooks/useHaptic";
-import { useJellyfin, userAtom } from "@/providers/JellyfinProvider";
+import { useJellyfin } from "@/providers/JellyfinProvider";
+import { userAtom } from "@/providers/JellyfinProvider";
 import { clearLogs } from "@/utils/log";
 import { storage } from "@/utils/mmkv";
+import { useNavigation, useRouter } from "expo-router";
+import { t } from "i18next";
+import { useAtom } from "jotai";
+import React, { useEffect } from "react";
+import { ScrollView, Switch, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 export default function settings() {
   const router = useRouter();
   const insets = useSafeAreaInsets();
-  const [_user] = useAtom(userAtom);
+  const [user] = useAtom(userAtom);
   const { logout } = useJellyfin();
   const successHapticFeedback = useHaptic("success");
 
@@ -73,13 +74,13 @@ export default function settings() {
 
         <OtherSettings />
 
-        {!Platform.isTV && <DownloadSettings />}
+        <DownloadSettings />
 
         <PluginSettings />
 
         <AppLanguageSelector />
 
-        {!Platform.isTV && <ChromecastSettings />}
+        <ChromecastSettings />
 
         <ListGroup title={"Intro"}>
           <ListItem
@@ -112,7 +113,7 @@ export default function settings() {
           </ListGroup>
         </View>
 
-        {!Platform.isTV && <StorageSettings />}
+        <StorageSettings />
       </View>
     </ScrollView>
   );

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

@@ -1,15 +1,15 @@
-import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import { useAtomValue } from "jotai";
-import { useTranslation } from "react-i18next";
-import { Switch, View } from "react-native";
-import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
+import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 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 { useTranslation } from "react-i18next";
+import { Switch, View } from "react-native";
 
 export default function page() {
   const [settings, updateSettings, pluginSettings] = useSettings();

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

@@ -3,7 +3,7 @@ import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
 import { useSettings } from "@/utils/atoms/settings";
 
 export default function page() {
-  const [_settings, _updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings();
 
   return (
     <DisabledSetting

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

@@ -1,23 +1,20 @@
+import { Loader } from "@/components/Loader";
+import { Text } from "@/components/common/Text";
+import { FilterButton } from "@/components/filters/FilterButton";
+import { LogLevel, useLog, writeErrorLog } from "@/utils/log";
 import * as FileSystem from "expo-file-system";
 import { useNavigation } from "expo-router";
 import * as Sharing from "expo-sharing";
-import { useCallback, useEffect, useId, useMemo, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { ScrollView, TouchableOpacity, View } from "react-native";
 import Collapsible from "react-native-collapsible";
-import { Text } from "@/components/common/Text";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { Loader } from "@/components/Loader";
-import { LogLevel, useLog, writeErrorLog } from "@/utils/log";
 
-export default function Page() {
+export default function page() {
   const navigation = useNavigation();
   const { logs } = useLog();
   const { t } = useTranslation();
 
-  const orderFilterId = useId();
-  const levelsFilterId = useId();
-
   const defaultLevels: LogLevel[] = ["INFO", "ERROR", "DEBUG", "WARN"];
   const codeBlockStyle = {
     backgroundColor: "#000",
@@ -28,12 +25,10 @@ export default function Page() {
 
   const [loading, setLoading] = useState<boolean>(false);
   const [state, setState] = useState<Record<string, boolean>>({});
+
   const [order, setOrder] = useState<"asc" | "desc">("desc");
   const [levels, setLevels] = useState<LogLevel[]>(defaultLevels);
 
-  const _orderId = useId();
-  const _levelsId = useId();
-
   const filteredLogs = useMemo(
     () =>
       logs
@@ -78,7 +73,7 @@ export default function Page() {
     <>
       <View className='flex flex-row justify-end py-2 px-4 space-x-2'>
         <FilterButton
-          id={orderFilterId}
+          id='order'
           queryKey='log'
           queryFn={async () => ["asc", "desc"]}
           set={(values) => setOrder(values[0])}
@@ -88,7 +83,7 @@ export default function Page() {
           showSearch={false}
         />
         <FilterButton
-          id={levelsFilterId}
+          id='levels'
           queryKey='log'
           queryFn={async () => defaultLevels}
           set={setLevels}
@@ -127,7 +122,7 @@ export default function Page() {
                     {new Date(log.timestamp).toLocaleString()}
                   </Text>
                 </View>
-                <Text selectable className='text-xs'>
+                <Text uiTextView selectable className='text-xs'>
                   {log.message}
                 </Text>
               </TouchableOpacity>

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

@@ -1,7 +1,13 @@
+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 { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
+
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import React, { useEffect, useMemo, useState } from "react";
 import {
   Linking,
   Switch,
@@ -10,11 +16,6 @@ import {
   View,
 } from "react-native";
 import { toast } from "sonner-native";
-import { Text } from "@/components/common/Text";
-import { ListGroup } from "@/components/list/ListGroup";
-import { ListItem } from "@/components/list/ListItem";
-import DisabledSetting from "@/components/settings/DisabledSetting";
-import { useSettings } from "@/utils/atoms/settings";
 
 export default function page() {
   const navigation = useNavigation();

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

@@ -1,3 +1,15 @@
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
+import { OverviewText } from "@/components/OverviewText";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { InfiniteHorizontalScroll } from "@/components/common/InfiniteHorrizontalScroll";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 import type { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
@@ -7,18 +19,6 @@ import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { View } from "react-native";
-import { InfiniteHorizontalScroll } from "@/components/common/InfiniteHorrizontalScroll";
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { ItemCardText } from "@/components/ItemCardText";
-import { Loader } from "@/components/Loader";
-import { MoviesTitleHeader } from "@/components/movies/MoviesTitleHeader";
-import { OverviewText } from "@/components/OverviewText";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import MoviePoster from "@/components/posters/MoviePoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 
 const page: React.FC = () => {
   const local = useLocalSearchParams();

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

@@ -1,3 +1,22 @@
+import { ItemCardText } from "@/components/ItemCardText";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { FilterButton } from "@/components/filters/FilterButton";
+import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemPoster } from "@/components/posters/ItemPoster";
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  SortByOption,
+  SortOrderOption,
+  genreFilterAtom,
+  sortByAtom,
+  sortOptions,
+  sortOrderAtom,
+  sortOrderOptions,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";
 import type {
   BaseItemDto,
   BaseItemDtoQueryResult,
@@ -16,25 +35,6 @@ import type React from "react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FlatList, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
-import { ItemCardText } from "@/components/ItemCardText";
-import { ItemPoster } from "@/components/posters/ItemPoster";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  genreFilterAtom,
-  SortByOption,
-  SortOrderOption,
-  sortByAtom,
-  sortOptions,
-  sortOrderAtom,
-  sortOrderOptions,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
 
 const page: React.FC = () => {
   const searchParams = useLocalSearchParams();
@@ -43,7 +43,7 @@ const page: React.FC = () => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
   const navigation = useNavigation();
-  const [orientation, _setOrientation] = useState(
+  const [orientation, setOrientation] = useState(
     ScreenOrientation.Orientation.PORTRAIT_UP,
   );
 
@@ -112,7 +112,7 @@ const page: React.FC = () => {
         recursive: true,
         genres: selectedGenres,
         tags: selectedTags,
-        years: selectedYears.map((year) => Number.parseInt(year, 10)),
+        years: selectedYears.map((year) => Number.parseInt(year)),
         includeItemTypes: ["Movie", "Series"],
       });
 

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

@@ -1,23 +1,24 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
-import { uniqBy } from "lodash";
-import { useMemo } from "react";
 import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
 import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr";
 import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
 import {
   type MovieResult,
+  Results,
   type TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
 import { COMPANY_LOGO_IMAGE_FILTER } from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useLocalSearchParams } from "expo-router";
+import { uniqBy } from "lodash";
+import React, { useMemo } from "react";
 
 export default function page() {
   const local = useLocalSearchParams();
   const { jellyseerrApi } = useJellyseerr();
 
-  const { companyId, image, type } = local as unknown as {
+  const { companyId, name, image, type } = local as unknown as {
     companyId: string;
     name: string;
     image: string;
@@ -98,7 +99,7 @@ export default function page() {
           }}
         />
       }
-      renderItem={(item, _index) => (
+      renderItem={(item, index) => (
         <JellyseerrPoster item={item as MovieResult | TvResult} />
       )}
     />

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

@@ -1,17 +1,21 @@
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { useLocalSearchParams } from "expo-router";
-import { uniqBy } from "lodash";
-import { useMemo } from "react";
 import { Text } from "@/components/common/Text";
-import { textShadowStyle } from "@/components/jellyseerr/discover/GenericSlideCard";
+import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
 import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
+import { textShadowStyle } from "@/components/jellyseerr/discover/GenericSlideCard";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
+import Poster from "@/components/posters/Poster";
 import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr";
 import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
 import {
   type MovieResult,
+  Results,
   type TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { router, useLocalSearchParams, useSegments } from "expo-router";
+import { uniqBy } from "lodash";
+import React, { useMemo } from "react";
+import { TouchableOpacity } from "react-native";
 
 export default function page() {
   const local = useLocalSearchParams();
@@ -92,7 +96,7 @@ export default function page() {
           {name}
         </Text>
       }
-      renderItem={(item, _index) => (
+      renderItem={(item, index) => (
         <JellyseerrPoster item={item as MovieResult | TvResult} />
       )}
     />

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

@@ -1,3 +1,25 @@
+import { Button } from "@/components/Button";
+import { GenreTags } from "@/components/GenreTags";
+import { OverviewText } from "@/components/OverviewText";
+import { ParallaxScrollView } from "@/components/ParallaxPage";
+import { JellyserrRatings } from "@/components/Ratings";
+import { Text } from "@/components/common/Text";
+import Cast from "@/components/jellyseerr/Cast";
+import DetailFacts from "@/components/jellyseerr/DetailFacts";
+import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
+import { ItemActions } from "@/components/series/SeriesActions";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
+import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
+import {
+  type IssueType,
+  IssueTypeName,
+} from "@/utils/jellyseerr/server/constants/issue";
+import { MediaType } from "@/utils/jellyseerr/server/constants/media";
+import type {
+  MovieResult,
+  TvResult,
+} from "@/utils/jellyseerr/server/models/Search";
+import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
 import { Ionicons } from "@expo/vector-icons";
 import {
   BottomSheetBackdrop,
@@ -14,31 +36,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-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 {
-  type IssueType,
-  IssueTypeName,
-} from "@/utils/jellyseerr/server/constants/issue";
-import { MediaType } from "@/utils/jellyseerr/server/constants/media";
-import type {
-  MovieResult,
-  TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
-import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import RequestModal from "@/components/jellyseerr/RequestModal";
 import { ANIME_KEYWORD_ID } from "@/utils/jellyseerr/server/api/themoviedb/constants";
 import type { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
@@ -221,7 +219,11 @@ const Page: React.FC = () => {
                         | TvDetails
                     }
                   />
-                  <Text selectable className='font-bold text-2xl mb-1'>
+                  <Text
+                    uiTextView
+                    selectable
+                    className='font-bold text-2xl mb-1'
+                  >
                     {mediaTitle}
                   </Text>
                   <Text className='opacity-50'>{releaseYear}</Text>
@@ -252,28 +254,26 @@ const Page: React.FC = () => {
               ) : (
                 details?.mediaInfo?.jellyfinMediaId && (
                   <View className='flex flex-row space-x-2 mt-4'>
-                    {!Platform.isTV && (
-                      <Button
-                        className='flex-1 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={20}
-                            color='white'
-                          />
-                        }
-                        style={{
-                          borderWidth: 1,
-                          borderStyle: "solid",
-                        }}
-                      >
-                        <Text className='text-sm'>
-                          {t("jellyseerr.report_issue_button")}
-                        </Text>
-                      </Button>
-                    )}
+                    <Button
+                      className='flex-1 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={20}
+                          color='white'
+                        />
+                      }
+                      style={{
+                        borderWidth: 1,
+                        borderStyle: "solid",
+                      }}
+                    >
+                      <Text className='text-sm'>
+                        {t("jellyseerr.report_issue_button")}
+                      </Text>
+                    </Button>
                     <Button
                       className='flex-1 bg-purple-600/50 border-purple-400 ring-purple-400 text-purple-100'
                       onPress={() => {
@@ -331,95 +331,92 @@ const Page: React.FC = () => {
         }}
         onDismiss={() => _setRequestBody(undefined)}
       />
-      {!Platform.isTV && (
-        // This is till it's fixed because the menu isn't selectable on TV
-        <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>
+      <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>
-          </BottomSheetView>
-        </BottomSheetModal>
-      )}
+            <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>
   );
 };

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

@@ -1,12 +1,6 @@
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
-import { orderBy, uniqBy } from "lodash";
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
+import { OverviewText } from "@/components/OverviewText";
 import { Text } from "@/components/common/Text";
 import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
-import { OverviewText } from "@/components/OverviewText";
 import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import type { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
@@ -14,6 +8,12 @@ import type {
   MovieResult,
   TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useLocalSearchParams, useSegments } from "expo-router";
+import { orderBy, uniqBy } from "lodash";
+import React, { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 
 export default function page() {
   const local = useLocalSearchParams();
@@ -21,13 +21,14 @@ export default function page() {
 
   const {
     jellyseerrApi,
+    jellyseerrUser,
     jellyseerrRegion: region,
     jellyseerrLocale: locale,
   } = useJellyseerr();
 
   const { personId } = local as { personId: string };
 
-  const { data } = useQuery({
+  const { data, isLoading, isFetching } = useQuery({
     queryKey: ["jellyseerr", "person", personId],
     queryFn: async () => ({
       details: await jellyseerrApi?.personDetails(personId),
@@ -106,7 +107,7 @@ export default function page() {
       MainContent={() => (
         <OverviewText text={data?.details?.biography} className='mt-4' />
       )}
-      renderItem={(item, _index) => (
+      renderItem={(item, index) => (
         <JellyseerrPoster item={item as MovieResult | TvResult} />
       )}
     />

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

@@ -1,13 +1,14 @@
-import {
-  createMaterialTopTabNavigator,
+import type {
   MaterialTopTabNavigationEventMap,
   MaterialTopTabNavigationOptions,
 } from "@react-navigation/material-top-tabs";
+import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
 import type {
   ParamListBase,
   TabNavigationState,
 } from "@react-navigation/native";
 import { Stack, withLayoutContext } from "expo-router";
+import React from "react";
 
 const { Navigator } = createMaterialTopTabNavigator();
 

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

@@ -1,17 +1,18 @@
+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";
-import { ItemImage } from "@/components/common/ItemImage";
-import { Text } from "@/components/common/Text";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 
 export default function page() {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
-  const _insets = useSafeAreaInsets();
+  const insets = useSafeAreaInsets();
 
   const { data: channels } = useQuery({
     queryKey: ["livetv", "channels"],

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

@@ -1,16 +1,23 @@
-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, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { Dimensions, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 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 { useTranslation } from "react-i18next";
+import {
+  Button,
+  Dimensions,
+  ScrollView,
+  TouchableOpacity,
+  View,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 const HOUR_HEIGHT = 30;
 const ITEMS_PER_PAGE = 20;
@@ -21,9 +28,17 @@ export default function page() {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
   const insets = useSafeAreaInsets();
-  const [date, _setDate] = useState<Date>(new Date());
+  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 () => {
@@ -135,7 +150,7 @@ export default function page() {
         >
           <View className='flex flex-col'>
             <HourHeader height={HOUR_HEIGHT} />
-            {channels?.Items?.map((c, _i) => (
+            {channels?.Items?.map((c, i) => (
               <MemoizedLiveTVGuideRow
                 channel={c}
                 programs={programs?.Items}

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

@@ -1,11 +1,13 @@
+import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
+import { TAB_HEIGHT } from "@/constants/Values";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
 import { useAtom } from "jotai";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 
 export default function page() {
   const [api] = useAtom(apiAtom);

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

@@ -1,6 +1,7 @@
+import { Text } from "@/components/common/Text";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { View } from "react-native";
-import { Text } from "@/components/common/Text";
 
 export default function page() {
   const { t } = useTranslation();

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

@@ -1,13 +1,3 @@
-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 { useAtom } from "jotai";
-import type React from "react";
-import { useEffect, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, View } from "react-native";
 import { AddToFavorites } from "@/components/AddToFavorites";
 import { DownloadItems } from "@/components/DownloadItem";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
@@ -18,6 +8,16 @@ 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 { useAtom } from "jotai";
+import type React from "react";
+import { useEffect, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, View } from "react-native";
 
 const page: React.FC = () => {
   const navigation = useNavigation();
@@ -77,9 +77,7 @@ const page: React.FC = () => {
     select: (data) =>
       // This needs to be sorted by parent index number and then index number, that way we can download the episodes in the correct order.
       [...(data || [])].sort(
-        (a, b) =>
-          (a.ParentIndexNumber ?? 0) - (b.ParentIndexNumber ?? 0) ||
-          (a.IndexNumber ?? 0) - (b.IndexNumber ?? 0),
+        (a, b) => (a.ParentIndexNumber ?? 0) - (b.ParentIndexNumber ?? 0) || (a.IndexNumber ?? 0) - (b.IndexNumber ?? 0)
       ),
     staleTime: 60,
     enabled: !!api && !!user?.Id && !!item?.Id,

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

@@ -1,3 +1,34 @@
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import React, { useCallback, useEffect, useMemo } from "react";
+import { FlatList, View, useWindowDimensions } from "react-native";
+
+import { ItemCardText } from "@/components/ItemCardText";
+import { Loader } from "@/components/Loader";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import { FilterButton } from "@/components/filters/FilterButton";
+import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
+import { ItemPoster } from "@/components/posters/ItemPoster";
+import { useOrientation } from "@/hooks/useOrientation";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  SortByOption,
+  SortOrderOption,
+  genreFilterAtom,
+  getSortByPreference,
+  getSortOrderPreference,
+  sortByAtom,
+  sortByPreferenceAtom,
+  sortOptions,
+  sortOrderAtom,
+  sortOrderOptions,
+  sortOrderPreferenceAtom,
+  tagsFilterAtom,
+  yearFilterAtom,
+} from "@/utils/atoms/filters";
 import type {
   BaseItemDto,
   BaseItemDtoQueryResult,
@@ -9,38 +40,8 @@ import {
   getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { useLocalSearchParams, useNavigation } from "expo-router";
-import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { FlatList, useWindowDimensions, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { FilterButton } from "@/components/filters/FilterButton";
-import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
-import { ItemCardText } from "@/components/ItemCardText";
-import { Loader } from "@/components/Loader";
-import { ItemPoster } from "@/components/posters/ItemPoster";
-import { useOrientation } from "@/hooks/useOrientation";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  genreFilterAtom,
-  getSortByPreference,
-  getSortOrderPreference,
-  SortByOption,
-  SortOrderOption,
-  sortByAtom,
-  sortByPreferenceAtom,
-  sortOptions,
-  sortOrderAtom,
-  sortOrderOptions,
-  sortOrderPreferenceAtom,
-  tagsFilterAtom,
-  yearFilterAtom,
-} from "@/utils/atoms/filters";
 
 const Page = () => {
   const searchParams = useLocalSearchParams();
@@ -168,7 +169,7 @@ const Page = () => {
         fields: ["PrimaryImageAspectRatio", "SortName"],
         genres: selectedGenres,
         tags: selectedTags,
-        years: selectedYears.map((year) => Number.parseInt(year, 10)),
+        years: selectedYears.map((year) => Number.parseInt(year)),
         includeItemTypes: itemType ? [itemType] : undefined,
       });
 

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

@@ -1,11 +1,9 @@
+import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
+import { useSettings } from "@/utils/atoms/settings";
 import { Ionicons } from "@expo/vector-icons";
 import { Stack } from "expo-router";
 import { Platform } from "react-native";
-import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
-import { useSettings } from "@/utils/atoms/settings";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import { useTranslation } from "react-i18next";
 
 export default function IndexLayout() {
@@ -20,7 +18,7 @@ export default function IndexLayout() {
       <Stack.Screen
         name='index'
         options={{
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerLargeTitle: true,
           headerTitle: t("tabs.library"),
           headerBlurEffect: "prominent",
@@ -200,7 +198,7 @@ export default function IndexLayout() {
         name='[libraryId]'
         options={{
           title: "",
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios",
           headerShadowVisible: false,
@@ -213,7 +211,7 @@ export default function IndexLayout() {
         name='collections/[collectionId]'
         options={{
           title: "",
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios",
           headerShadowVisible: false,

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

@@ -1,3 +1,8 @@
+import { Loader } from "@/components/Loader";
+import { Text } from "@/components/common/Text";
+import { LibraryItemCard } from "@/components/library/LibraryItemCard";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { useSettings } from "@/utils/atoms/settings";
 import {
   getUserLibraryApi,
   getUserViewsApi,
@@ -9,11 +14,6 @@ import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { Loader } from "@/components/Loader";
-import { LibraryItemCard } from "@/components/library/LibraryItemCard";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";
 
 export default function index() {
   const [api] = useAtom(apiAtom);

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

@@ -1,10 +1,10 @@
-import { Stack } from "expo-router";
-import { useTranslation } from "react-i18next";
-import { Platform } from "react-native";
 import {
   commonScreenOptions,
   nestedTabPageScreenOptions,
 } from "@/components/stacks/NestedTabPageStack";
+import { Stack } from "expo-router";
+import { useTranslation } from "react-i18next";
+import { Platform } from "react-native";
 
 export default function SearchLayout() {
   const { t } = useTranslation();
@@ -13,7 +13,7 @@ export default function SearchLayout() {
       <Stack.Screen
         name='index'
         options={{
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerLargeTitle: true,
           headerTitle: t("tabs.search"),
           headerLargeStyle: {
@@ -31,7 +31,7 @@ export default function SearchLayout() {
         name='collections/[collectionId]'
         options={{
           title: "",
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios",
           headerShadowVisible: false,

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

@@ -1,32 +1,9 @@
-import type {
-  BaseItemDto,
-  BaseItemKind,
-} from "@jellyfin/sdk/lib/generated-client/models";
-import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
-import { useQuery } from "@tanstack/react-query";
-import axios from "axios";
-import { router, useLocalSearchParams, useNavigation } from "expo-router";
-import { useAtom } from "jotai";
-import {
-  useCallback,
-  useEffect,
-  useId,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { useTranslation } from "react-i18next";
-import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useDebounce } from "use-debounce";
 import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
-import { Input } from "@/components/common/Input";
+import { Tag } from "@/components/GenreTags";
+import { ItemCardText } from "@/components/ItemCardText";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
-import { Tag } from "@/components/GenreTags";
-import { ItemCardText } from "@/components/ItemCardText";
 import {
   JellyseerrSearchSort,
   JellyserrIndexPage,
@@ -39,6 +16,27 @@ import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
+import type {
+  BaseItemDto,
+  BaseItemKind,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api";
+import { useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { router, useLocalSearchParams, useNavigation } from "expo-router";
+import { useAtom } from "jotai";
+import React, {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useDebounce } from "use-debounce";
 
 type SearchType = "Library" | "Discover";
 
@@ -59,9 +57,6 @@ export default function search() {
 
   const { t } = useTranslation();
 
-  const searchFilterId = useId();
-  const orderFilterId = useId();
-
   const { q } = params as { q: string };
 
   const [searchType, setSearchType] = useState<SearchType>("Library");
@@ -254,223 +249,205 @@ export default function search() {
   }, [l1, l2, l3, l7, l8]);
 
   return (
-    <ScrollView
-      keyboardDismissMode='on-drag'
-      contentInsetAdjustmentBehavior='automatic'
-      contentContainerStyle={{
-        paddingLeft: insets.left,
-        paddingRight: insets.right,
-      }}
-    >
-      {/* <View
-        className='flex flex-col'
-        style={{
-          marginTop: Platform.OS === "android" ? 16 : 0,
-        }}
-      > */}
-      {Platform.isTV && (
-        <Input
-          placeholder={t("search.search")}
-          onChangeText={(text) => {
-            router.setParams({ q: "" });
-            setSearch(text);
-          }}
-          keyboardType='default'
-          returnKeyType='done'
-          autoCapitalize='none'
-          clearButtonMode='while-editing'
-          maxLength={500}
-        />
-      )}
-      <View
-        className='flex flex-col'
-        style={{
-          marginTop: Platform.OS === "android" ? 16 : 0,
+    <>
+      <ScrollView
+        keyboardDismissMode='on-drag'
+        contentInsetAdjustmentBehavior='automatic'
+        contentContainerStyle={{
+          paddingLeft: insets.left,
+          paddingRight: insets.right,
         }}
       >
-        {jellyseerrApi && (
-          <ScrollView
-            horizontal
-            className='flex flex-row flex-wrap space-x-2 px-4 mb-2'
-          >
-            <TouchableOpacity onPress={() => setSearchType("Library")}>
-              <Tag
-                text={t("search.library")}
-                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>
-            {searchType === "Discover" &&
-              !loading &&
-              noResults &&
-              debouncedSearch.length > 0 && (
-                <View className='flex flex-row justify-end items-center space-x-1'>
-                  <FilterButton
-                    id={searchFilterId}
-                    queryKey='jellyseerr_search'
-                    queryFn={async () =>
-                      Object.keys(JellyseerrSearchSort).filter((v) =>
-                        Number.isNaN(Number(v)),
-                      )
-                    }
-                    set={(value) => setJellyseerrOrderBy(value[0])}
-                    values={[jellyseerrOrderBy]}
-                    title={t("library.filters.sort_by")}
-                    renderItemLabel={(item) =>
-                      t(`home.settings.plugins.jellyseerr.order_by.${item}`)
-                    }
-                    showSearch={false}
-                  />
-                  <FilterButton
-                    id={orderFilterId}
-                    queryKey='jellysearr_search'
-                    queryFn={async () => ["asc", "desc"]}
-                    set={(value) => setJellyseerrSortOrder(value[0])}
-                    values={[jellyseerrSortOrder]}
-                    title={t("library.filters.sort_order")}
-                    renderItemLabel={(item) => t(`library.filters.${item}`)}
-                    showSearch={false}
-                  />
-                </View>
-              )}
-          </ScrollView>
-        )}
+        <View
+          className='flex flex-col'
+          style={{
+            marginTop: Platform.OS === "android" ? 16 : 0,
+          }}
+        >
+          {jellyseerrApi && (
+            <ScrollView
+              horizontal
+              className='flex flex-row flex-wrap space-x-2 px-4 mb-2'
+            >
+              <TouchableOpacity onPress={() => setSearchType("Library")}>
+                <Tag
+                  text={t("search.library")}
+                  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>
+              {searchType === "Discover" &&
+                !loading &&
+                noResults &&
+                debouncedSearch.length > 0 && (
+                  <View className='flex flex-row justify-end items-center space-x-1'>
+                    <FilterButton
+                      id='search'
+                      queryKey='jellyseerr_search'
+                      queryFn={async () =>
+                        Object.keys(JellyseerrSearchSort).filter((v) =>
+                          Number.isNaN(Number(v)),
+                        )
+                      }
+                      set={(value) => setJellyseerrOrderBy(value[0])}
+                      values={[jellyseerrOrderBy]}
+                      title={t("library.filters.sort_by")}
+                      renderItemLabel={(item) =>
+                        t(`home.settings.plugins.jellyseerr.order_by.${item}`)
+                      }
+                      showSearch={false}
+                    />
+                    <FilterButton
+                      id='order'
+                      queryKey='jellysearr_search'
+                      queryFn={async () => ["asc", "desc"]}
+                      set={(value) => setJellyseerrSortOrder(value[0])}
+                      values={[jellyseerrSortOrder]}
+                      title={t("library.filters.sort_order")}
+                      renderItemLabel={(item) => t(`library.filters.${item}`)}
+                      showSearch={false}
+                    />
+                  </View>
+                )}
+            </ScrollView>
+          )}
 
-        <View className='mt-2'>
-          <LoadingSkeleton isLoading={loading} />
-        </View>
-
-        {searchType === "Library" ? (
-          <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
-            <SearchItemWrapper
-              header={t("search.movies")}
-              items={movies}
-              renderItem={(item: BaseItemDto) => (
-                <TouchableItemRouter
-                  key={item.Id}
-                  className='flex flex-col w-28 mr-2'
-                  item={item}
-                >
-                  <MoviePoster item={item} key={item.Id} />
-                  <Text numberOfLines={2} className='mt-2'>
-                    {item.Name}
-                  </Text>
-                  <Text className='opacity-50 text-xs'>
-                    {item.ProductionYear}
-                  </Text>
-                </TouchableItemRouter>
-              )}
-            />
-            <SearchItemWrapper
-              items={series}
-              header={t("search.series")}
-              renderItem={(item: BaseItemDto) => (
-                <TouchableItemRouter
-                  key={item.Id}
-                  item={item}
-                  className='flex flex-col w-28 mr-2'
-                >
-                  <SeriesPoster item={item} key={item.Id} />
-                  <Text numberOfLines={2} className='mt-2'>
-                    {item.Name}
-                  </Text>
-                  <Text className='opacity-50 text-xs'>
-                    {item.ProductionYear}
-                  </Text>
-                </TouchableItemRouter>
-              )}
-            />
-            <SearchItemWrapper
-              items={episodes}
-              header={t("search.episodes")}
-              renderItem={(item: BaseItemDto) => (
-                <TouchableItemRouter
-                  item={item}
-                  key={item.Id}
-                  className='flex flex-col w-44 mr-2'
-                >
-                  <ContinueWatchingPoster item={item} />
-                  <ItemCardText item={item} />
-                </TouchableItemRouter>
-              )}
-            />
-            <SearchItemWrapper
-              items={collections}
-              header={t("search.collections")}
-              renderItem={(item: BaseItemDto) => (
-                <TouchableItemRouter
-                  key={item.Id}
-                  item={item}
-                  className='flex flex-col w-28 mr-2'
-                >
-                  <MoviePoster item={item} key={item.Id} />
-                  <Text numberOfLines={2} className='mt-2'>
-                    {item.Name}
-                  </Text>
-                </TouchableItemRouter>
-              )}
-            />
-            <SearchItemWrapper
-              items={actors}
-              header={t("search.actors")}
-              renderItem={(item: BaseItemDto) => (
-                <TouchableItemRouter
-                  item={item}
-                  key={item.Id}
-                  className='flex flex-col w-28 mr-2'
-                >
-                  <MoviePoster item={item} />
-                  <ItemCardText item={item} />
-                </TouchableItemRouter>
-              )}
-            />
+          <View className='mt-2'>
+            <LoadingSkeleton isLoading={loading} />
           </View>
-        ) : (
-          <JellyserrIndexPage
-            searchQuery={debouncedSearch}
-            sortType={jellyseerrOrderBy}
-            order={jellyseerrSortOrder}
-          />
-        )}
 
-        {searchType === "Library" &&
-          (!loading && noResults && debouncedSearch.length > 0 ? (
-            <View>
-              <Text className='text-center text-lg font-bold mt-4'>
-                {t("search.no_results_found_for")}
-              </Text>
-              <Text className='text-xs text-purple-600 text-center'>
-                "{debouncedSearch}"
-              </Text>
+          {searchType === "Library" ? (
+            <View className={l1 || l2 ? "opacity-0" : "opacity-100"}>
+              <SearchItemWrapper
+                header={t("search.movies")}
+                items={movies}
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    key={item.Id}
+                    className='flex flex-col w-28 mr-2'
+                    item={item}
+                  >
+                    <MoviePoster item={item} key={item.Id} />
+                    <Text numberOfLines={2} className='mt-2'>
+                      {item.Name}
+                    </Text>
+                    <Text className='opacity-50 text-xs'>
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                items={series}
+                header={t("search.series")}
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    key={item.Id}
+                    item={item}
+                    className='flex flex-col w-28 mr-2'
+                  >
+                    <SeriesPoster item={item} key={item.Id} />
+                    <Text numberOfLines={2} className='mt-2'>
+                      {item.Name}
+                    </Text>
+                    <Text className='opacity-50 text-xs'>
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                items={episodes}
+                header={t("search.episodes")}
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className='flex flex-col w-44 mr-2'
+                  >
+                    <ContinueWatchingPoster item={item} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                items={collections}
+                header={t("search.collections")}
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    key={item.Id}
+                    item={item}
+                    className='flex flex-col w-28 mr-2'
+                  >
+                    <MoviePoster item={item} key={item.Id} />
+                    <Text numberOfLines={2} className='mt-2'>
+                      {item.Name}
+                    </Text>
+                  </TouchableItemRouter>
+                )}
+              />
+              <SearchItemWrapper
+                items={actors}
+                header={t("search.actors")}
+                renderItem={(item: BaseItemDto) => (
+                  <TouchableItemRouter
+                    item={item}
+                    key={item.Id}
+                    className='flex flex-col w-28 mr-2'
+                  >
+                    <MoviePoster item={item} />
+                    <ItemCardText item={item} />
+                  </TouchableItemRouter>
+                )}
+              />
             </View>
-          ) : debouncedSearch.length === 0 ? (
-            <View className='mt-4 flex flex-col items-center space-y-2'>
-              {exampleSearches.map((e) => (
-                <TouchableOpacity
-                  onPress={() => {
-                    setSearch(e);
-                    searchBarRef.current?.setText(e);
-                  }}
-                  key={e}
-                  className='mb-2'
-                >
-                  <Text className='text-purple-600'>{e}</Text>
-                </TouchableOpacity>
-              ))}
-            </View>
-          ) : null)}
-      </View>
-    </ScrollView>
+          ) : (
+            <JellyserrIndexPage
+              searchQuery={debouncedSearch}
+              sortType={jellyseerrOrderBy}
+              order={jellyseerrSortOrder}
+            />
+          )}
+
+          {searchType === "Library" &&
+            (!loading && noResults && debouncedSearch.length > 0 ? (
+              <View>
+                <Text className='text-center text-lg font-bold mt-4'>
+                  {t("search.no_results_found_for")}
+                </Text>
+                <Text className='text-xs text-purple-600 text-center'>
+                  "{debouncedSearch}"
+                </Text>
+              </View>
+            ) : debouncedSearch.length === 0 ? (
+              <View className='mt-4 flex flex-col items-center space-y-2'>
+                {exampleSearches.map((e) => (
+                  <TouchableOpacity
+                    onPress={() => {
+                      setSearch(e);
+                      searchBarRef.current?.setText(e);
+                    }}
+                    key={e}
+                    className='mb-2'
+                  >
+                    <Text className='text-purple-600'>{e}</Text>
+                  </TouchableOpacity>
+                ))}
+              </View>
+            ) : null)}
+        </View>
+      </ScrollView>
+    </>
   );
 }

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

@@ -1,26 +1,29 @@
-import {
-  createNativeBottomTabNavigator,
-  type NativeBottomTabNavigationEventMap,
-  type NativeBottomTabNavigationOptions,
-} from "@bottom-tabs/react-navigation";
-import type {
-  ParamListBase,
-  TabNavigationState,
-} from "@react-navigation/native";
-import { useFocusEffect, useRouter, withLayoutContext } from "expo-router";
-import { useCallback } from "react";
+import React, { useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform } from "react-native";
-import { SystemBars } from "react-native-edge-to-edge";
+
+import { useFocusEffect, useRouter, withLayoutContext } from "expo-router";
+
+import {
+  type NativeBottomTabNavigationEventMap,
+  createNativeBottomTabNavigator,
+} from "@bottom-tabs/react-navigation";
+
+const { Navigator } = createNativeBottomTabNavigator();
+import type { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
+
 import { Colors } from "@/constants/Colors";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
 import { storage } from "@/utils/mmkv";
-
-const { Navigator } = createNativeBottomTabNavigator();
+import type {
+  ParamListBase,
+  TabNavigationState,
+} from "@react-navigation/native";
+import { SystemBars } from "react-native-edge-to-edge";
 
 export const NativeTabs = withLayoutContext<
-  NativeBottomTabNavigationOptions,
+  BottomTabNavigationOptions,
   typeof Navigator,
   TabNavigationState<ParamListBase>,
   NativeBottomTabNavigationEventMap
@@ -51,6 +54,7 @@ export default function TabLayout() {
       <SystemBars hidden={false} style='light' />
       <NativeTabs
         sidebarAdaptable={false}
+        ignoresTopSafeArea
         tabBarStyle={{
           backgroundColor: "#121212",
         }}
@@ -59,8 +63,8 @@ export default function TabLayout() {
       >
         <NativeTabs.Screen redirect name='index' />
         <NativeTabs.Screen
-          listeners={(_e) => ({
-            tabPress: (_e) => {
+          listeners={({ navigation }) => ({
+            tabPress: (e) => {
               eventBus.emit("scrollToTop");
             },
           })}
@@ -69,7 +73,8 @@ export default function TabLayout() {
             title: t("tabs.home"),
             tabBarIcon:
               Platform.OS === "android"
-                ? (_e) => require("@/assets/icons/house.fill.png")
+                ? ({ color, focused, size }) =>
+                    require("@/assets/icons/house.fill.png")
                 : ({ focused }) =>
                     focused
                       ? { sfSymbol: "house.fill" }
@@ -77,8 +82,8 @@ export default function TabLayout() {
           }}
         />
         <NativeTabs.Screen
-          listeners={(_e) => ({
-            tabPress: (_e) => {
+          listeners={({ navigation }) => ({
+            tabPress: (e) => {
               eventBus.emit("searchTabPressed");
             },
           })}
@@ -87,7 +92,8 @@ export default function TabLayout() {
             title: t("tabs.search"),
             tabBarIcon:
               Platform.OS === "android"
-                ? (_e) => require("@/assets/icons/magnifyingglass.png")
+                ? ({ color, focused, size }) =>
+                    require("@/assets/icons/magnifyingglass.png")
                 : ({ focused }) =>
                     focused
                       ? { sfSymbol: "magnifyingglass" }
@@ -100,7 +106,7 @@ export default function TabLayout() {
             title: t("tabs.favorites"),
             tabBarIcon:
               Platform.OS === "android"
-                ? ({ focused }) =>
+                ? ({ color, focused, size }) =>
                     focused
                       ? require("@/assets/icons/heart.fill.png")
                       : require("@/assets/icons/heart.png")
@@ -116,7 +122,8 @@ export default function TabLayout() {
             title: t("tabs.library"),
             tabBarIcon:
               Platform.OS === "android"
-                ? (_e) => require("@/assets/icons/server.rack.png")
+                ? ({ color, focused, size }) =>
+                    require("@/assets/icons/server.rack.png")
                 : ({ focused }) =>
                     focused
                       ? { sfSymbol: "rectangle.stack.fill" }
@@ -127,10 +134,11 @@ export default function TabLayout() {
           name='(custom-links)'
           options={{
             title: t("tabs.custom_links"),
+            // @ts-expect-error
             tabBarItemHidden: !settings?.showCustomMenuLinks,
             tabBarIcon:
               Platform.OS === "android"
-                ? (_e) => require("@/assets/icons/list.png")
+                ? ({ focused }) => require("@/assets/icons/list.png")
                 : ({ focused }) =>
                     focused
                       ? { sfSymbol: "list.dash.fill" }

app/(auth)/player/_layout.tsx

@@ -1,4 +1,5 @@
 import { Stack } from "expo-router";
+import React from "react";
 import { SystemBars } from "react-native-edge-to-edge";
 
 export default function Layout() {

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

@@ -15,8 +15,8 @@ import { useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Platform, View } from "react-native";
-import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
-
+import { useSharedValue } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { BITRATES } from "@/components/BitrateSelector";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
@@ -38,9 +38,12 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { writeToLog } from "@/utils/log";
+import { storage } from "@/utils/mmkv";
 import { generateDeviceProfile } from "@/utils/profiles/native";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
 
+const IGNORE_SAFE_AREAS_KEY = "video_player_ignore_safe_areas";
+
 export default function page() {
   const videoRef = useRef<VlcPlayerViewRef>(null);
   const user = useAtomValue(userAtom);
@@ -50,12 +53,11 @@ export default function page() {
 
   const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
   const [showControls, _setShowControls] = useState(true);
-  const [aspectRatio, setAspectRatio] = useState<
-    "default" | "16:9" | "4:3" | "1:1" | "21:9"
-  >("default");
-  const [scaleFactor, setScaleFactor] = useState<
-    1.0 | 1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6 | 1.7 | 1.8 | 1.9 | 2.0
-  >(1.0);
+  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(() => {
+    // Load persisted state from storage
+    const saved = storage.getBoolean(IGNORE_SAFE_AREAS_KEY);
+    return saved ?? false;
+  });
   const [isPlaying, setIsPlaying] = useState(false);
   const [isMuted, setIsMuted] = useState(false);
   const [isBuffering, setIsBuffering] = useState(true);
@@ -80,6 +82,11 @@ export default function page() {
     lightHapticFeedback();
   }, []);
 
+  // Persist ignoreSafeAreas state whenever it changes
+  useEffect(() => {
+    storage.set(IGNORE_SAFE_AREAS_KEY, ignoreSafeAreas);
+  }, [ignoreSafeAreas]);
+
   const {
     itemId,
     audioIndex: audioIndexStr,
@@ -98,8 +105,8 @@ export default function page() {
     /** Playback position in ticks. */
     playbackPosition?: string;
   }>();
-  const [_settings] = useSettings();
-
+  const [settings] = useSettings();
+  const insets = useSafeAreaInsets();
   const offline = offlineStr === "true";
   const playbackManager = usePlaybackManager();
 
@@ -127,7 +134,7 @@ export default function page() {
     if (playbackPositionFromUrl) {
       return Number.parseInt(playbackPositionFromUrl, 10);
     }
-    return item?.UserData?.PlaybackPositionTicks ?? 0;
+    return 0;
   }, [playbackPositionFromUrl]);
 
   useEffect(() => {
@@ -178,7 +185,8 @@ export default function page() {
       setStreamStatus({ isLoading: true, isError: false });
       try {
         let result: Stream | null = null;
-        if (offline && downloadedItem && downloadedItem.mediaSource) {
+        if (offline && downloadedItem) {
+          if (!downloadedItem?.mediaSource) return;
           const url = downloadedItem.videoFilePath;
           if (item) {
             result = {
@@ -188,8 +196,8 @@ export default function page() {
             };
           }
         } else {
-          const native = generateDeviceProfile();
-          const transcoding = generateDeviceProfile({ transcode: true });
+          const native = await generateDeviceProfile();
+          const transcoding = await generateDeviceProfile({ transcode: true });
           const res = await getStreamUrl({
             api,
             item,
@@ -233,6 +241,7 @@ export default function page() {
   useEffect(() => {
     if (!stream || !api) return;
     const reportPlaybackStart = async () => {
+      console.log("reporting playback start", currentPlayStateInfo());
       await getPlaystateApi(api).reportPlaybackStart({
         playbackStartInfo: currentPlayStateInfo() as PlaybackStartInfo,
       });
@@ -248,10 +257,6 @@ export default function page() {
       playbackManager.reportPlaybackProgress(
         item?.Id!,
         msToTicks(progress.get()),
-        {
-          AudioStreamIndex: audioIndex ?? -1,
-          SubtitleStreamIndex: subtitleIndex ?? -1,
-        },
       );
     } else {
       videoRef.current?.play();
@@ -280,15 +285,11 @@ export default function page() {
   ]);
 
   const stop = useCallback(() => {
-    // Update URL with final playback position before stopping
-    router.setParams({
-      playbackPosition: msToTicks(progress.get()).toString(),
-    });
     reportPlaybackStopped();
     setIsPlaybackStopped(true);
     videoRef.current?.stop();
     revalidateProgressCache();
-  }, [videoRef, reportPlaybackStopped, progress]);
+  }, [videoRef, reportPlaybackStopped]);
 
   useEffect(() => {
     const beforeRemoveListener = navigation.addListener("beforeRemove", stop);
@@ -297,7 +298,7 @@ export default function page() {
     };
   }, [navigation, stop]);
 
-  const currentPlayStateInfo = useCallback(() => {
+  const currentPlayStateInfo = () => {
     if (!stream) return;
     return {
       itemId: item?.Id!,
@@ -313,32 +314,7 @@ export default function page() {
       repeatMode: RepeatMode.RepeatNone,
       playbackOrder: PlaybackOrder.Default,
     };
-  }, [
-    stream,
-    item?.Id,
-    audioIndex,
-    subtitleIndex,
-    mediaSourceId,
-    progress,
-    isPlaying,
-    isMuted,
-  ]);
-
-  const lastUrlUpdateTime = useSharedValue(0);
-  const wasJustSeeking = useSharedValue(false);
-  const URL_UPDATE_INTERVAL = 30000; // Update URL every 30 seconds instead of every second
-
-  // Track when seeking ends to update URL immediately
-  useAnimatedReaction(
-    () => isSeeking.get(),
-    (currentSeeking, previousSeeking) => {
-      if (previousSeeking && !currentSeeking) {
-        // Seeking just ended
-        wasJustSeeking.value = true;
-      }
-    },
-    [],
-  );
+  };
 
   const onProgress = useCallback(
     async (data: ProgressUpdatePayload) => {
@@ -351,20 +327,10 @@ export default function page() {
 
       progress.set(currentTime);
 
-      // Update URL immediately after seeking, or every 30 seconds during normal playback
-      const now = Date.now();
-      const shouldUpdateUrl = wasJustSeeking.get();
-      wasJustSeeking.value = false;
-
-      if (
-        shouldUpdateUrl ||
-        now - lastUrlUpdateTime.get() > URL_UPDATE_INTERVAL
-      ) {
-        router.setParams({
-          playbackPosition: msToTicks(currentTime).toString(),
-        });
-        lastUrlUpdateTime.value = now;
-      }
+      // Update the playback position in the URL.
+      router.setParams({
+        playbackPosition: msToTicks(currentTime).toString(),
+      });
 
       if (!item?.Id) return;
 
@@ -437,7 +403,6 @@ export default function page() {
       console.error("Error toggling mute:", error);
     }
   }, [previousVolume]);
-
   const volumeDownCb = useCallback(async () => {
     if (Platform.isTV) return;
 
@@ -488,10 +453,6 @@ export default function page() {
           playbackManager.reportPlaybackProgress(
             item.Id,
             msToTicks(progress.get()),
-            {
-              AudioStreamIndex: audioIndex ?? -1,
-              SubtitleStreamIndex: subtitleIndex ?? -1,
-            },
           );
         }
         if (!Platform.isTV) await activateKeepAwakeAsync();
@@ -504,10 +465,6 @@ export default function page() {
           playbackManager.reportPlaybackProgress(
             item.Id,
             msToTicks(progress.get()),
-            {
-              AudioStreamIndex: audioIndex ?? -1,
-              SubtitleStreamIndex: subtitleIndex ?? -1,
-            },
           );
         }
         if (!Platform.isTV) await deactivateKeepAwake();
@@ -552,7 +509,7 @@ export default function page() {
   /** Whether the stream we're playing is not transcoding*/
   const notTranscoding = !stream?.mediaSource.TranscodingUrl;
   /** The initial options to pass to the VLC Player */
-  const initOptions = [``];
+  const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
   if (
     chosenSubtitleTrack &&
     (notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
@@ -577,66 +534,7 @@ export default function page() {
     return () => setIsMounted(false);
   }, []);
 
-  // Memoize video ref functions to prevent unnecessary re-renders
-  const startPictureInPicture = useMemo(
-    () => videoRef.current?.startPictureInPicture,
-    [isVideoLoaded],
-  );
-  const play = useMemo(
-    () => videoRef.current?.play || (() => {}),
-    [isVideoLoaded],
-  );
-  const pause = useMemo(
-    () => videoRef.current?.pause || (() => {}),
-    [isVideoLoaded],
-  );
-  const seek = useMemo(
-    () => videoRef.current?.seekTo || (() => {}),
-    [isVideoLoaded],
-  );
-  const getAudioTracks = useMemo(
-    () => videoRef.current?.getAudioTracks,
-    [isVideoLoaded],
-  );
-  const getSubtitleTracks = useMemo(
-    () => videoRef.current?.getSubtitleTracks,
-    [isVideoLoaded],
-  );
-  const setSubtitleTrack = useMemo(
-    () => videoRef.current?.setSubtitleTrack,
-    [isVideoLoaded],
-  );
-  const setSubtitleURL = useMemo(
-    () => videoRef.current?.setSubtitleURL,
-    [isVideoLoaded],
-  );
-  const setAudioTrack = useMemo(
-    () => videoRef.current?.setAudioTrack,
-    [isVideoLoaded],
-  );
-  const setVideoAspectRatio = useMemo(
-    () => videoRef.current?.setVideoAspectRatio,
-    [isVideoLoaded],
-  );
-  const setVideoScaleFactor = useMemo(
-    () => videoRef.current?.setVideoScaleFactor,
-    [isVideoLoaded],
-  );
-
-  console.log("Debug: component render"); // Uncomment to debug re-renders
-
-  // Show error UI first, before checking loading/missing‐data
-  if (itemStatus.isError || streamStatus.isError) {
-    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>
-    );
-  }
-
-  // Then show loader while either side is still fetching or data isn’t present
   if (itemStatus.isLoading || streamStatus.isLoading || !item || !stream) {
-    // …loader UI…
     return (
       <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
         <Loader />
@@ -652,14 +550,7 @@ export default function page() {
     );
 
   return (
-    <View
-      style={{
-        flex: 1,
-        backgroundColor: "black",
-        height: "100%",
-        width: "100%",
-      }}
-    >
+    <View style={{ flex: 1, backgroundColor: "black" }}>
       <View
         style={{
           display: "flex",
@@ -668,6 +559,8 @@ export default function page() {
           position: "relative",
           flexDirection: "column",
           justifyContent: "center",
+          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
+          paddingRight: ignoreSafeAreas ? 0 : insets.right,
         }}
       >
         <VlcPlayerView
@@ -698,7 +591,7 @@ export default function page() {
           }}
         />
       </View>
-      {!isPipStarted && isMounted === true && item && (
+      {videoRef.current && !isPipStarted && isMounted === true && item ? (
         <Controls
           mediaSource={stream?.mediaSource}
           item={item}
@@ -711,27 +604,23 @@ export default function page() {
           isBuffering={isBuffering}
           showControls={showControls}
           setShowControls={setShowControls}
+          setIgnoreSafeAreas={setIgnoreSafeAreas}
+          ignoreSafeAreas={ignoreSafeAreas}
           isVideoLoaded={isVideoLoaded}
-          startPictureInPicture={startPictureInPicture}
-          play={play}
-          pause={pause}
-          seek={seek}
+          startPictureInPicture={videoRef?.current?.startPictureInPicture}
+          play={videoRef.current?.play}
+          pause={videoRef.current?.pause}
+          seek={videoRef.current?.seekTo}
           enableTrickplay={true}
-          getAudioTracks={getAudioTracks}
-          getSubtitleTracks={getSubtitleTracks}
+          getAudioTracks={videoRef.current?.getAudioTracks}
+          getSubtitleTracks={videoRef.current?.getSubtitleTracks}
           offline={offline}
-          setSubtitleTrack={setSubtitleTrack}
-          setSubtitleURL={setSubtitleURL}
-          setAudioTrack={setAudioTrack}
-          setVideoAspectRatio={setVideoAspectRatio}
-          setVideoScaleFactor={setVideoScaleFactor}
-          aspectRatio={aspectRatio}
-          scaleFactor={scaleFactor}
-          setAspectRatio={setAspectRatio}
-          setScaleFactor={setScaleFactor}
+          setSubtitleTrack={videoRef.current.setSubtitleTrack}
+          setSubtitleURL={videoRef.current.setSubtitleURL}
+          setAudioTrack={videoRef.current.setAudioTrack}
           isVlc
         />
-      )}
+      ) : null}
     </View>
   );
 }

app/+html.tsx

@@ -1,5 +1,5 @@
 import { ScrollViewStyleReset } from "expo-router/html";
-import { type PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 
 /**
  * This file is web-only and used to configure the root HTML for every web page during static rendering.

app/_layout.tsx

@@ -1,14 +1,11 @@
 import "@/augmentations";
-import { ActionSheetProvider } from "@expo/react-native-action-sheet";
-import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
-import { Platform } from "react-native";
 import i18n from "@/i18n";
 import { DownloadProvider } from "@/providers/DownloadProvider";
 import {
+  JellyfinProvider,
   apiAtom,
   getOrSetDeviceId,
   getTokenFromStorage,
-  JellyfinProvider,
 } from "@/providers/JellyfinProvider";
 import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
 import { WebSocketProvider } from "@/providers/WebSocketProvider";
@@ -25,37 +22,35 @@ import {
   writeToLog,
 } from "@/utils/log";
 import { storage } from "@/utils/mmkv";
-
+import { ActionSheetProvider } from "@expo/react-native-action-sheet";
+import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { Platform } from "react-native";
 const BackGroundDownloader = !Platform.isTV
   ? require("@kesha-antonov/react-native-background-downloader")
   : null;
-
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-
 const BackgroundFetch = !Platform.isTV
   ? require("expo-background-fetch")
   : null;
-
 import * as Device from "expo-device";
 import * as FileSystem from "expo-file-system";
-
 const Notifications = !Platform.isTV ? require("expo-notifications") : null;
-
-import { router, Stack, useSegments } from "expo-router";
-import * as SplashScreen from "expo-splash-screen";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-
+import { Stack, router, useSegments } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
 const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
-
 import { getLocales } from "expo-localization";
 import { Provider as JotaiProvider } from "jotai";
 import { useEffect, useRef, useState } from "react";
 import { I18nextProvider } from "react-i18next";
-import { Appearance, AppState } from "react-native";
+import { AppState, Appearance } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import "react-native-reanimated";
+import { userAtom } from "@/providers/JellyfinProvider";
+import { store } from "@/utils/store";
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
 import type { EventSubscription } from "expo-modules-core";
 import type {
@@ -65,8 +60,6 @@ import type {
 import type { ExpoPushToken } from "expo-notifications/build/Tokens.types";
 import { useAtom } from "jotai";
 import { Toaster } from "sonner-native";
-import { userAtom } from "@/providers/JellyfinProvider";
-import { store } from "@/utils/store";
 
 if (!Platform.isTV) {
   Notifications.setNotificationHandler({
@@ -88,9 +81,9 @@ SplashScreen.setOptions({
 });
 
 function useNotificationObserver() {
-  useEffect(() => {
-    if (Platform.isTV) return;
+  if (Platform.isTV) return;
 
+  useEffect(() => {
     let isMounted = true;
 
     function redirect(notification: typeof Notifications.Notification) {
@@ -235,51 +228,51 @@ function Layout() {
     );
   }, [settings?.preferedLanguage, i18n]);
 
-  useNotificationObserver();
+  if (!Platform.isTV) {
+    useNotificationObserver();
 
-  const [expoPushToken, setExpoPushToken] = useState<ExpoPushToken>();
-  const notificationListener = useRef<EventSubscription>();
-  const responseListener = useRef<EventSubscription>();
+    const [expoPushToken, setExpoPushToken] = useState<ExpoPushToken>();
+    const notificationListener = useRef<EventSubscription>();
+    const responseListener = useRef<EventSubscription>();
 
-  useEffect(() => {
-    if (!Platform.isTV && expoPushToken && api && user) {
-      api
-        ?.post("/Streamyfin/device", {
-          token: expoPushToken.data,
-          deviceId: getOrSetDeviceId(),
-          userId: user.Id,
-        })
-        .then((_) => console.log("Posted expo push token"))
-        .catch((_) =>
-          writeErrorLog("Failed to push expo push token to plugin"),
-        );
-    } else console.log("No token available");
-  }, [api, expoPushToken, user]);
+    useEffect(() => {
+      if (expoPushToken && api && user) {
+        api
+          ?.post("/Streamyfin/device", {
+            token: expoPushToken.data,
+            deviceId: getOrSetDeviceId(),
+            userId: user.Id,
+          })
+          .then((_) => console.log("Posted expo push token"))
+          .catch((_) =>
+            writeErrorLog("Failed to push expo push token to plugin"),
+          );
+      } else console.log("No token available");
+    }, [api, expoPushToken, user]);
 
-  async function registerNotifications() {
-    if (Platform.OS === "android") {
-      console.log("Setting android notification channel 'default'");
-      await Notifications?.setNotificationChannelAsync("default", {
-        name: "default",
-      });
+    async function registerNotifications() {
+      if (Platform.OS === "android") {
+        console.log("Setting android notification channel 'default'");
+        await Notifications?.setNotificationChannelAsync("default", {
+          name: "default",
+        });
+      }
+
+      await checkAndRequestPermissions();
+
+      if (!Platform.isTV && user && user.Policy?.IsAdministrator) {
+        await registerBackgroundFetchAsyncSessions();
+      }
+
+      // only create push token for real devices (pointless for emulators)
+      if (Device.isDevice) {
+        Notifications?.getExpoPushTokenAsync()
+          .then((token: ExpoPushToken) => token && setExpoPushToken(token))
+          .catch((reason: any) => console.log("Failed to get token", reason));
+      }
     }
 
-    await checkAndRequestPermissions();
-
-    if (!Platform.isTV && user && user.Policy?.IsAdministrator) {
-      await registerBackgroundFetchAsyncSessions();
-    }
-
-    // only create push token for real devices (pointless for emulators)
-    if (Device.isDevice) {
-      Notifications?.getExpoPushTokenAsync()
-        .then((token: ExpoPushToken) => token && setExpoPushToken(token))
-        .catch((reason: any) => console.log("Failed to get token", reason));
-    }
-  }
-
-  useEffect(() => {
-    if (!Platform.isTV) {
+    useEffect(() => {
       registerNotifications();
 
       notificationListener.current =
@@ -297,10 +290,12 @@ function Layout() {
           (response: NotificationResponse) => {
             // Currently the notifications supported by the plugin will send data for deep links.
             const { title, data } = response.notification.request.content;
+
             writeDebugLog(
               `Notification ${title} opened`,
               response.notification.request.content,
             );
+
             if (data && Object.keys(data).length > 0) {
               const type = data?.type?.toLower?.();
               const itemId = data?.id;
@@ -313,10 +308,12 @@ function Layout() {
                   // We just clicked a notification for an individual episode.
                   if (itemId) {
                     router.push(`/(auth)/(tabs)/home/items/page?id=${itemId}`);
-                    // summarized season notification for multiple episodes. Bring them to series season
-                  } else {
+                  }
+                  // summarized season notification for multiple episodes. Bring them to series season
+                  else {
                     const seriesId = data.seriesId;
                     const seasonIndex = data.seasonIndex;
+
                     if (seasonIndex) {
                       router.push(
                         `/(auth)/(tabs)/home/series/${seriesId}?seasonIndex=${seasonIndex}`,
@@ -341,57 +338,56 @@ function Layout() {
             responseListener.current,
           );
       };
-    }
-  }, [user, api]);
+    }, []);
 
-  useEffect(() => {
-    if (Platform.isTV) {
-      return;
-    }
-
-    if (segments.includes("direct-player" as never)) {
-      if (
-        !settings.followDeviceOrientation &&
-        settings.defaultVideoOrientation
-      ) {
-        ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
+    useEffect(() => {
+      if (Platform.isTV) {
+        return;
       }
-      return;
-    }
 
-    if (settings.followDeviceOrientation === true) {
-      ScreenOrientation.unlockAsync();
-    } else {
-      ScreenOrientation.lockAsync(
-        ScreenOrientation.OrientationLock.PORTRAIT_UP,
+      if (segments.includes("direct-player" as never)) {
+        if (
+          !settings.followDeviceOrientation &&
+          settings.defaultVideoOrientation
+        ) {
+          ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
+        }
+        return;
+      }
+
+      if (settings.followDeviceOrientation === true) {
+        ScreenOrientation.unlockAsync();
+      } else {
+        ScreenOrientation.lockAsync(
+          ScreenOrientation.OrientationLock.PORTRAIT_UP,
+        );
+      }
+    }, [
+      settings.followDeviceOrientation,
+      settings.defaultVideoOrientation,
+      segments,
+    ]);
+
+    useEffect(() => {
+      const subscription = AppState.addEventListener(
+        "change",
+        (nextAppState) => {
+          if (
+            appState.current.match(/inactive|background/) &&
+            nextAppState === "active"
+          ) {
+            BackGroundDownloader.checkForExistingDownloads();
+          }
+        },
       );
-    }
-  }, [
-    settings.followDeviceOrientation,
-    settings.defaultVideoOrientation,
-    segments,
-  ]);
 
-  useEffect(() => {
-    if (Platform.isTV) {
-      return;
-    }
+      BackGroundDownloader.checkForExistingDownloads();
 
-    const subscription = AppState.addEventListener("change", (nextAppState) => {
-      if (
-        appState.current.match(/inactive|background/) &&
-        nextAppState === "active"
-      ) {
-        BackGroundDownloader.checkForExistingDownloads();
-      }
-    });
-
-    BackGroundDownloader.checkForExistingDownloads();
-
-    return () => {
-      subscription.remove();
-    };
-  }, []);
+      return () => {
+        subscription.remove();
+      };
+    }, []);
+  }
 
   return (
     <QueryClientProvider client={queryClient}>
@@ -454,3 +450,24 @@ function Layout() {
     </QueryClientProvider>
   );
 }
+
+function saveDownloadedItemInfo(item: BaseItemDto) {
+  try {
+    const downloadedItems = storage.getString("downloadedItems");
+    const 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,29 +1,29 @@
+import { Button } from "@/components/Button";
+import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
+import { PreviousServersList } from "@/components/PreviousServersList";
+import { Input } from "@/components/common/Input";
+import { Text } from "@/components/common/Text";
+import { Colors } from "@/constants/Colors";
+import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import type { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
 import { Image } from "expo-image";
 import { useLocalSearchParams, useNavigation } from "expo-router";
-import { t } from "i18next";
 import { useAtomValue } from "jotai";
 import type React from "react";
 import { useCallback, useEffect, useState } from "react";
 import {
   Alert,
-  Keyboard,
   KeyboardAvoidingView,
   Platform,
   SafeAreaView,
   TouchableOpacity,
   View,
 } from "react-native";
-import { z } from "zod";
-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 { Keyboard } from "react-native";
 
+import { t } from "i18next";
+import { z } from "zod";
 const CredentialsSchema = z.object({
   username: z.string().min(1, t("login.username_required")),
 });
@@ -199,7 +199,7 @@ const Login: React.FC = () => {
           ],
         );
       }
-    } catch (_error) {
+    } catch (error) {
       Alert.alert(
         t("login.error_title"),
         t("login.failed_to_initiate_quick_connect"),
@@ -213,127 +213,133 @@ const Login: React.FC = () => {
         behavior={Platform.OS === "ios" ? "padding" : "height"}
       >
         {api?.basePath ? (
-          <View className='flex flex-col h-full relative items-center justify-center'>
-            <View className='px-4 -mt-20 w-full'>
-              <View className='flex flex-col space-y-2'>
-                <Text className='text-2xl font-bold -mb-2'>
-                  {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'>{api.basePath}</Text>
-                <Input
-                  placeholder={t("login.username_placeholder")}
-                  onChangeText={(text) =>
-                    setCredentials({ ...credentials, username: text })
-                  }
-                  value={credentials.username}
-                  keyboardType='default'
-                  returnKeyType='done'
-                  autoCapitalize='none'
-                  // Changed from username to oneTimeCode because it is a known issue in RN
-                  // https://github.com/facebook/react-native/issues/47106#issuecomment-2521270037
-                  textContentType='oneTimeCode'
-                  clearButtonMode='while-editing'
-                  maxLength={500}
-                />
+          <>
+            <View className='flex flex-col h-full relative items-center justify-center'>
+              <View className='px-4 -mt-20 w-full'>
+                <View className='flex flex-col space-y-2'>
+                  <Text className='text-2xl font-bold -mb-2'>
+                    {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'>
+                    {api.basePath}
+                  </Text>
+                  <Input
+                    placeholder={t("login.username_placeholder")}
+                    onChangeText={(text) =>
+                      setCredentials({ ...credentials, username: text })
+                    }
+                    value={credentials.username}
+                    keyboardType='default'
+                    returnKeyType='done'
+                    autoCapitalize='none'
+                    // Changed from username to oneTimeCode because it is a known issue in RN
+                    // https://github.com/facebook/react-native/issues/47106#issuecomment-2521270037
+                    textContentType='oneTimeCode'
+                    clearButtonMode='while-editing'
+                    maxLength={500}
+                  />
 
-                <Input
-                  placeholder={t("login.password_placeholder")}
-                  onChangeText={(text) =>
-                    setCredentials({ ...credentials, password: text })
-                  }
-                  value={credentials.password}
-                  secureTextEntry
-                  keyboardType='default'
-                  returnKeyType='done'
-                  autoCapitalize='none'
-                  textContentType='password'
-                  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>
+                  <Input
+                    placeholder={t("login.password_placeholder")}
+                    onChangeText={(text) =>
+                      setCredentials({ ...credentials, password: text })
+                    }
+                    value={credentials.password}
+                    secureTextEntry
+                    keyboardType='default'
+                    returnKeyType='done'
+                    autoCapitalize='none'
+                    textContentType='password'
+                    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>
 
-            <View className='absolute bottom-0 left-0 w-full px-4 mb-2' />
-          </View>
-        ) : (
-          <View className='flex flex-col h-full items-center justify-center w-full'>
-            <View className='flex flex-col gap-y-2 px-4 w-full -mt-36'>
-              <Image
-                style={{
-                  width: 100,
-                  height: 100,
-                  marginLeft: -23,
-                  marginBottom: -20,
-                }}
-                source={require("@/assets/images/icon-ios-plain.png")}
-              />
-              <Text className='text-3xl font-bold'>Streamyfin</Text>
-              <Text className='text-neutral-500'>
-                {t("server.enter_url_to_jellyfin_server")}
-              </Text>
-              <Input
-                aria-label='Server URL'
-                placeholder={t("server.server_url_placeholder")}
-                onChangeText={setServerURL}
-                value={serverURL}
-                keyboardType='url'
-                returnKeyType='done'
-                autoCapitalize='none'
-                textContentType='URL'
-                maxLength={500}
-              />
-              <Button
-                loading={loadingServerCheck}
-                disabled={loadingServerCheck}
-                onPress={async () => {
-                  await handleConnect(serverURL);
-                }}
-                className='w-full grow'
-              >
-                {t("server.connect_button")}
-              </Button>
-              <JellyfinServerDiscovery
-                onServerSelect={async (server) => {
-                  setServerURL(server.address);
-                  if (server.serverName) {
-                    setServerName(server.serverName);
-                  }
-                  await handleConnect(server.address);
-                }}
-              />
-              <PreviousServersList
-                onServerSelect={async (s) => {
-                  await handleConnect(s.address);
-                }}
-              />
+              <View className='absolute bottom-0 left-0 w-full px-4 mb-2' />
             </View>
-          </View>
+          </>
+        ) : (
+          <>
+            <View className='flex flex-col h-full items-center justify-center w-full'>
+              <View className='flex flex-col gap-y-2 px-4 w-full -mt-36'>
+                <Image
+                  style={{
+                    width: 100,
+                    height: 100,
+                    marginLeft: -23,
+                    marginBottom: -20,
+                  }}
+                  source={require("@/assets/images/StreamyFinFinal.png")}
+                />
+                <Text className='text-3xl font-bold'>Streamyfin</Text>
+                <Text className='text-neutral-500'>
+                  {t("server.enter_url_to_jellyfin_server")}
+                </Text>
+                <Input
+                  aria-label='Server URL'
+                  placeholder={t("server.server_url_placeholder")}
+                  onChangeText={setServerURL}
+                  value={serverURL}
+                  keyboardType='url'
+                  returnKeyType='done'
+                  autoCapitalize='none'
+                  textContentType='URL'
+                  maxLength={500}
+                />
+                <Button
+                  loading={loadingServerCheck}
+                  disabled={loadingServerCheck}
+                  onPress={async () => {
+                    await handleConnect(serverURL);
+                  }}
+                  className='w-full grow'
+                >
+                  {t("server.connect_button")}
+                </Button>
+                <JellyfinServerDiscovery
+                  onServerSelect={async (server) => {
+                    setServerURL(server.address);
+                    if (server.serverName) {
+                      setServerName(server.serverName);
+                    }
+                    await handleConnect(server.address);
+                  }}
+                />
+                <PreviousServersList
+                  onServerSelect={async (s) => {
+                    await handleConnect(s.address);
+                  }}
+                />
+              </View>
+            </View>
+          </>
         )}
       </KeyboardAvoidingView>
     </SafeAreaView>

augmentations/api.ts

@@ -1,6 +1,6 @@
-import { Api, AUTHORIZATION_HEADER } from "@jellyfin/sdk";
-import type { AxiosRequestConfig, AxiosResponse } from "axios";
 import type { StreamyfinPluginConfig } from "@/utils/atoms/settings";
+import { AUTHORIZATION_HEADER, Api } from "@jellyfin/sdk";
+import type { AxiosRequestConfig, AxiosResponse } from "axios";
 
 declare module "@jellyfin/sdk" {
   interface Api {

augmentations/mmkv.ts

@@ -7,27 +7,15 @@ declare module "react-native-mmkv" {
   }
 }
 
-// Add the augmentation methods directly to the MMKV prototype
-// This follows the recommended pattern while adding the helper methods your app uses
 MMKV.prototype.get = function <T>(key: string): T | undefined {
-  try {
-    const serializedItem = this.getString(key);
-    if (!serializedItem) return undefined;
-    return JSON.parse(serializedItem);
-  } catch (error) {
-    console.warn(`Failed to parse MMKV value for key "${key}":`, error);
-    return undefined;
-  }
+  const serializedItem = this.getString(key);
+  return serializedItem ? JSON.parse(serializedItem) : undefined;
 };
 
 MMKV.prototype.setAny = function (key: string, value: any | undefined): void {
-  try {
-    if (value === undefined) {
-      this.delete(key);
-    } else {
-      this.set(key, JSON.stringify(value));
-    }
-  } catch (error) {
-    console.warn(`Failed to set MMKV value for key "${key}":`, error);
+  if (value === undefined) {
+    this.delete(key);
+  } else {
+    this.set(key, JSON.stringify(value));
   }
 };

biome.json

@@ -1,14 +1,14 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
   "files": {
     "includes": [
       "**/*",
-      "!node_modules",
-      "!ios",
-      "!android",
-      "!Streamyfin.app",
-      "!utils/jellyseerr",
-      "!.expo"
+      "!node_modules/**",
+      "!ios/**",
+      "!android/**",
+      "!Streamyfin.app/**",
+      "!utils/jellyseerr/**",
+      "!.expo/**"
     ]
   },
   "linter": {
@@ -24,9 +24,7 @@
         "noForEach": "off"
       },
       "recommended": true,
-      "correctness": {
-        "useExhaustiveDependencies": "off"
-      },
+      "correctness": { "useExhaustiveDependencies": "off" },
       "suspicious": {
         "noExplicitAny": "off",
         "noArrayIndexKey": "off"

components/AddToFavorites.tsx

@@ -1,8 +1,8 @@
+import { RoundButton } from "@/components/RoundButton";
+import { useFavorite } from "@/hooks/useFavorite";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import type { FC } from "react";
 import { View, type ViewProps } from "react-native";
-import { RoundButton } from "@/components/RoundButton";
-import { useFavorite } from "@/hooks/useFavorite";
 
 interface Props extends ViewProps {
   item: BaseItemDto;

components/AudioTrackSelector.tsx

@@ -1,9 +1,7 @@
 import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
 import { useMemo } from "react";
 import { Platform, TouchableOpacity, View } from "react-native";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import { useTranslation } from "react-i18next";
 import { Text } from "./common/Text";
 
@@ -19,8 +17,7 @@ export const AudioTrackSelector: React.FC<Props> = ({
   selected,
   ...props
 }) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const audioStreams = useMemo(
     () => source?.MediaStreams?.filter((x) => x.Type === "Audio"),
     [source],
@@ -33,8 +30,6 @@ export const AudioTrackSelector: React.FC<Props> = ({
 
   const { t } = useTranslation();
 
-  if (isTv) return null;
-
   return (
     <View
       className='flex shrink'

components/BitrateSelector.tsx

@@ -1,7 +1,5 @@
 import { Platform, TouchableOpacity, View } from "react-native";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Text } from "./common/Text";
@@ -60,26 +58,23 @@ export const BitrateSelector: React.FC<Props> = ({
   inverted,
   ...props
 }) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const sorted = useMemo(() => {
     if (inverted)
-      return BITRATES.slice().sort(
+      return BITRATES.sort(
         (a, b) =>
           (a.value || Number.POSITIVE_INFINITY) -
           (b.value || Number.POSITIVE_INFINITY),
       );
-    return BITRATES.slice().sort(
+    return BITRATES.sort(
       (a, b) =>
         (b.value || Number.POSITIVE_INFINITY) -
         (a.value || Number.POSITIVE_INFINITY),
     );
-  }, [inverted]);
+  }, []);
 
   const { t } = useTranslation();
 
-  if (isTv) return null;
-
   return (
     <View
       className='flex shrink'

components/Button.tsx

@@ -1,7 +1,7 @@
+import { useHaptic } from "@/hooks/useHaptic";
 import type React from "react";
 import { type PropsWithChildren, type ReactNode, useMemo } from "react";
-import { Text, TouchableOpacity, View } from "react-native";
-import { useHaptic } from "@/hooks/useHaptic";
+import { Platform, Text, TouchableOpacity, View } from "react-native";
 import { Loader } from "./Loader";
 
 export interface ButtonProps

components/Chromecast.tsx

@@ -1,6 +1,6 @@
 import { Feather } from "@expo/vector-icons";
-import { useCallback, useEffect } from "react";
-import { Platform } from "react-native";
+import React, { useCallback, useEffect } from "react";
+import { Platform, TouchableOpacity, type ViewProps } from "react-native";
 import GoogleCast, {
   CastButton,
   CastContext,
@@ -11,6 +11,12 @@ import GoogleCast, {
 } from "react-native-google-cast";
 import { RoundButton } from "./RoundButton";
 
+interface Props extends ViewProps {
+  width?: number;
+  height?: number;
+  background?: "blur" | "transparent";
+}
+
 export function Chromecast({
   width = 48,
   height = 48,
@@ -38,7 +44,11 @@ export function Chromecast({
   // Android requires the cast button to be present for startDiscovery to work
   const AndroidCastButton = useCallback(
     () =>
-      Platform.OS === "android" ? <CastButton tintColor='transparent' /> : null,
+      Platform.OS === "android" ? (
+        <CastButton tintColor='transparent' />
+      ) : (
+        <></>
+      ),
     [Platform.OS],
   );
 

components/ContextMenu.ts

@@ -0,0 +1 @@
+export * from "zeego/context-menu";

components/DownloadItem.tsx

@@ -9,14 +9,13 @@ import type {
   BaseItemDto,
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { type Href, router } from "expo-router";
+import { type Href, router, useFocusEffect } from "expo-router";
 import { t } from "i18next";
 import { useAtom } from "jotai";
 import type React from "react";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import { Alert, Platform, Switch, View, type ViewProps } from "react-native";
 import { toast } from "sonner-native";
-import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { queueAtom } from "@/utils/atoms/queue";
@@ -33,13 +32,6 @@ import ProgressCircle from "./ProgressCircle";
 import { RoundButton } from "./RoundButton";
 import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
 
-export type SelectedOptions = {
-  bitrate: Bitrate;
-  mediaSource: MediaSourceInfo | undefined;
-  audioIndex: number | undefined;
-  subtitleIndex: number;
-};
-
 interface DownloadProps extends ViewProps {
   items: BaseItemDto[];
   MissingDownloadIconComponent: () => React.ReactElement;
@@ -64,20 +56,20 @@ export const DownloadItems: React.FC<DownloadProps> = ({
   const [settings] = useSettings();
   const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false);
 
-  const { processes, startBackgroundDownload, getDownloadedItems } =
-    useDownload();
-  const downloadedFiles = getDownloadedItems();
+  const { processes, startBackgroundDownload, downloadedFiles } = useDownload();
 
-  const [selectedOptions, setSelectedOptions] = useState<
-    SelectedOptions | undefined
+  const [selectedMediaSource, setSelectedMediaSource] = useState<
+    MediaSourceInfo | undefined | null
   >(undefined);
-
-  const {
-    defaultAudioIndex,
-    defaultBitrate,
-    defaultMediaSource,
-    defaultSubtitleIndex,
-  } = useDefaultPlaySettings(items[0], settings);
+  const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
+  const [selectedSubtitleStream, setSelectedSubtitleStream] =
+    useState<number>(0);
+  const [maxBitrate, setMaxBitrate] = useState<Bitrate>(
+    settings?.defaultBitrate ?? {
+      key: "Max",
+      value: undefined,
+    },
+  );
 
   const userCanDownload = useMemo(
     () => user?.Policy?.EnableContentDownloading,
@@ -90,7 +82,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
     bottomSheetModalRef.current?.present();
   }, []);
 
-  const handleSheetChanges = useCallback((_index: number) => {}, []);
+  const handleSheetChanges = useCallback((_index: number) => { }, []);
 
   const closeModal = useCallback(() => {
     bottomSheetModalRef.current?.dismiss();
@@ -104,21 +96,6 @@ export const DownloadItems: React.FC<DownloadProps> = ({
     [items, downloadedFiles],
   );
 
-  // Initialize selectedOptions with default values
-  useEffect(() => {
-    setSelectedOptions(() => ({
-      bitrate: defaultBitrate,
-      mediaSource: defaultMediaSource,
-      subtitleIndex: defaultSubtitleIndex ?? -1,
-      audioIndex: defaultAudioIndex,
-    }));
-  }, [
-    defaultAudioIndex,
-    defaultBitrate,
-    defaultSubtitleIndex,
-    defaultMediaSource,
-  ]);
-
   const itemsToDownload = useMemo(() => {
     if (downloadUnwatchedOnly) {
       return itemsNotDownloaded.filter((item) => !item.UserData?.Played);
@@ -160,11 +137,11 @@ export const DownloadItems: React.FC<DownloadProps> = ({
       firstItem.Type !== "Episode"
         ? "/downloads"
         : ({
-            pathname: `/downloads/${firstItem.SeriesId}`,
-            params: {
-              episodeSeasonIndex: firstItem.ParentIndexNumber,
-            },
-          } as Href),
+          pathname: `/downloads/${firstItem.SeriesId}`,
+          params: {
+            episodeSeasonIndex: firstItem.ParentIndexNumber,
+          },
+        } as Href),
     );
   };
 
@@ -174,7 +151,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
         !api ||
         !user?.Id ||
         items.some((p) => !p.Id) ||
-        (itemsNotDownloaded.length === 1 && !selectedOptions?.mediaSource?.Id)
+        (itemsNotDownloaded.length === 1 && !selectedMediaSource?.Id)
       ) {
         throw new Error(
           "DownloadItem ~ initiateDownload: No api or user or item",
@@ -185,10 +162,10 @@ export const DownloadItems: React.FC<DownloadProps> = ({
           itemsNotDownloaded.length > 1
             ? getDefaultPlaySettings(item, settings!)
             : {
-                mediaSource: selectedOptions?.mediaSource,
-                audioIndex: selectedOptions?.audioIndex,
-                subtitleIndex: selectedOptions?.subtitleIndex,
-              };
+              mediaSource: selectedMediaSource,
+              audioIndex: selectedAudioStream,
+              subtitleIndex: selectedSubtitleStream,
+            };
 
         const downloadDetails = await getDownloadUrl({
           api,
@@ -197,7 +174,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
           mediaSource: mediaSource!,
           audioStreamIndex: audioIndex ?? -1,
           subtitleStreamIndex: subtitleIndex ?? -1,
-          maxBitrate: selectedOptions?.bitrate || defaultBitrate,
+          maxBitrate,
           deviceId: api.deviceInfo.id,
         });
 
@@ -226,21 +203,18 @@ export const DownloadItems: React.FC<DownloadProps> = ({
           );
           continue;
         }
-        await startBackgroundDownload(
-          url,
-          item,
-          mediaSource,
-          selectedOptions?.bitrate || defaultBitrate,
-        );
+        await startBackgroundDownload(url, item, mediaSource, maxBitrate);
       }
     },
     [
       api,
       user?.Id,
       itemsNotDownloaded,
-      selectedOptions,
+      selectedMediaSource,
+      selectedAudioStream,
+      selectedSubtitleStream,
       settings,
-      defaultBitrate,
+      maxBitrate,
       startBackgroundDownload,
     ],
   );
@@ -270,6 +244,18 @@ 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);
+      setSelectedAudioStream(audioIndex ?? 0);
+      setSelectedSubtitleStream(subtitleIndex ?? -1);
+      setMaxBitrate(bitrate);
+    }, [items, itemsNotDownloaded, settings]),
+  );
 
   const renderButtonContent = () => {
     if (processes.length > 0 && itemsProcesses.length > 0) {
@@ -344,12 +330,8 @@ export const DownloadItems: React.FC<DownloadProps> = ({
             <View className='flex flex-col space-y-2 w-full items-start'>
               <BitrateSelector
                 inverted
-                onChange={(val) =>
-                  setSelectedOptions(
-                    (prev) => prev && { ...prev, bitrate: val },
-                  )
-                }
-                selected={selectedOptions?.bitrate}
+                onChange={setMaxBitrate}
+                selected={maxBitrate}
               />
               {itemsNotDownloaded.length > 1 && (
                 <View className='flex flex-row items-center justify-between w-full py-2'>
@@ -361,51 +343,27 @@ export const DownloadItems: React.FC<DownloadProps> = ({
                 </View>
               )}
               {itemsNotDownloaded.length === 1 && (
-                <View>
+                <>
                   <MediaSourceSelector
                     item={items[0]}
-                    onChange={(val) =>
-                      setSelectedOptions(
-                        (prev) =>
-                          prev && {
-                            ...prev,
-                            mediaSource: val,
-                          },
-                      )
-                    }
-                    selected={selectedOptions?.mediaSource}
+                    onChange={setSelectedMediaSource}
+                    selected={selectedMediaSource}
                   />
-                  {selectedOptions?.mediaSource && (
+                  {selectedMediaSource && (
                     <View className='flex flex-col space-y-2'>
                       <AudioTrackSelector
-                        source={selectedOptions.mediaSource}
-                        onChange={(val) => {
-                          setSelectedOptions(
-                            (prev) =>
-                              prev && {
-                                ...prev,
-                                audioIndex: val,
-                              },
-                          );
-                        }}
-                        selected={selectedOptions.audioIndex}
+                        source={selectedMediaSource}
+                        onChange={setSelectedAudioStream}
+                        selected={selectedAudioStream}
                       />
                       <SubtitleTrackSelector
-                        source={selectedOptions.mediaSource}
-                        onChange={(val) => {
-                          setSelectedOptions(
-                            (prev) =>
-                              prev && {
-                                ...prev,
-                                subtitleIndex: val,
-                              },
-                          );
-                        }}
-                        selected={selectedOptions.subtitleIndex}
+                        source={selectedMediaSource}
+                        onChange={setSelectedSubtitleStream}
+                        selected={selectedSubtitleStream}
                       />
                     </View>
                   )}
-                </View>
+                </>
               )}
             </View>
 

components/ItemCardText.tsx

@@ -1,3 +1,4 @@
+import { tc } from "@/utils/textTools";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import type React from "react";
 import { View } from "react-native";

components/ItemContent.tsx

@@ -24,6 +24,7 @@ import { CurrentSeries } from "@/components/series/CurrentSeries";
 import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
 import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
 import { useImageColors } from "@/hooks/useImageColors";
+import { useItemQuery } from "@/hooks/useItemQuery";
 import { useOrientation } from "@/hooks/useOrientation";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -86,48 +87,51 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
 
     // Needs to automatically change the selected to the default values for default indexes.
     useEffect(() => {
-      setSelectedOptions(() => ({
-        bitrate: defaultBitrate,
-        mediaSource: defaultMediaSource,
-        subtitleIndex: defaultSubtitleIndex ?? -1,
-        audioIndex: defaultAudioIndex,
-      }));
+      if (item) {
+        setSelectedOptions(() => ({
+          bitrate: defaultBitrate,
+          mediaSource: defaultMediaSource,
+          subtitleIndex: defaultSubtitleIndex ?? -1,
+          audioIndex: defaultAudioIndex,
+        }));
+      }
     }, [
       defaultAudioIndex,
       defaultBitrate,
       defaultSubtitleIndex,
       defaultMediaSource,
+      item,
     ]);
 
     useEffect(() => {
-      if (!Platform.isTV) {
-        navigation.setOptions({
-          headerRight: () =>
-            item && (
-              <View className='flex flex-row items-center space-x-2'>
-                <Chromecast.Chromecast
-                  background='blur'
-                  width={22}
-                  height={22}
-                />
-                {item.Type !== "Program" && (
-                  <View className='flex flex-row items-center space-x-2'>
-                    {!Platform.isTV && (
-                      <DownloadSingleItem item={item} size='large' />
-                    )}
-                    {user?.Policy?.IsAdministrator && (
-                      <PlayInRemoteSessionButton item={item} size='large' />
-                    )}
-
-                    <PlayedStatus items={[item]} size='large' />
-                    <AddToFavorites item={item} />
-                  </View>
-                )}
-              </View>
-            ),
-        });
+      if (Platform.isTV) {
+        return;
       }
-    }, [item, navigation, user]);
+      navigation.setOptions({
+        headerRight: () =>
+          item && (
+            <View className='flex flex-row items-center space-x-2'>
+              <Chromecast.Chromecast background='blur' width={22} height={22} />
+              {item.Type !== "Program" && (
+                <View className='flex flex-row items-center space-x-2'>
+                  {!Platform.isTV && !isOffline && (
+                    <DownloadSingleItem item={item} size='large' />
+                  )}
+                  {user?.Policy?.IsAdministrator && !isOffline && (
+                    <PlayInRemoteSessionButton item={item} size='large' />
+                  )}
+                  <PlayedStatus
+                    items={[item]}
+                    size='large'
+                    isOffline={isOffline}
+                  />
+                  {!isOffline && <AddToFavorites item={item} />}
+                </View>
+              )}
+            </View>
+          ),
+      });
+    }, [item, navigation, isOffline, user]);
 
     useEffect(() => {
       if (item) {
@@ -179,14 +183,12 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                 onLoad={() => setLoadingLogo(false)}
                 onError={() => setLoadingLogo(false)}
               />
-            ) : (
-              <View />
-            )
+            ) : undefined
           }
         >
           <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-2' />
+              <ItemHeader item={item} className='mb-4' />
               {item.Type !== "Program" && !Platform.isTV && !isOffline && (
                 <View className='flex flex-row items-center justify-start w-full h-16'>
                   <BitrateSelector

components/ItemHeader.tsx

@@ -2,8 +2,8 @@ import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import type React from "react";
 import { View, type ViewProps } from "react-native";
 import { GenreTags } from "./GenreTags";
-import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
 import { Ratings } from "./Ratings";
+import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
 import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader";
 import { ItemActions } from "./series/SeriesActions";
 
@@ -33,16 +33,16 @@ export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
           <ItemActions item={item} />
         </View>
         {item.Type === "Episode" && (
-          <View>
+          <>
             <EpisodeTitleHeader item={item} />
             <GenreTags genres={item.Genres!} />
-          </View>
+          </>
         )}
         {item.Type === "Movie" && (
-          <View>
+          <>
             <MoviesTitleHeader item={item} />
             <GenreTags genres={item.Genres!} />
-          </View>
+          </>
         )}
       </View>
     </View>

components/ItemTechnicalDetails.tsx

@@ -1,9 +1,11 @@
+import { formatBitrate } from "@/utils/bitrate";
 import { Ionicons } from "@expo/vector-icons";
 import {
   BottomSheetBackdrop,
   type BottomSheetBackdropProps,
   BottomSheetModal,
   BottomSheetScrollView,
+  BottomSheetView,
 } from "@gorhom/bottom-sheet";
 import type {
   MediaSourceInfo,
@@ -13,15 +15,15 @@ import type React from "react";
 import { useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { TouchableOpacity, View } from "react-native";
-import { formatBitrate } from "@/utils/bitrate";
 import { Badge } from "./Badge";
+import { Button } from "./Button";
 import { Text } from "./common/Text";
 
 interface Props {
   source?: MediaSourceInfo;
 }
 
-export const ItemTechnicalDetails: React.FC<Props> = ({ source }) => {
+export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
   const bottomSheetModalRef = useRef<BottomSheetModal>(null);
   const { t } = useTranslation();
 
@@ -53,7 +55,7 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source }) => {
       >
         <BottomSheetScrollView>
           <View className='flex flex-col space-y-2 p-4 mb-4'>
-            <View>
+            <View className=''>
               <Text className='text-lg font-bold mb-4'>
                 {t("item_card.video")}
               </Text>
@@ -62,7 +64,7 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source }) => {
               </View>
             </View>
 
-            <View>
+            <View className=''>
               <Text className='text-lg font-bold mb-2'>
                 {t("item_card.audio")}
               </Text>
@@ -75,7 +77,7 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source }) => {
               />
             </View>
 
-            <View>
+            <View className=''>
               <Text className='text-lg font-bold mb-2'>
                 {t("item_card.subtitles")}
               </Text>
@@ -101,7 +103,7 @@ const SubtitleStreamInfo = ({
 }) => {
   return (
     <View className='flex flex-col'>
-      {subtitleStreams.map((stream, _index) => (
+      {subtitleStreams.map((stream, index) => (
         <View key={stream.Index} className='flex flex-col'>
           <Text className='text-xs mb-3 text-neutral-400'>
             {stream.DisplayTitle}
@@ -175,13 +177,15 @@ const AudioStreamInfo = ({ audioStreams }: { audioStreams: MediaStream[] }) => {
 };
 
 const VideoStreamInfo = ({ source }: { source?: MediaSourceInfo }) => {
-  const videoStream = useMemo(() => {
-    return source?.MediaStreams?.find((stream) => stream.Type === "Video") as
-      | MediaStream
-      | undefined;
-  }, [source?.MediaStreams]);
+  if (!source) return null;
 
-  if (!source || !videoStream) 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'>
@@ -219,11 +223,7 @@ const VideoStreamInfo = ({ source }: { source?: MediaSourceInfo }) => {
       <Badge
         variant='gray'
         iconLeft={<Ionicons name='play-outline' size={16} color='white' />}
-        text={
-          videoStream.AverageFrameRate != null
-            ? `${videoStream.AverageFrameRate.toFixed(0)} fps`
-            : ""
-        }
+        text={`${videoStream.AverageFrameRate?.toFixed(0)} fps`}
       />
     </View>
   );
@@ -236,7 +236,6 @@ const formatFileSize = (bytes?: number | null) => {
   if (bytes === 0) return "0 Byte";
   const i = Number.parseInt(
     Math.floor(Math.log(bytes) / Math.log(1024)).toString(),
-    10,
   );
   return `${Math.round((bytes / 1024 ** i) * 100) / 100} ${sizes[i]}`;
 };

components/JellyfinServerDiscovery.tsx

@@ -1,7 +1,7 @@
+import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery";
 import type React from "react";
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
-import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery";
+import { Text, TouchableOpacity, View } from "react-native";
 import { Button } from "./Button";
 import { ListGroup } from "./list/ListGroup";
 import { ListItem } from "./list/ListItem";

components/Loader.tsx

@@ -2,6 +2,7 @@ import {
   ActivityIndicator,
   type ActivityIndicatorProps,
   Platform,
+  View,
 } from "react-native";
 
 interface Props extends ActivityIndicatorProps {}

components/MediaSourceSelector.tsx

@@ -2,11 +2,9 @@ import type {
   BaseItemDto,
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client/models";
-import { useCallback, useMemo } from "react";
+import { useMemo } from "react";
 import { Platform, TouchableOpacity, View } from "react-native";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import { useTranslation } from "react-i18next";
 import { Text } from "./common/Text";
 
@@ -22,31 +20,37 @@ export const MediaSourceSelector: React.FC<Props> = ({
   selected,
   ...props
 }) => {
-  const isTv = Platform.isTV;
+  if (Platform.isTV) return null;
+  const selectedName = useMemo(
+    () =>
+      item.MediaSources?.find((x) => x.Id === selected?.Id)?.MediaStreams?.find(
+        (x) => x.Type === "Video",
+      )?.DisplayTitle || "",
+    [item, selected],
+  );
 
   const { t } = useTranslation();
 
-  const getDisplayName = useCallback((source: MediaSourceInfo) => {
-    const videoStream = source.MediaStreams?.find((x) => x.Type === "Video");
-    if (videoStream?.DisplayTitle) {
-      return videoStream.DisplayTitle;
+  const commonPrefix = useMemo(() => {
+    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]);
 
-    // Fallback to source name
-    if (source.Name) {
-      return source.Name;
-    }
-
-    // Last resort fallback
-    return `Source ${source.Id}`;
-  }, []);
-
-  const selectedName = useMemo(() => {
-    if (!selected) return "";
-    return getDisplayName(selected);
-  }, [selected, getDisplayName]);
-
-  if (isTv) return null;
+  const name = (name?: string | null) => {
+    return name?.replace(commonPrefix, "").toLowerCase();
+  };
 
   return (
     <View
@@ -84,7 +88,7 @@ export const MediaSourceSelector: React.FC<Props> = ({
               }}
             >
               <DropdownMenu.ItemTitle>
-                {getDisplayName(source)}
+                {`${name(source.Name)}`}
               </DropdownMenu.ItemTitle>
             </DropdownMenu.Item>
           ))}

components/MoreMoviesWithActor.tsx

@@ -1,3 +1,10 @@
+import { ItemCardText } from "@/components/ItemCardText";
+import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
+import { Text } from "@/components/common/Text";
+import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
@@ -5,13 +12,6 @@ import { useAtom } from "jotai";
 import type React from "react";
 import { useTranslation } from "react-i18next";
 import { View, type ViewProps } from "react-native";
-import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
-import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { ItemCardText } from "@/components/ItemCardText";
-import MoviePoster from "@/components/posters/MoviePoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
 
 interface Props extends ViewProps {
   actorId: string;

components/OverviewText.tsx

@@ -1,8 +1,8 @@
+import { Text } from "@/components/common/Text";
+import { tc } from "@/utils/textTools";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TouchableOpacity, View, type ViewProps } from "react-native";
-import { Text } from "@/components/common/Text";
-import { tc } from "@/utils/textTools";
 
 interface Props extends ViewProps {
   text?: string | null;

components/ParallaxPage.tsx

@@ -1,6 +1,11 @@
 import { LinearGradient } from "expo-linear-gradient";
 import type { PropsWithChildren, ReactElement } from "react";
-import { type NativeScrollEvent, View, type ViewProps } from "react-native";
+import {
+  type NativeScrollEvent,
+  NativeSyntheticEvent,
+  View,
+  type ViewProps,
+} from "react-native";
 import Animated, {
   interpolate,
   useAnimatedRef,

components/PlatformBlurView.tsx

@@ -1,7 +1,6 @@
 import { BlurView } from "expo-blur";
 import type React from "react";
 import { Platform, View, type ViewProps } from "react-native";
-
 interface Props extends ViewProps {
   blurAmount?: number;
   blurType?: "light" | "dark" | "xlight";

components/PlayButton.tv.tsx

@@ -1,9 +1,17 @@
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { useHaptic } from "@/hooks/useHaptic";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
+import { useSettings } from "@/utils/atoms/settings";
+import { runtimeTicksToMinutes } from "@/utils/time";
+import { useActionSheet } from "@expo/react-native-action-sheet";
+import { Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { useRouter } from "expo-router";
-import { useAtom } from "jotai";
+import { useAtom, useAtomValue } from "jotai";
 import { useCallback, useEffect } from "react";
-import { TouchableOpacity, View } from "react-native";
+import { useTranslation } from "react-i18next";
+import { Platform } from "react-native";
+import { Alert, TouchableOpacity, View } from "react-native";
 import Animated, {
   Easing,
   interpolate,
@@ -14,10 +22,6 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from "react-native-reanimated";
-import { useHaptic } from "@/hooks/useHaptic";
-import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
-import { useSettings } from "@/utils/atoms/settings";
-import { runtimeTicksToMinutes } from "@/utils/time";
 import type { Button } from "./Button";
 import type { SelectedOptions } from "./ItemContent";
 
@@ -34,7 +38,12 @@ export const PlayButton: React.FC<Props> = ({
   selectedOptions,
   ...props
 }: Props) => {
+  const { showActionSheetWithOptions } = useActionSheet();
+  const { t } = useTranslation();
+
   const [colorAtom] = useAtom(itemThemeColorAtom);
+  const api = useAtomValue(apiAtom);
+  const user = useAtomValue(userAtom);
 
   const router = useRouter();
 

components/PlayInRemoteSession.tsx

@@ -1,3 +1,5 @@
+import { useAllSessions, type useSessionsProps } from "@/hooks/useSessions";
+import { apiAtom } from "@/providers/JellyfinProvider";
 import { Ionicons } from "@expo/vector-icons";
 import {
   type BaseItemDto,
@@ -13,11 +15,9 @@ import {
   TouchableOpacity,
   View,
 } from "react-native";
-import { useAllSessions, type useSessionsProps } from "@/hooks/useSessions";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { Text } from "./common/Text";
 import { Loader } from "./Loader";
 import { RoundButton } from "./RoundButton";
+import { Text } from "./common/Text";
 
 interface Props extends React.ComponentProps<typeof View> {
   item: BaseItemDto;

components/PlayedStatus.tsx

@@ -10,9 +10,13 @@ interface Props extends ViewProps {
   size?: "default" | "large";
 }
 
-export const PlayedStatus: React.FC<Props> = ({ items, ...props }) => {
+export const PlayedStatus: React.FC<Props> = ({
+  items,
+  isOffline = false,
+  ...props
+}) => {
   const allPlayed = items.every((item) => item.UserData?.Played);
-  const toggle = useMarkAsPlayed(items);
+  const toggle = useMarkAsPlayed(items, isOffline);
 
   return (
     <View {...props}>

components/ProgressCircle.tsx

@@ -1,4 +1,5 @@
 import type React from "react";
+import { StyleSheet, View } from "react-native";
 import { AnimatedCircularProgress } from "react-native-circular-progress";
 
 type ProgressCircleProps = {

components/Ratings.tsx

@@ -1,9 +1,3 @@
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useQuery } from "@tanstack/react-query";
-import { Image } from "expo-image";
-import { useMemo } from "react";
-import { View, type ViewProps } from "react-native";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { MediaType } from "@/utils/jellyseerr/server/constants/media";
 import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
@@ -12,6 +6,12 @@ import type {
   TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
 import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
+import { Ionicons } from "@expo/vector-icons";
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { useQuery } from "@tanstack/react-query";
+import { Image } from "expo-image";
+import { useMemo } from "react";
+import { View, type ViewProps } from "react-native";
 import { Badge } from "./Badge";
 
 interface Props extends ViewProps {

components/RoundButton.tsx

@@ -1,3 +1,4 @@
+import { useHaptic } from "@/hooks/useHaptic";
 import { Ionicons } from "@expo/vector-icons";
 import { BlurView } from "expo-blur";
 import type { PropsWithChildren } from "react";
@@ -6,7 +7,6 @@ import {
   TouchableOpacity,
   type TouchableOpacityProps,
 } from "react-native";
-import { useHaptic } from "@/hooks/useHaptic";
 
 interface Props extends TouchableOpacityProps {
   onPress?: () => void;

components/SimilarItems.tsx

@@ -1,16 +1,23 @@
+import MoviePoster from "@/components/posters/MoviePoster";
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getLibraryApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
+import { router } from "expo-router";
 import { useAtom } from "jotai";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { View, type ViewProps } from "react-native";
-import MoviePoster from "@/components/posters/MoviePoster";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import {
+  ScrollView,
+  TouchableOpacity,
+  View,
+  type ViewProps,
+} from "react-native";
+import { ItemCardText } from "./ItemCardText";
+import { Loader } from "./Loader";
 import { HorizontalScroll } from "./common/HorrizontalScroll";
 import { Text } from "./common/Text";
 import { TouchableItemRouter } from "./common/TouchableItemRouter";
-import { ItemCardText } from "./ItemCardText";
 
 interface SimilarItemsProps extends ViewProps {
   itemId?: string | null;

components/SubtitleTrackSelector.tsx

@@ -1,10 +1,8 @@
+import { tc } from "@/utils/textTools";
 import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
 import { useMemo } from "react";
 import { Platform, TouchableOpacity, View } from "react-native";
-import { tc } from "@/utils/textTools";
-
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
 import { useTranslation } from "react-i18next";
 import { Text } from "./common/Text";
 

components/__tests__/ThemedText-test.tsx

@@ -1,3 +1,4 @@
+import * as React from "react";
 import renderer from "react-test-renderer";
 
 import { ThemedText } from "../ThemedText";

components/_template.tsx

@@ -1,5 +1,5 @@
-import { View, type ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
+import { View, type ViewProps } from "react-native";
 
 interface Props extends ViewProps {}
 

components/common/ColumnItem.tsx

@@ -1,6 +1,7 @@
-import { View, type ViewProps } from "react-native";
+import { useMemo } from "react";
+import { StyleSheet, View, type ViewProps } from "react-native";
 
-const _getItemStyle = (index: number, numColumns: number) => {
+const getItemStyle = (index: number, numColumns: number) => {
   const alignItems = (() => {
     if (numColumns < 2 || index % numColumns === 0) return "flex-start";
     if ((index + 1) % numColumns === 0) return "flex-end";

components/common/Dropdown.tsx

@@ -1,14 +1,13 @@
 const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
-
-import {
+import { Text } from "@/components/common/Text";
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import React, {
   type PropsWithChildren,
   type ReactNode,
   useEffect,
   useState,
 } from "react";
 import { Platform, TouchableOpacity, View, type ViewProps } from "react-native";
-import { Text } from "@/components/common/Text";
-import DisabledSetting from "@/components/settings/DisabledSetting";
 
 interface Props<T> {
   data: T[];
@@ -34,17 +33,14 @@ const Dropdown = <T,>({
   multiple = false,
   ...props
 }: PropsWithChildren<Props<T> & ViewProps>) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const [selected, setSelected] = useState<T[]>();
 
   useEffect(() => {
     if (selected !== undefined) {
       onSelected(...selected);
     }
-  }, [selected, onSelected]);
-
-  if (isTv) return null;
+  }, [selected]);
 
   return (
     <DisabledSetting disabled={disabled === true} showText={false} {...props}>
@@ -62,7 +58,7 @@ const Dropdown = <T,>({
               </TouchableOpacity>
             </View>
           ) : (
-            title
+            <>{title}</>
           )}
         </DropdownMenu.Trigger>
         <DropdownMenu.Content
@@ -75,7 +71,7 @@ const Dropdown = <T,>({
           sideOffset={0}
         >
           <DropdownMenu.Label>{label}</DropdownMenu.Label>
-          {data.map((item, _idx) =>
+          {data.map((item, idx) =>
             multiple ? (
               <DropdownMenu.CheckboxItem
                 value={
@@ -84,10 +80,7 @@ const Dropdown = <T,>({
                     : "off"
                 }
                 key={keyExtractor(item)}
-                onValueChange={(
-                  next: "on" | "off",
-                  _previous: "on" | "off",
-                ) => {
+                onValueChange={(next: "on" | "off", previous: "on" | "off") => {
                   setSelected((p) => {
                     const prev = p || [];
                     if (next === "on") {

components/common/HeaderBackButton.tsx

@@ -1,3 +1,4 @@
+import { Text } from "@/components/common/Text";
 import { Ionicons } from "@expo/vector-icons";
 import { BlurView, type BlurViewProps } from "expo-blur";
 import { useRouter } from "expo-router";
@@ -5,6 +6,8 @@ import {
   Platform,
   TouchableOpacity,
   type TouchableOpacityProps,
+  View,
+  ViewProps,
 } from "react-native";
 
 interface Props extends BlurViewProps {

components/common/HorrizontalScroll.tsx

@@ -1,5 +1,5 @@
 import { FlashList, type FlashListProps } from "@shopify/flash-list";
-import React, { useImperativeHandle, useRef } from "react";
+import React, { forwardRef, useImperativeHandle, useRef } from "react";
 import { View, type ViewStyle } from "react-native";
 import { Text } from "./Text";
 
@@ -19,59 +19,64 @@ interface HorizontalScrollProps<T>
   keyExtractor?: (item: T, index: number) => string;
   containerStyle?: ViewStyle;
   contentContainerStyle?: ViewStyle;
+  loadingContainerStyle?: ViewStyle;
   height?: number;
   loading?: boolean;
   extraData?: any;
   noItemsText?: string;
 }
 
-export const HorizontalScroll = <T,>(
-  props: HorizontalScrollProps<T> & {
-    ref?: React.ForwardedRef<HorizontalScrollRef>;
-  },
-) => {
-  const {
-    data = [],
-    keyExtractor,
-    renderItem,
-    containerStyle,
-    contentContainerStyle,
-    loading = false,
-    height = 164,
-    extraData,
-    noItemsText,
-    ref,
-    ...restProps
-  } = props;
+export const HorizontalScroll = forwardRef<
+  HorizontalScrollRef,
+  HorizontalScrollProps<any>
+>(
+  <T,>(
+    {
+      data = [],
+      keyExtractor,
+      renderItem,
+      containerStyle,
+      contentContainerStyle,
+      loadingContainerStyle,
+      loading = false,
+      height = 164,
+      extraData,
+      noItemsText,
+      ...props
+    }: HorizontalScrollProps<T>,
+    ref: React.ForwardedRef<HorizontalScrollRef>,
+  ) => {
+    const flashListRef = useRef<FlashList<T>>(null);
 
-  const flashListRef = useRef<FlashList<T>>(null);
+    useImperativeHandle(ref!, () => ({
+      scrollToIndex: (index: number, viewOffset: number) => {
+        flashListRef.current?.scrollToIndex({
+          index,
+          animated: true,
+          viewPosition: 0,
+          viewOffset,
+        });
+      },
+    }));
 
-  useImperativeHandle(ref!, () => ({
-    scrollToIndex: (index: number, viewOffset: number) => {
-      flashListRef.current?.scrollToIndex({
-        index,
-        animated: true,
-        viewPosition: 0,
-        viewOffset,
-      });
-    },
-  }));
+    const renderFlashListItem = ({
+      item,
+      index,
+    }: {
+      item: T;
+      index: number;
+    }) => <View className='mr-2'>{renderItem(item, index)}</View>;
 
-  const renderFlashListItem = ({ item, index }: { item: T; index: number }) => (
-    <View className='mr-2'>{renderItem(item, index)}</View>
-  );
+    if (!data || loading) {
+      return (
+        <View className='px-4 mb-2'>
+          <View className='bg-neutral-950 h-24 w-full rounded-md mb-2' />
+          <View className='bg-neutral-950 h-10 w-full rounded-md mb-1' />
+        </View>
+      );
+    }
 
-  if (!data || loading) {
     return (
-      <View className='px-4 mb-2'>
-        <View className='bg-neutral-950 h-24 w-full rounded-md mb-2' />
-        <View className='bg-neutral-950 h-10 w-full rounded-md mb-1' />
-      </View>
-    );
-  }
-
-  return (
-    <View style={[{ height }, containerStyle]}>
       <FlashList<T>
         ref={flashListRef}
         data={data}
@@ -92,8 +97,8 @@ export const HorizontalScroll = <T,>(
             </Text>
           </View>
         )}
-        {...restProps}
+        {...props}
       />
-    </View>
-  );
-};
+    );
+  },
+);

components/common/InfiniteHorrizontalScroll.tsx

@@ -1,3 +1,4 @@
+import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import type {
   BaseItemDto,
   BaseItemDtoQueryResult,
@@ -13,7 +14,6 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from "react-native-reanimated";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { Loader } from "../Loader";
 import { Text } from "./Text";
 
@@ -56,7 +56,7 @@ export function InfiniteHorizontalScroll({
     };
   });
 
-  const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
+  const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
     queryKey,
     queryFn,
     getNextPageParam: (lastPage, pages) => {

components/common/ItemImage.tsx

@@ -1,11 +1,11 @@
+import { apiAtom } from "@/providers/JellyfinProvider";
+import { getItemImage } from "@/utils/getItemImage";
 import { Ionicons } from "@expo/vector-icons";
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { Image, type ImageProps } from "expo-image";
 import { useAtom } from "jotai";
 import { type FC, useMemo } from "react";
 import { View, type ViewProps } from "react-native";
-import { apiAtom } from "@/providers/JellyfinProvider";
-import { getItemImage } from "@/utils/getItemImage";
 
 interface Props extends ImageProps {
   item: BaseItemDto;

components/common/JellyseerrItemRouter.tsx

@@ -1,13 +1,9 @@
-import { useRouter, useSegments } from "expo-router";
-import type React from "react";
-import { type PropsWithChildren, useCallback, useMemo } from "react";
-import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
-import * as ContextMenu from "zeego/context-menu";
+import * as ContextMenu from "@/components/ContextMenu";
 import { useJellyseerr } from "@/hooks/useJellyseerr";
 import { MediaType } from "@/utils/jellyseerr/server/constants/media";
 import {
-  hasPermission,
   Permission,
+  hasPermission,
 } from "@/utils/jellyseerr/server/lib/permissions";
 import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
 import type {
@@ -15,6 +11,10 @@ import type {
   TvResult,
 } from "@/utils/jellyseerr/server/models/Search";
 import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
+import { useRouter, useSegments } from "expo-router";
+import type React from "react";
+import { type PropsWithChildren, useCallback, useMemo } from "react";
+import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
 
 interface Props extends TouchableOpacityProps {
   result?: MovieResult | TvResult | MovieDetails | TvDetails;
@@ -60,67 +60,69 @@ export const TouchableJellyseerrRouter: React.FC<PropsWithChildren<Props>> = ({
 
   if (from === "(home)" || from === "(search)" || from === "(libraries)")
     return (
-      <ContextMenu.Root>
-        <ContextMenu.Trigger>
-          <TouchableOpacity
-            onPress={() => {
-              if (!result) return;
+      <>
+        <ContextMenu.Root>
+          <ContextMenu.Trigger>
+            <TouchableOpacity
+              onPress={() => {
+                if (!result) return;
 
-              // @ts-expect-error
-              router.push({
-                pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
-                params: {
-                  ...result,
-                  mediaTitle,
-                  releaseYear,
-                  canRequest,
-                  posterSrc,
-                  mediaType,
-                },
-              });
-            }}
-            {...props}
-          >
-            {children}
-          </TouchableOpacity>
-        </ContextMenu.Trigger>
-        <ContextMenu.Content
-          avoidCollisions
-          alignOffset={0}
-          collisionPadding={0}
-          loop={false}
-          key={"content"}
-        >
-          <ContextMenu.Label key='label-1'>Actions</ContextMenu.Label>
-          {canRequest && mediaType === MediaType.MOVIE && (
-            <ContextMenu.Item
-              key='item-1'
-              onSelect={() => {
-                if (autoApprove) {
-                  request();
-                }
-              }}
-              shouldDismissMenuOnSelect
-            >
-              <ContextMenu.ItemTitle key='item-1-title'>
-                Request
-              </ContextMenu.ItemTitle>
-              <ContextMenu.ItemIcon
-                ios={{
-                  name: "arrow.down.to.line",
-                  pointSize: 18,
-                  weight: "semibold",
-                  scale: "medium",
-                  hierarchicalColor: {
-                    dark: "purple",
-                    light: "purple",
+                // @ts-ignore
+                router.push({
+                  pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+                  params: {
+                    ...result,
+                    mediaTitle,
+                    releaseYear,
+                    canRequest,
+                    posterSrc,
+                    mediaType,
                   },
+                });
+              }}
+              {...props}
+            >
+              {children}
+            </TouchableOpacity>
+          </ContextMenu.Trigger>
+          <ContextMenu.Content
+            avoidCollisions
+            alignOffset={0}
+            collisionPadding={0}
+            loop={false}
+            key={"content"}
+          >
+            <ContextMenu.Label key='label-1'>Actions</ContextMenu.Label>
+            {canRequest && mediaType === MediaType.MOVIE && (
+              <ContextMenu.Item
+                key='item-1'
+                onSelect={() => {
+                  if (autoApprove) {
+                    request();
+                  }
                 }}
-                androidIconName='download'
-              />
-            </ContextMenu.Item>
-          )}
-        </ContextMenu.Content>
-      </ContextMenu.Root>
+                shouldDismissMenuOnSelect
+              >
+                <ContextMenu.ItemTitle key='item-1-title'>
+                  Request
+                </ContextMenu.ItemTitle>
+                <ContextMenu.ItemIcon
+                  ios={{
+                    name: "arrow.down.to.line",
+                    pointSize: 18,
+                    weight: "semibold",
+                    scale: "medium",
+                    hierarchicalColor: {
+                      dark: "purple",
+                      light: "purple",
+                    },
+                  }}
+                  androidIconName='download'
+                />
+              </ContextMenu.Item>
+            )}
+          </ContextMenu.Content>
+        </ContextMenu.Root>
+      </>
     );
 };