chore

.claude/settings.local.json

@@ -1,13 +1,21 @@
 {
   "permissions": {
     "allow": [
+      "Bash(rm:*)",
       "Bash(find:*)",
+      "Bash(grep:*)",
+      "Bash(for file in /Users/fredrikburmester/Documents/GitHub/streamyfin/translations/*.json)",
+      "Bash(do)",
+      "Bash(if grep -q \"live_tv\" \"$file\")",
+      "Bash(then)",
+      "Bash(echo \"Processing $file\")",
+      "Bash(fi)",
+      "Bash(done)",
+      "Bash(bun run:*)",
+      "Bash(pod install:*)",
       "Bash(bun install:*)",
-      "Bash(bunx expo prebuild:*)",
-      "Bash(bunx expo run:*)",
-      "Bash(npx expo prebuild:*)",
-      "Bash(npx expo run:*)",
-      "Bash(xcodebuild:*)"
+      "Bash(ls:*)",
+      "Bash(cat:*)"
     ],
     "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/workflows/build-android.yml

@@ -1,4 +1,4 @@
-name: 🤖 Android APK Build (Phone + TV)
+name: 🤖 Android APK Build
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,82 +12,58 @@ on:
     branches: [develop, master]
 
 jobs:
-  build-android:
+  build:
     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
+        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: ☕ Setup JDK
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: 'zulu'
+          java-version: '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 }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-develop
-            ${{ runner.os }}-bun-develop
+            ${{ runner.os }}-bun-cache-
 
-      - 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
+      - name: 📦 Install dependencies
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
-      - name: 💾 Cache Gradle global
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      - name: 💾 Cache Android dependencies
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         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
+            android/.gradle
+          key: ${{ runner.os }}-android-deps-${{ hashFiles('android/**/build.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-android-deps-
 
       - name: 🛠️ Generate project files
-        run: |
-          if [ "${{ matrix.target }}" = "tv" ]; then
-            bun run prebuild:tv
-          else
-            bun run prebuild
-          fi
+        run: bun run prebuild
 
-      - 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 }}
+      - name: 🚀 Build APK via Bun
         run: bun run build:android:local
 
       - name: 📅 Set date tag
@@ -96,7 +72,8 @@ jobs:
       - name: 📤 Upload APK artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: streamyfin-android-${{ matrix.target }}-apk-${{ env.DATE_TAG }}
+          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,88 +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 }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-develop
-            ${{ runner.os }}-bun-develop
+            ${{ runner.os }}-bun-cache-
 
-      - 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: 💾 Cache Expo CLI
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: ~/.expo
-          key: ${{ runner.os }}-expo-cli-develop
-          restore-keys: ${{ runner.os }}-expo-cli-develop
-
-      - 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
-      
-      - name: 💾 Cache CocoaPods
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: ios/Pods
-          key: ${{ runner.os }}-pods-develop-${{ hashFiles('ios/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-pods-develop
-      
-      - name: 🏗️ Setup EAS
+        run: bun run prebuild
+
+      - name: 🏗 Setup EAS
         uses: expo/expo-github-action@main
         with:
-          eas-version: 16.17.4
+          eas-version: 16.7.1
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: 🚀 Build iOS app
-        env:
-          EXPO_TV: ${{ matrix.target == 'tv' && 1 || 0 }}
-        run: eas build -p ios --local --non-interactive
+      - name: 🏗️ Build iOS app
+        run: |
+          eas build -p ios --local --non-interactive
 
       - name: 📅 Set date tag
         run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -101,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

@@ -24,20 +24,20 @@ 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
           fetch-depth: 0
 
       - name: 🏁 Initialize CodeQL
-        uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        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@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
 
       - name: 🧪 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        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@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # v6.0.1
+      - 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,7 +48,7 @@ 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
@@ -64,28 +61,6 @@ jobs:
           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-*

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,74 +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>
-  </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>
   </tr>
 </table>
-</div>
 
 And all other developers who have contributed to Streamyfin, thank you for your contributions.
 
@@ -234,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

@@ -1,13 +1,8 @@
 module.exports = ({ config }) => {
-  if (process.env.EXPO_TV !== "1") {
-    config.plugins.push([
-      "react-native-google-cast",
-      { useDefaultExpandedMediaControls: true },
-    ]);
-
-    // Add the background downloader plugin only for non-TV builds
-    config.plugins.push("./plugins/withRNBackgroundDownloader.js");
-  }
+  config.plugins.push([
+    "react-native-google-cast",
+    { useDefaultExpandedMediaControls: true },
+  ]);
   return {
     android: {
       googleServicesFile: process.env.GOOGLE_SERVICES_JSON,

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.29.13",
+    "version": "0.29.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": 57,
+      "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": [
@@ -52,7 +51,6 @@
       "googleServicesFile": "./google-services.json"
     },
     "plugins": [
-      "@react-native-tvos/config-tv",
       "expo-router",
       "expo-font",
       [
@@ -114,15 +112,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 +133,13 @@
           "color": "#9333EA"
         }
       ],
-      "./plugins/with-runtime-framework-headers.js",
-      "react-native-bottom-tabs"
+      [
+        "react-native-google-cast",
+        {
+          "useDefaultExpandedMediaControls": true
+        }
+      ],
+      "expo-background-task"
     ],
     "experiments": {
       "typedRoutes": true

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

@@ -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)/(home)/_layout.tsx

@@ -20,7 +20,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/index.tsx

@@ -6,8 +6,9 @@ import {
   BottomSheetView,
 } from "@gorhom/bottom-sheet";
 import { useNavigation, useRouter } from "expo-router";
+import { t } from "i18next";
 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";
@@ -27,42 +28,16 @@ export default function page() {
   const navigation = useNavigation();
   const { t } = useTranslation();
   const [queue, setQueue] = useAtom(queueAtom);
-  const { removeProcess, downloadedFiles, deleteFileByType, deleteAllFiles } =
-    useDownload();
+  const { removeProcess, downloadedFiles, deleteFileByType } = useDownload();
   const router = useRouter();
   const [settings] = useSettings();
   const bottomSheetModalRef = useRef<BottomSheetModal>(null);
 
-  const [showMigration, setShowMigration] = useState(false);
-
-  const insets = useSafeAreaInsets();
-
-  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 movies = useMemo(() => {
     try {
       return downloadedFiles?.filter((f) => f.item.Type === "Movie") || [];
     } catch {
-      setShowMigration(true);
+      migration_20241124();
       return [];
     }
   }, [downloadedFiles]);
@@ -79,11 +54,13 @@ export default function page() {
       });
       return Object.values(series);
     } catch {
-      setShowMigration(true);
+      migration_20241124();
       return [];
     }
   }, [downloadedFiles]);
 
+  const insets = useSafeAreaInsets();
+
   useEffect(() => {
     navigation.setOptions({
       headerRight: () => (
@@ -94,12 +71,6 @@ export default function page() {
     });
   }, [downloadedFiles]);
 
-  useEffect(() => {
-    if (showMigration) {
-      migration_20241124();
-    }
-  }, [showMigration]);
-
   const deleteMovies = () =>
     deleteFileByType("Movie")
       .then(() =>
@@ -278,3 +249,23 @@ export default function page() {
     </>
   );
 }
+
+function migration_20241124() {
+  const router = useRouter();
+  const { deleteAllFiles } = useDownload();
+  Alert.alert(
+    t("home.downloads.new_app_version_requires_re_download"),
+    t("home.downloads.new_app_version_requires_re_download_description"),
+    [
+      {
+        text: t("home.downloads.back"),
+        onPress: () => router.back(),
+      },
+      {
+        text: t("home.downloads.delete"),
+        style: "destructive",
+        onPress: async () => await deleteAllFiles(),
+      },
+    ],
+  );
+}

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

@@ -3,7 +3,7 @@ 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 { Linking, TouchableOpacity, View } from "react-native";
 import { Button } from "@/components/Button";
 import { Text } from "@/components/common/Text";
 import { storage } from "@/utils/mmkv";
@@ -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

@@ -434,6 +434,8 @@ const TranscodingStreamView = ({
   isTranscoding,
   properties,
   transcodeProperties,
+  value,
+  transcodeValue,
 }: TranscodingStreamViewProps) => {
   return (
     <View className='flex flex-col pt-2 first:pt-0'>

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

@@ -122,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,libraries,search,favorites)/jellyseerr/company/[companyId].tsx

@@ -17,7 +17,7 @@ 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;

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

@@ -221,7 +221,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 +256,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 +333,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

@@ -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),

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

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

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

@@ -1,55 +0,0 @@
-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 { 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 { data: channels } = useQuery({
-    queryKey: ["livetv", "channels"],
-    queryFn: async () => {
-      const res = await getLiveTvApi(api!).getLiveTvChannels({
-        startIndex: 0,
-        limit: 500,
-        enableFavoriteSorting: true,
-        userId: user?.Id,
-        addCurrentProgram: false,
-        enableUserData: false,
-        enableImageTypes: ["Primary"],
-      });
-      return res.data;
-    },
-  });
-
-  return (
-    <View className='flex flex-1'>
-      <FlashList
-        data={channels?.Items}
-        estimatedItemSize={76}
-        renderItem={({ item }) => (
-          <View className='flex flex-row items-center px-4 mb-2'>
-            <View className='w-22 mr-4 rounded-lg overflow-hidden'>
-              <ItemImage
-                style={{
-                  aspectRatio: "1/1",
-                  width: 60,
-                  borderRadius: 8,
-                }}
-                item={item}
-              />
-            </View>
-            <Text className='font-bold'>{item.Name}</Text>
-          </View>
-        )}
-      />
-    </View>
-  );
-}

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

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

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

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

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

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

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

@@ -20,7 +20,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 +200,7 @@ export default function IndexLayout() {
         name='[libraryId]'
         options={{
           title: "",
-          headerShown: !Platform.isTV,
+          headerShown: true,
           headerBlurEffect: "prominent",
           headerTransparent: Platform.OS === "ios",
           headerShadowVisible: false,
@@ -213,7 +213,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)/(search)/_layout.tsx

@@ -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

@@ -20,7 +20,6 @@ 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 { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { FilterButton } from "@/components/filters/FilterButton";
@@ -250,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='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='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,27 @@
 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 { useTranslation } from "react-i18next";
 import { Platform } from "react-native";
+
+const { Navigator } = createNativeBottomTabNavigator();
+
+import type { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
+import type {
+  ParamListBase,
+  TabNavigationState,
+} from "@react-navigation/native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { Colors } from "@/constants/Colors";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
 import { storage } from "@/utils/mmkv";
 
-const { Navigator } = createNativeBottomTabNavigator();
-
 export const NativeTabs = withLayoutContext<
-  NativeBottomTabNavigationOptions,
+  BottomTabNavigationOptions,
   typeof Navigator,
   TabNavigationState<ParamListBase>,
   NativeBottomTabNavigationEventMap
@@ -51,6 +52,7 @@ export default function TabLayout() {
       <SystemBars hidden={false} style='light' />
       <NativeTabs
         sidebarAdaptable={false}
+        ignoresTopSafeArea
         tabBarStyle={{
           backgroundColor: "#121212",
         }}
@@ -59,7 +61,7 @@ export default function TabLayout() {
       >
         <NativeTabs.Screen redirect name='index' />
         <NativeTabs.Screen
-          listeners={(_e) => ({
+          listeners={({ navigation }) => ({
             tabPress: (_e) => {
               eventBus.emit("scrollToTop");
             },
@@ -69,7 +71,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,7 +80,7 @@ export default function TabLayout() {
           }}
         />
         <NativeTabs.Screen
-          listeners={(_e) => ({
+          listeners={({ navigation }) => ({
             tabPress: (_e) => {
               eventBus.emit("searchTabPressed");
             },
@@ -87,7 +90,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 +104,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 +120,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 +132,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/direct-player.tsx

@@ -15,7 +15,7 @@ import { router, useGlobalSearchParams, useNavigation } from "expo-router";
 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 { Alert, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { BITRATES } from "@/components/BitrateSelector";
@@ -41,9 +41,7 @@ import { storage } from "@/utils/mmkv";
 import generateDeviceProfile from "@/utils/profiles/native";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
 
-const downloadProvider = !Platform.isTV
-  ? require("@/providers/DownloadProvider")
-  : { useDownload: () => null };
+const downloadProvider = require("@/providers/DownloadProvider");
 
 const IGNORE_SAFE_AREAS_KEY = "video_player_ignore_safe_areas";
 
@@ -70,9 +68,7 @@ export default function page() {
   const progress = useSharedValue(0);
   const isSeeking = useSharedValue(false);
   const cacheProgress = useSharedValue(0);
-  const VolumeManager = Platform.isTV
-    ? null
-    : require("react-native-volume-manager");
+  const VolumeManager = require("react-native-volume-manager");
 
   const getDownloadedItem = downloadProvider.useDownload();
 
@@ -141,7 +137,7 @@ export default function page() {
       setItemStatus({ isLoading: true, isError: false });
       try {
         let fetchedItem: BaseItemDto | null = null;
-        if (offline && !Platform.isTV) {
+        if (offline) {
           const data = await getDownloadedItem.getDownloadedItem(itemId);
           if (data) fetchedItem = data.item as BaseItemDto;
         } else {
@@ -182,7 +178,7 @@ export default function page() {
       const native = await generateDeviceProfile();
       try {
         let result: Stream | null = null;
-        if (offline && !Platform.isTV) {
+        if (offline) {
           const data = await getDownloadedItem.getDownloadedItem(itemId);
           if (!data?.mediaSource) return;
           const url = await getDownloadedFileUrl(data.item.Id!);
@@ -190,7 +186,6 @@ export default function page() {
             result = { mediaSource: data.mediaSource, sessionId: "", url };
           }
         } else {
-          if (!item) return;
           const res = await getStreamUrl({
             api,
             item,
@@ -364,8 +359,6 @@ export default function page() {
   }, [offline, getInitialPlaybackTicks]);
 
   const volumeUpCb = useCallback(async () => {
-    if (Platform.isTV) return;
-
     try {
       const { volume: currentVolume } = await VolumeManager.getVolume();
       const newVolume = Math.min(currentVolume + 0.1, 1.0);
@@ -378,8 +371,6 @@ export default function page() {
   const [previousVolume, setPreviousVolume] = useState<number | null>(null);
 
   const toggleMuteCb = useCallback(async () => {
-    if (Platform.isTV) return;
-
     try {
       const { volume: currentVolume } = await VolumeManager.getVolume();
       const currentVolumePercent = currentVolume * 100;
@@ -401,8 +392,6 @@ export default function page() {
     }
   }, [previousVolume]);
   const volumeDownCb = useCallback(async () => {
-    if (Platform.isTV) return;
-
     try {
       const { volume: currentVolume } = await VolumeManager.getVolume();
       const newVolume = Math.max(currentVolume - 0.1, 0); // Decrease by 10%
@@ -419,8 +408,6 @@ export default function page() {
   }, []);
 
   const setVolumeCb = useCallback(async (newVolume: number) => {
-    if (Platform.isTV) return;
-
     try {
       const clampedVolume = Math.max(0, Math.min(newVolume, 100));
       console.log("Setting volume to", clampedVolume);
@@ -447,14 +434,14 @@ export default function page() {
       if (state === "Playing") {
         setIsPlaying(true);
         reportPlaybackProgress();
-        if (!Platform.isTV) await activateKeepAwakeAsync();
+        await activateKeepAwakeAsync();
         return;
       }
 
       if (state === "Paused") {
         setIsPlaying(false);
         reportPlaybackProgress();
-        if (!Platform.isTV) await deactivateKeepAwake();
+        await deactivateKeepAwake();
         return;
       }
 
@@ -517,18 +504,7 @@ export default function page() {
     return () => setIsMounted(false);
   }, []);
 
-  // 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…
+  if (itemStatus.isLoading || streamStatus.isLoading) {
     return (
       <View className='w-screen h-screen flex flex-col items-center justify-center bg-black'>
         <Loader />
@@ -585,7 +561,7 @@ export default function page() {
           }}
         />
       </View>
-      {!isPipStarted && isMounted === true && item && (
+      {videoRef.current && !isPipStarted && isMounted === true && item ? (
         <Controls
           mediaSource={stream?.mediaSource}
           item={item}
@@ -601,7 +577,7 @@ export default function page() {
           setIgnoreSafeAreas={setIgnoreSafeAreas}
           ignoreSafeAreas={ignoreSafeAreas}
           isVideoLoaded={isVideoLoaded}
-          startPictureInPicture={videoRef.current?.startPictureInPicture}
+          startPictureInPicture={videoRef?.current?.startPictureInPicture}
           play={videoRef.current?.play}
           pause={videoRef.current?.pause}
           seek={videoRef.current?.seekTo}
@@ -609,12 +585,12 @@ export default function page() {
           getAudioTracks={videoRef.current?.getAudioTracks}
           getSubtitleTracks={videoRef.current?.getSubtitleTracks}
           offline={offline}
-          setSubtitleTrack={videoRef.current?.setSubtitleTrack}
-          setSubtitleURL={videoRef.current?.setSubtitleURL}
-          setAudioTrack={videoRef.current?.setAudioTrack}
+          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

@@ -36,10 +36,6 @@ const BackGroundDownloader = !Platform.isTV
 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";
 
@@ -49,7 +45,7 @@ import { router, Stack, useSegments } from "expo-router";
 import * as SplashScreen from "expo-splash-screen";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 
-const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
+import * as TaskManager from "expo-task-manager";
 
 import { getLocales } from "expo-localization";
 import { Provider as JotaiProvider } from "jotai";
@@ -91,9 +87,9 @@ SplashScreen.setOptions({
 });
 
 function useNotificationObserver() {
-  useEffect(() => {
-    if (Platform.isTV) return;
+  if (Platform.isTV) return;
 
+  useEffect(() => {
     let isMounted = true;
 
     function redirect(notification: typeof Notifications.Notification) {
@@ -130,7 +126,9 @@ if (!Platform.isTV) {
     console.log("TaskManager ~ sessions trigger");
 
     const api = store.get(apiAtom);
-    if (api === null || api === undefined) return;
+    if (api === null || api === undefined) {
+      return { value: null };
+    }
 
     const response = await getSessionApi(api).getSessions({
       activeWithinSeconds: 360,
@@ -139,7 +137,7 @@ if (!Platform.isTV) {
     const result = response.data.filter((s) => s.NowPlayingItem);
     Notifications.setBadgeCountAsync(result.length);
 
-    return BackgroundFetch.BackgroundFetchResult.NewData;
+    return { value: "success" };
   });
 
   TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
@@ -147,98 +145,91 @@ if (!Platform.isTV) {
 
     const now = Date.now();
 
-    try {
-      const settingsData = storage.getString("settings");
+    const settingsData = storage.getString("settings");
 
-      if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
+    if (!settingsData) return { value: null };
 
-      const settings: Partial<Settings> = JSON.parse(settingsData);
-      const url = settings?.optimizedVersionsServerUrl;
+    const settings: Partial<Settings> = JSON.parse(settingsData);
+    const url = settings?.optimizedVersionsServerUrl;
 
-      if (!settings?.autoDownload || !url)
-        return BackgroundFetch.BackgroundFetchResult.NoData;
+    if (!settings?.autoDownload || !url) return { value: null };
 
-      const token = getTokenFromStorage();
-      const deviceId = getOrSetDeviceId();
-      const baseDirectory = FileSystem.documentDirectory;
+    const token = getTokenFromStorage();
+    const deviceId = getOrSetDeviceId();
+    const baseDirectory = FileSystem.documentDirectory;
 
-      if (!token || !deviceId || !baseDirectory)
-        return BackgroundFetch.BackgroundFetchResult.NoData;
+    if (!token || !deviceId || !baseDirectory) return { value: null };
 
-      const jobs = await getAllJobsByDeviceId({
-        deviceId,
-        authHeader: token,
-        url,
-      });
+    const jobs = await getAllJobsByDeviceId({
+      deviceId,
+      authHeader: token,
+      url,
+    });
 
-      console.log("TaskManager ~ Active jobs: ", jobs.length);
+    console.log("TaskManager ~ Active jobs: ", jobs.length);
 
-      for (const job of jobs) {
-        if (job.status === "completed") {
-          const downloadUrl = `${url}download/${job.id}`;
-          const tasks = await BackGroundDownloader.checkForExistingDownloads();
+    for (const job of jobs) {
+      if (job.status === "completed") {
+        const downloadUrl = `${url}download/${job.id}`;
+        const tasks = await BackGroundDownloader.checkForExistingDownloads();
 
-          if (tasks.find((task: { id: string }) => task.id === job.id)) {
-            console.log("TaskManager ~ Download already in progress: ", job.id);
-            continue;
-          }
-
-          BackGroundDownloader.download({
-            id: job.id,
-            url: downloadUrl,
-            destination: `${baseDirectory}${job.item.Id}.mp4`,
-            headers: {
-              Authorization: token,
-            },
-          })
-            .begin(() => {
-              console.log("TaskManager ~ Download started: ", job.id);
-            })
-            .done(() => {
-              console.log("TaskManager ~ Download completed: ", job.id);
-              saveDownloadedItemInfo(job.item);
-              BackGroundDownloader.completeHandler(job.id);
-              cancelJobById({
-                authHeader: token,
-                id: job.id,
-                url: url,
-              });
-              Notifications.scheduleNotificationAsync({
-                content: {
-                  title: job.item.Name,
-                  body: "Download completed",
-                  data: {
-                    url: "/downloads",
-                  },
-                },
-                trigger: null,
-              });
-            })
-            .error((error: any) => {
-              console.log("TaskManager ~ Download error: ", job.id, error);
-              BackGroundDownloader.completeHandler(job.id);
-              Notifications.scheduleNotificationAsync({
-                content: {
-                  title: job.item.Name,
-                  body: "Download failed",
-                  data: {
-                    url: "/downloads",
-                  },
-                },
-                trigger: null,
-              });
-            });
+        if (tasks.find((task: { id: string }) => task.id === job.id)) {
+          console.log("TaskManager ~ Download already in progress: ", job.id);
+          continue;
         }
+
+        BackGroundDownloader.download({
+          id: job.id,
+          url: downloadUrl,
+          destination: `${baseDirectory}${job.item.Id}.mp4`,
+          headers: {
+            Authorization: token,
+          },
+        })
+          .begin(() => {
+            console.log("TaskManager ~ Download started: ", job.id);
+          })
+          .done(() => {
+            console.log("TaskManager ~ Download completed: ", job.id);
+            _saveDownloadedItemInfo(job.item);
+            BackGroundDownloader.completeHandler(job.id);
+            cancelJobById({
+              authHeader: token,
+              id: job.id,
+              url: url,
+            });
+            Notifications.scheduleNotificationAsync({
+              content: {
+                title: job.item.Name,
+                body: "Download completed",
+                data: {
+                  url: "/downloads",
+                },
+              },
+              trigger: null,
+            });
+          })
+          .error((error: any) => {
+            console.log("TaskManager ~ Download error: ", job.id, error);
+            BackGroundDownloader.completeHandler(job.id);
+            Notifications.scheduleNotificationAsync({
+              content: {
+                title: job.item.Name,
+                body: "Download failed",
+                data: {
+                  url: "/downloads",
+                },
+              },
+              trigger: null,
+            });
+          });
       }
-
-      console.log(`Auto download started: ${new Date(now).toISOString()}`);
-
-      // Be sure to return the successful result type!
-      return BackgroundFetch.BackgroundFetchResult.NewData;
-    } catch (error) {
-      console.error("Background task error:", error);
-      return BackgroundFetch.BackgroundFetchResult.Failed;
     }
+
+    console.log(`Auto download started: ${new Date(now).toISOString()}`);
+
+    // Be sure to return the successful result type!
+    return { value: "success" };
   });
 }
 
@@ -314,51 +305,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 =
@@ -376,10 +367,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;
@@ -392,10 +385,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}`,
@@ -420,50 +415,48 @@ 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);
+        }
+        return;
+      }
+
+      if (settings.followDeviceOrientation === true) {
+        ScreenOrientation.unlockAsync();
+      } else {
+        ScreenOrientation.lockAsync(
+          ScreenOrientation.OrientationLock.PORTRAIT_UP,
+        );
+      }
+    }, [
+      settings.followDeviceOrientation,
+      settings.defaultVideoOrientation,
+      segments,
+    ]);
 
   useEffect(() => {
-    if (Platform.isTV) {
-      return;
-    }
-
-    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(() => {
-    if (Platform.isTV) {
-      return;
-    }
-
-    const subscription = AppState.addEventListener("change", (nextAppState) => {
-      if (
-        appState.current.match(/inactive|background/) &&
-        nextAppState === "active"
-      ) {
-        BackGroundDownloader.checkForExistingDownloads();
-      }
-    });
+    const subscription = AppState.addEventListener(
+      "change",
+      (nextAppState) => {
+        if (
+          appState.current.match(/inactive|background/) &&
+          nextAppState === "active"
+        ) {
+          BackGroundDownloader.checkForExistingDownloads();
+        }
+      },
+    );
 
     BackGroundDownloader.checkForExistingDownloads();
 
@@ -536,7 +529,7 @@ function Layout() {
   );
 }
 
-function saveDownloadedItemInfo(item: BaseItemDto) {
+function _saveDownloadedItemInfo(item: BaseItemDto) {
   try {
     const downloadedItems = storage.getString("downloadedItems");
     const items: BaseItemDto[] = downloadedItems

app/login.tsx

@@ -291,7 +291,7 @@ const Login: React.FC = () => {
                   marginLeft: -23,
                   marginBottom: -20,
                 }}
-                source={require("@/assets/images/icon-ios-plain.png")}
+                source={require("@/assets/images/StreamyFinFinal.png")}
               />
               <Text className='text-3xl font-bold'>Streamyfin</Text>
               <Text className='text-neutral-500'>

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,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.5/schema.json",
   "files": {
     "includes": [
       "**/*",
@@ -24,9 +24,7 @@
         "noForEach": "off"
       },
       "recommended": true,
-      "correctness": {
-        "useExhaustiveDependencies": "off"
-      },
+      "correctness": { "useExhaustiveDependencies": "off" },
       "suspicious": {
         "noExplicitAny": "off",
         "noArrayIndexKey": "off"

components/AudioTrackSelector.tsx

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

components/BitrateSelector.tsx

@@ -1,6 +1,6 @@
-import { Platform, TouchableOpacity, View } from "react-native";
+import { TouchableOpacity, View } from "react-native";
 
-const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
+const DropdownMenu = require("zeego/dropdown-menu");
 
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -60,26 +60,22 @@ export const BitrateSelector: React.FC<Props> = ({
   inverted,
   ...props
 }) => {
-  const isTv = Platform.isTV;
-
   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/Chromecast.tsx

@@ -1,6 +1,6 @@
 import { Feather } from "@expo/vector-icons";
 import { useCallback, useEffect } from "react";
-import { Platform } from "react-native";
+import { Platform, 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/ItemContent.tsx

@@ -6,7 +6,7 @@ import { Image } from "expo-image";
 import { useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useMemo, useState } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AudioTrackSelector } from "@/components/AudioTrackSelector";
 import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector";
@@ -36,7 +36,7 @@ import { MediaSourceSelector } from "./MediaSourceSelector";
 import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
 import { PlayInRemoteSessionButton } from "./PlayInRemoteSession";
 
-const Chromecast = !Platform.isTV ? require("./Chromecast") : null;
+const Chromecast = require("./Chromecast");
 
 export type SelectedOptions = {
   bitrate: Bitrate;
@@ -86,34 +86,26 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
     ]);
 
     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' />
-                    )}
+      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'>
+                  <DownloadSingleItem item={item} size='large' />
+                  {user?.Policy?.IsAdministrator && (
+                    <PlayInRemoteSessionButton item={item} size='large' />
+                  )}
 
-                    <PlayedStatus items={[item]} size='large' />
-                    <AddToFavorites item={item} />
-                  </View>
-                )}
-              </View>
-            ),
-        });
-      }
-    }, [item, navigation, user]);
+                  <PlayedStatus items={[item]} size='large' />
+                  <AddToFavorites item={item} />
+                </View>
+              )}
+            </View>
+          ),
+      });
+    }, [item]);
 
     useEffect(() => {
       if (orientation !== ScreenOrientation.OrientationLock.PORTRAIT_UP)
@@ -122,16 +114,12 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
       else setHeaderHeight(350);
     }, [item.Type, orientation]);
 
-    const logoUrl = useMemo(
-      () => getLogoImageUrlById({ api, item }),
-      [api, item],
-    );
+    const logoUrl = useMemo(() => getLogoImageUrlById({ api, item }), [item]);
 
     const loading = useMemo(() => {
       return Boolean(logoUrl && loadingLogo);
     }, [loadingLogo, logoUrl]);
-
-    if (!selectedOptions) return <View />;
+    if (!selectedOptions) return null;
 
     return (
       <View
@@ -172,15 +160,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
                 onLoad={() => setLoadingLogo(false)}
                 onError={() => setLoadingLogo(false)}
               />
-            ) : (
-              <View />
-            )
+            ) : null
           }
         >
           <View className='flex flex-col bg-transparent shrink'>
             <View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'>
               <ItemHeader item={item} className='mb-4' />
-              {item.Type !== "Program" && !Platform.isTV && (
+              {item.Type !== "Program" && (
                 <View className='flex flex-row items-center justify-start w-full h-16'>
                   <BitrateSelector
                     className='mr-1'

components/ItemTechnicalDetails.tsx

@@ -21,7 +21,7 @@ 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 +53,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 +62,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 +75,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>
@@ -175,13 +175,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 +221,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>
   );

components/MediaSourceSelector.tsx

@@ -22,8 +22,7 @@ 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(
@@ -55,8 +54,6 @@ export const MediaSourceSelector: React.FC<Props> = ({
     return name?.replace(commonPrefix, "").toLowerCase();
   };
 
-  if (isTv) return null;
-
   return (
     <View
       className='flex shrink'

components/PlayButton.tv.tsx

@@ -1,217 +0,0 @@
-import { 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 { useCallback, useEffect } from "react";
-import { TouchableOpacity, View } from "react-native";
-import Animated, {
-  Easing,
-  interpolate,
-  interpolateColor,
-  useAnimatedReaction,
-  useAnimatedStyle,
-  useDerivedValue,
-  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";
-
-interface Props extends React.ComponentProps<typeof Button> {
-  item: BaseItemDto;
-  selectedOptions: SelectedOptions;
-}
-
-const ANIMATION_DURATION = 500;
-const MIN_PLAYBACK_WIDTH = 15;
-
-export const PlayButton: React.FC<Props> = ({
-  item,
-  selectedOptions,
-  ...props
-}: Props) => {
-  const [colorAtom] = useAtom(itemThemeColorAtom);
-
-  const router = useRouter();
-
-  const startWidth = useSharedValue(0);
-  const targetWidth = useSharedValue(0);
-  const endColor = useSharedValue(colorAtom);
-  const startColor = useSharedValue(colorAtom);
-  const widthProgress = useSharedValue(0);
-  const colorChangeProgress = useSharedValue(0);
-  const [settings] = useSettings();
-  const lightHapticFeedback = useHaptic("light");
-
-  const goToPlayer = useCallback(
-    (q: string) => {
-      router.push(`/player/direct-player?${q}`);
-    },
-    [router],
-  );
-
-  const onPress = () => {
-    console.log("onpress");
-    if (!item) return;
-
-    lightHapticFeedback();
-
-    const queryParams = new URLSearchParams({
-      itemId: item.Id!,
-      audioIndex: selectedOptions.audioIndex?.toString() ?? "",
-      subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
-      mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
-      bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
-    });
-
-    const queryString = queryParams.toString();
-    goToPlayer(queryString);
-    return;
-  };
-
-  const derivedTargetWidth = useDerivedValue(() => {
-    if (!item || !item.RunTimeTicks) return 0;
-    const userData = item.UserData;
-    if (userData?.PlaybackPositionTicks) {
-      return userData.PlaybackPositionTicks > 0
-        ? Math.max(
-            (userData.PlaybackPositionTicks / item.RunTimeTicks) * 100,
-            MIN_PLAYBACK_WIDTH,
-          )
-        : 0;
-    }
-    return 0;
-  }, [item]);
-
-  useAnimatedReaction(
-    () => derivedTargetWidth.value,
-    (newWidth) => {
-      targetWidth.value = newWidth;
-      widthProgress.value = 0;
-      widthProgress.value = withTiming(1, {
-        duration: ANIMATION_DURATION,
-        easing: Easing.bezier(0.7, 0, 0.3, 1.0),
-      });
-    },
-    [item],
-  );
-
-  useAnimatedReaction(
-    () => colorAtom,
-    (newColor) => {
-      endColor.value = newColor;
-      colorChangeProgress.value = 0;
-      colorChangeProgress.value = withTiming(1, {
-        duration: ANIMATION_DURATION,
-        easing: Easing.bezier(0.9, 0, 0.31, 0.99),
-      });
-    },
-    [colorAtom],
-  );
-
-  useEffect(() => {
-    const timeout_2 = setTimeout(() => {
-      startColor.value = colorAtom;
-      startWidth.value = targetWidth.value;
-    }, ANIMATION_DURATION);
-
-    return () => {
-      clearTimeout(timeout_2);
-    };
-  }, [colorAtom, item]);
-
-  /**
-   * ANIMATED STYLES
-   */
-  const animatedAverageStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.primary, endColor.value.primary],
-    ),
-  }));
-
-  const animatedPrimaryStyle = useAnimatedStyle(() => ({
-    backgroundColor: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.primary, endColor.value.primary],
-    ),
-  }));
-
-  const animatedWidthStyle = useAnimatedStyle(() => ({
-    width: `${interpolate(
-      widthProgress.value,
-      [0, 1],
-      [startWidth.value, targetWidth.value],
-    )}%`,
-  }));
-
-  const animatedTextStyle = useAnimatedStyle(() => ({
-    color: interpolateColor(
-      colorChangeProgress.value,
-      [0, 1],
-      [startColor.value.text, endColor.value.text],
-    ),
-  }));
-  /**
-   * *********************
-   */
-
-  return (
-    <TouchableOpacity
-      accessibilityLabel='Play button'
-      accessibilityHint='Tap to play the media'
-      onPress={onPress}
-      className={"relative"}
-      {...props}
-    >
-      <View className='absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden'>
-        <Animated.View
-          style={[
-            animatedPrimaryStyle,
-            animatedWidthStyle,
-            {
-              height: "100%",
-            },
-          ]}
-        />
-      </View>
-
-      <Animated.View
-        style={[animatedAverageStyle, { opacity: 0.5 }]}
-        className='absolute w-full h-full top-0 left-0 rounded-xl'
-      />
-      <View
-        style={{
-          borderWidth: 1,
-          borderColor: colorAtom.primary,
-          borderStyle: "solid",
-        }}
-        className='flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full '
-      >
-        <View className='flex flex-row items-center space-x-2'>
-          <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
-            {runtimeTicksToMinutes(item?.RunTimeTicks)}
-          </Animated.Text>
-          <Animated.Text style={animatedTextStyle}>
-            <Ionicons name='play-circle' size={24} />
-          </Animated.Text>
-          {settings?.openInVLC && (
-            <Animated.Text style={animatedTextStyle}>
-              <MaterialCommunityIcons
-                name='vlc'
-                size={18}
-                color={animatedTextStyle.color}
-              />
-            </Animated.Text>
-          )}
-        </View>
-      </View>
-    </TouchableOpacity>
-  );
-};

components/SubtitleTrackSelector.tsx

@@ -20,8 +20,7 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
   selected,
   ...props
 }) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const subtitleStreams = useMemo(() => {
     return source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
   }, [source]);
@@ -31,11 +30,10 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
     [subtitleStreams, selected],
   );
 
-  const { t } = useTranslation();
-
-  if (isTv) return null;
   if (subtitleStreams?.length === 0) return null;
 
+  const { t } = useTranslation();
+
   return (
     <View
       className='flex col shrink justify-start place-self-start items-start'

components/common/Dropdown.tsx

@@ -34,17 +34,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}>

components/common/InfiniteHorrizontalScroll.tsx

@@ -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/JellyseerrItemRouter.tsx

@@ -2,7 +2,7 @@ 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 {
@@ -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-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();
-                }
-              }}
-              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>
+      </>
     );
 };

components/common/Text.tsx

@@ -1,5 +1,10 @@
 import { Platform, Text as RNText, type TextProps } from "react-native";
-export function Text(props: TextProps) {
+import { UITextView } from "react-native-uitextview";
+export function Text(
+  props: TextProps & {
+    uiTextView?: boolean;
+  },
+) {
   const { style, ...otherProps } = props;
   if (Platform.isTV)
     return (
@@ -11,7 +16,7 @@ export function Text(props: TextProps) {
     );
 
   return (
-    <RNText
+    <UITextView
       allowFontScaling={false}
       style={[{ color: "white" }, style]}
       {...otherProps}

components/common/TouchableItemRouter.tsx

@@ -17,10 +17,6 @@ export const itemRouter = (
   item: BaseItemDto | BaseItemPerson,
   from: string,
 ) => {
-  if ("CollectionType" in item && item.CollectionType === "livetv") {
-    return `/(auth)/(tabs)/${from}/livetv`;
-  }
-
   if (item.Type === "Series") {
     return `/(auth)/(tabs)/${from}/series/${item.Id}`;
   }

components/downloads/ActiveDownloads.tsx

@@ -60,9 +60,9 @@ interface DownloadCardProps extends TouchableOpacityProps {
 }
 
 const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
-  const { startDownload } = useDownload();
+  const { processes, startDownload } = useDownload();
   const router = useRouter();
-  const { removeProcess } = useDownload();
+  const { removeProcess, setProcesses } = useDownload();
   const [settings] = useSettings();
   const queryClient = useQueryClient();
 

components/downloads/DownloadSize.tsx

@@ -39,8 +39,10 @@ export const DownloadSize: React.FC<DownloadSizeProps> = ({
   }, [size]);
 
   return (
-    <Text className='text-xs text-neutral-500' {...props}>
-      {sizeText}
-    </Text>
+    <>
+      <Text className='text-xs text-neutral-500' {...props}>
+        {sizeText}
+      </Text>
+    </>
   );
 };

components/downloads/EpisodeCard.tsx

@@ -23,7 +23,7 @@ interface EpisodeCardProps extends TouchableOpacityProps {
   item: BaseItemDto;
 }
 
-export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
+export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item, ...props }) => {
   const { deleteFile } = useDownload();
   const { openFile } = useDownloadedFileOpener();
   const { showActionSheetWithOptions } = useActionSheet();

components/filters/FilterSheet.tsx

@@ -72,6 +72,7 @@ export const FilterSheet = <T,>({
   renderItemLabel,
   showSearch = true,
   multiple = false,
+  ...props
 }: Props<T>) => {
   const bottomSheetModalRef = useRef<BottomSheetModal>(null);
   const snapPoints = useMemo(() => ["80%"], []);

components/jellyseerr/DetailFacts.tsx

@@ -50,8 +50,11 @@ const Fact: React.FC<{ title: string; fact?: string | null } & ViewProps> = ({
 const DetailFacts: React.FC<
   { details?: MovieDetails | TvDetails } & ViewProps
 > = ({ details, className, ...props }) => {
-  const { jellyseerrRegion: region, jellyseerrLocale: locale } =
-    useJellyseerr();
+  const {
+    jellyseerrUser,
+    jellyseerrRegion: region,
+    jellyseerrLocale: locale,
+  } = useJellyseerr();
   const { t } = useTranslation();
 
   const releases = useMemo(

components/jellyseerr/ParallaxSlideShow.tsx

@@ -40,6 +40,7 @@ const ParallaxSlideShow = <T,>({
   renderItem,
   keyExtractor,
   onEndReached,
+  ...props
 }: PropsWithChildren<Props<T> & ViewProps>) => {
   const insets = useSafeAreaInsets();
 

components/jellyseerr/RequestModal.tsx

@@ -38,7 +38,16 @@ const RequestModal = forwardRef<
   Props & Omit<ViewProps, "id">
 >(
   (
-    { id, title, requestBody, type, isAnime = false, onRequested, onDismiss },
+    {
+      id,
+      title,
+      requestBody,
+      type,
+      isAnime = false,
+      onRequested,
+      onDismiss,
+      ...props
+    },
     ref,
   ) => {
     const { jellyseerrApi, jellyseerrUser, requestMedia } = useJellyseerr();

components/jellyseerr/discover/Discover.tsx

@@ -14,22 +14,19 @@ import { studios } from "@/utils/jellyseerr/src/components/Discover/StudioSlider
 interface Props {
   sliders?: DiscoverSlider[];
 }
-
 const Discover: React.FC<Props> = ({ sliders }) => {
-  const hasSliders = !!sliders;
+  if (!sliders) return;
 
   const sortedSliders = useMemo(
     () =>
       sortBy(
-        (sliders ?? []).filter((s) => s.enabled),
+        sliders.filter((s) => s.enabled),
         "order",
         "asc",
       ),
     [sliders],
   );
 
-  if (!hasSliders) return null;
-
   return (
     <View className='flex flex-col space-y-4 mb-8'>
       {sortedSliders.map((slide) => {
@@ -63,8 +60,6 @@ const Discover: React.FC<Props> = ({ sliders }) => {
                 contentContainerStyle={{ paddingBottom: 16 }}
               />
             );
-          default:
-            return null;
         }
       })}
     </View>

components/jellyseerr/discover/GenreSlide.tsx

@@ -24,7 +24,7 @@ const GenreSlide: React.FC<SlideProps & ViewProps> = ({ slide, ...props }) => {
     [slide],
   );
 
-  const { data } = useQuery({
+  const { data, isFetching, isLoading } = useQuery({
     queryKey: ["jellyseerr", "discover", slide.type, slide.id],
     queryFn: async () => {
       return jellyseerrApi?.getGenreSliders(

components/jellyseerr/discover/RecentRequestsSlide.tsx

@@ -11,7 +11,11 @@ import type { NonFunctionProperties } from "@/utils/jellyseerr/server/interfaces
 const RequestCard: React.FC<{ request: MediaRequest }> = ({ request }) => {
   const { jellyseerrApi } = useJellyseerr();
 
-  const { data: details } = useQuery({
+  const {
+    data: details,
+    isLoading,
+    isError,
+  } = useQuery({
     queryKey: [
       "jellyseerr",
       "detail",
@@ -53,7 +57,11 @@ const RecentRequestsSlide: React.FC<SlideProps & ViewProps> = ({
 }) => {
   const { jellyseerrApi } = useJellyseerr();
 
-  const { data: requests } = useQuery({
+  const {
+    data: requests,
+    isLoading,
+    isError,
+  } = useQuery({
     queryKey: ["jellyseerr", "recent_requests"],
     queryFn: async () => jellyseerrApi?.requests(),
     enabled: !!jellyseerrApi,

components/jellyseerr/discover/Slide.tsx

@@ -51,7 +51,7 @@ const Slide = <T,>({
         onEndReached={onEndReached}
         //@ts-ignore
         renderItem={({ item, index }) =>
-          item ? renderItem(item, index) : null
+          item ? renderItem(item, index) : <></>
         }
       />
     </View>

components/library/LibraryItemCard.tsx

@@ -32,7 +32,6 @@ const icons: Record<CollectionType, IconName> = {
   boxsets: "albums",
   playlists: "list",
   folders: "folder",
-  livetv: "tv",
   musicvideos: "musical-notes",
   photos: "images",
   trailers: "videocam",

components/list/ListItem.tsx

@@ -82,6 +82,7 @@ const ListItemContent = ({
   showArrow,
   iconAfter,
   children,
+  ...props
 }: Props) => {
   return (
     <>

components/livetv/HourHeader.tsx

@@ -1,42 +0,0 @@
-import { View } from "react-native";
-import { Text } from "../common/Text";
-
-export const HourHeader = ({ height }: { height: number }) => {
-  const now = new Date();
-  const currentHour = now.getHours();
-  const hoursRemaining = 24 - currentHour;
-  const hours = generateHours(currentHour, hoursRemaining);
-
-  return (
-    <View
-      className='flex flex-row'
-      style={{
-        height,
-      }}
-    >
-      {hours.map((hour, index) => (
-        <HourCell key={index} hour={hour} />
-      ))}
-    </View>
-  );
-};
-
-const HourCell = ({ hour }: { hour: Date }) => (
-  <View className='w-[200px] flex items-center justify-center bg-neutral-800'>
-    <Text className='text-xs text-gray-600'>
-      {hour.toLocaleTimeString([], {
-        hour: "2-digit",
-        minute: "2-digit",
-      })}
-    </Text>
-  </View>
-);
-
-const generateHours = (startHour: number, count: number): Date[] => {
-  const now = new Date();
-  return Array.from({ length: count }, (_, i) => {
-    const hour = new Date(now);
-    hour.setHours(startHour + i, 0, 0, 0);
-    return hour;
-  });
-};

components/livetv/LiveTVGuideRow.tsx

@@ -1,96 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { useMemo, useRef } from "react";
-import { Dimensions, View } from "react-native";
-import { Text } from "../common/Text";
-import { TouchableItemRouter } from "../common/TouchableItemRouter";
-
-export const LiveTVGuideRow = ({
-  channel,
-  programs,
-  scrollX = 0,
-  isVisible = true,
-}: {
-  channel: BaseItemDto;
-  programs?: BaseItemDto[] | null;
-  scrollX?: number;
-  isVisible?: boolean;
-}) => {
-  const _positionRefs = useRef<{ [key: string]: number }>({});
-  const screenWidth = Dimensions.get("window").width;
-
-  const calculateWidth = (s?: string | null, e?: string | null) => {
-    if (!s || !e) return 0;
-    const start = new Date(s);
-    const end = new Date(e);
-    const duration = end.getTime() - start.getTime();
-    const minutes = duration / 60000;
-    const width = (minutes / 60) * 200;
-    return width;
-  };
-
-  const programsWithPositions = useMemo(() => {
-    let cumulativeWidth = 0;
-    return programs
-      ?.filter((p) => p.ChannelId === channel.Id)
-      .map((p) => {
-        const width = calculateWidth(p.StartDate, p.EndDate);
-        const position = cumulativeWidth;
-        cumulativeWidth += width;
-        return { ...p, width, position };
-      });
-  }, [programs, channel.Id]);
-
-  const isCurrentlyLive = (program: BaseItemDto) => {
-    if (!program.StartDate || !program.EndDate) return false;
-    const now = new Date();
-    const start = new Date(program.StartDate);
-    const end = new Date(program.EndDate);
-    return now >= start && now <= end;
-  };
-
-  if (!isVisible) {
-    return <View style={{ height: 64 }} />;
-  }
-
-  return (
-    <View key={channel.ChannelNumber} className='flex flex-row h-16'>
-      {programsWithPositions?.map((p) => (
-        <TouchableItemRouter item={p} key={p.Id}>
-          <View
-            style={{
-              width: p.width,
-              height: "100%",
-              position: "absolute",
-              left: p.position,
-              backgroundColor: isCurrentlyLive(p)
-                ? "rgba(255, 255, 255, 0.1)"
-                : "transparent",
-            }}
-            className='flex flex-col items-center justify-center border border-neutral-800 overflow-hidden'
-          >
-            {(() => {
-              return (
-                <View
-                  style={{
-                    marginLeft:
-                      p.width > screenWidth && scrollX > p.position
-                        ? scrollX - p.position
-                        : 0,
-                  }}
-                  className='px-4 self-start'
-                >
-                  <Text
-                    numberOfLines={2}
-                    className='text-xs text-start self-start'
-                  >
-                    {p.Name}
-                  </Text>
-                </View>
-              );
-            })()}
-          </View>
-        </TouchableItemRouter>
-      ))}
-    </View>
-  );
-};

components/movies/MoviesTitleHeader.tsx

@@ -9,7 +9,7 @@ interface Props extends ViewProps {
 export const MoviesTitleHeader: React.FC<Props> = ({ item, ...props }) => {
   return (
     <View {...props}>
-      <Text selectable className='font-bold text-2xl mb-1'>
+      <Text uiTextView selectable className='font-bold text-2xl mb-1'>
         {item?.Name}
       </Text>
       <Text className='opacity-50'>{item?.ProductionYear}</Text>

components/posters/JellyseerrPoster.tsx

@@ -38,6 +38,7 @@ const JellyseerrPoster: React.FC<Props> = ({
   horizontal,
   showDownloadInfo,
   mediaRequest,
+  ...props
 }) => {
   const { jellyseerrApi, getTitle, getYear, getMediaType } = useJellyseerr();
   const loadingOpacity = useSharedValue(1);

components/search/SearchItemWrapper.tsx

@@ -40,7 +40,7 @@ export const SearchItemWrapper = <T,>({
         onEndReachedThreshold={1}
         onEndReached={onEndReached}
         //@ts-ignore
-        renderItem={({ item }) => (item ? renderItem(item) : null)}
+        renderItem={({ item, index }) => (item ? renderItem(item) : <></>)}
       />
     </>
   );

components/series/EpisodeTitleHeader.tsx

@@ -12,7 +12,7 @@ export const EpisodeTitleHeader: React.FC<Props> = ({ item, ...props }) => {
 
   return (
     <View {...props}>
-      <Text className='font-bold text-2xl' selectable>
+      <Text uiTextView className='font-bold text-2xl' selectable>
         {item?.Name}
       </Text>
       <View className='flex flex-row items-center mb-1'>

components/series/JellyseerrSeasons.tsx

@@ -57,7 +57,7 @@ const JellyseerrSeasonEpisodes: React.FC<{
   );
 };
 
-const RenderItem = ({ item }: any) => {
+const RenderItem = ({ item, index }: any) => {
   const {
     jellyseerrApi,
     jellyseerrRegion: region,
@@ -69,11 +69,12 @@ const RenderItem = ({ item }: any) => {
     const airDate = item.airDate;
     if (airDate) {
       const airDateObj = new Date(airDate);
+
       if (new Date() < airDateObj) {
         return airDateObj.toLocaleDateString(`${locale}-${region}`, dateOpts);
       }
     }
-  }, [item, locale, region]);
+  }, [item]);
 
   return (
     <View className='flex flex-col w-44 mt-2'>
@@ -125,6 +126,7 @@ const RenderItem = ({ item }: any) => {
           {`S${item.seasonNumber}:E${item.episodeNumber}`}
         </Text>
       </View>
+
       <Text numberOfLines={3} className='text-xs text-neutral-500 shrink'>
         {item.overview}
       </Text>
@@ -149,35 +151,40 @@ const JellyseerrSeasons: React.FC<{
   hasAdvancedRequest,
   onAdvancedRequest,
 }) => {
+  if (!details) return null;
+
   const { jellyseerrApi, requestMedia } = useJellyseerr();
-  const [seasonStates, setSeasonStates] = useState<{ [key: number]: boolean }>(
-    {},
-  );
+  const [seasonStates, setSeasonStates] = useState<{
+    [key: number]: boolean;
+  }>();
   const seasons = useMemo(() => {
-    if (!details) return [];
-    const mediaInfoSeasons = details.mediaInfo?.seasons?.filter(
+    const mediaInfoSeasons = details?.mediaInfo?.seasons?.filter(
       (s: Season) => s.seasonNumber !== 0,
     );
-    const requestedSeasons =
-      details.mediaInfo?.requests?.flatMap((r: MediaRequest) => r.seasons) ??
-      [];
-    return (
-      details.seasons?.map((season) => ({
+    const requestedSeasons = details?.mediaInfo?.requests?.flatMap(
+      (r: MediaRequest) => r.seasons,
+    );
+    return details.seasons?.map((season) => {
+      return {
         ...season,
         status:
+          // What our library status is
           mediaInfoSeasons?.find(
             (mediaSeason: Season) =>
               mediaSeason.seasonNumber === season.seasonNumber,
           )?.status ??
+          // What our request status is
           requestedSeasons?.find(
             (s: Season) => s.seasonNumber === season.seasonNumber,
           )?.status ??
+          // Otherwise set it as unknown
           MediaStatus.UNKNOWN,
-      })) ?? []
-    );
+      };
+    });
   }, [details]);
+
   const allSeasonsAvailable = useMemo(
-    () => seasons.every((season) => season.status === MediaStatus.AVAILABLE),
+    () => seasons?.every((season) => season.status === MediaStatus.AVAILABLE),
     [seasons],
   );
 
@@ -193,20 +200,14 @@ const JellyseerrSeasons: React.FC<{
           )
           .map((s) => s.seasonNumber),
       };
+
       if (hasAdvancedRequest) {
         return onAdvancedRequest?.(body);
       }
+
       requestMedia(details.name, body, refetch);
     }
-  }, [
-    jellyseerrApi,
-    seasons,
-    details,
-    hasAdvancedRequest,
-    onAdvancedRequest,
-    requestMedia,
-    refetch,
-  ]);
+  }, [jellyseerrApi, seasons, details, hasAdvancedRequest, onAdvancedRequest]);
 
   const promptRequestAll = useCallback(
     () =>
@@ -229,24 +230,24 @@ const JellyseerrSeasons: React.FC<{
 
   const requestSeason = useCallback(
     async (canRequest: boolean, seasonNumber: number) => {
-      if (canRequest && details) {
+      if (canRequest) {
         const body: MediaRequestBody = {
           mediaId: details.id,
           mediaType: MediaType.TV,
           tvdbId: details.externalIds?.tvdbId,
           seasons: [seasonNumber],
         };
+
         if (hasAdvancedRequest) {
           return onAdvancedRequest?.(body);
         }
+
         requestMedia(`${details.name}, Season ${seasonNumber}`, body, refetch);
       }
     },
-    [requestMedia, hasAdvancedRequest, onAdvancedRequest, refetch, details],
+    [requestMedia, hasAdvancedRequest, onAdvancedRequest],
   );
 
-  if (!details) return null;
-
   if (isLoading)
     return (
       <View>
@@ -267,7 +268,7 @@ const JellyseerrSeasons: React.FC<{
   return (
     <FlashList
       data={orderBy(
-        seasons.filter((s) => s.seasonNumber !== 0),
+        details.seasons.filter((s) => s.seasonNumber !== 0),
         "seasonNumber",
         "desc",
       )}
@@ -312,7 +313,9 @@ const JellyseerrSeasons: React.FC<{
                 ]}
               />
               {[0].map(() => {
-                const canRequest = season.status === MediaStatus.UNKNOWN;
+                const canRequest =
+                  seasons?.find((s) => s.seasonNumber === season.seasonNumber)
+                    ?.status === MediaStatus.UNKNOWN;
                 return (
                   <JellyseerrStatusIcon
                     key={0}
@@ -320,7 +323,11 @@ const JellyseerrSeasons: React.FC<{
                       requestSeason(canRequest, season.seasonNumber)
                     }
                     className={canRequest ? "bg-gray-700/40" : undefined}
-                    mediaStatus={season.status}
+                    mediaStatus={
+                      seasons?.find(
+                        (s) => s.seasonNumber === season.seasonNumber,
+                      )?.status
+                    }
                     showRequestIcon={canRequest}
                   />
                 );

components/series/SeasonDropdown.tsx

@@ -32,7 +32,7 @@ export const SeasonDropdown: React.FC<Props> = ({
   state,
   onSelect,
 }) => {
-  const isTv = Platform.isTV;
+  if (Platform.isTV) return null;
 
   const keys = useMemo<SeasonKeys>(
     () =>
@@ -52,11 +52,10 @@ export const SeasonDropdown: React.FC<Props> = ({
 
   const seasonIndex = useMemo(
     () => state[(item[keys.id] as string) ?? ""],
-    [state, item, keys],
+    [state],
   );
 
   useEffect(() => {
-    if (isTv) return;
     if (seasons && seasons.length > 0 && seasonIndex === undefined) {
       let initialIndex: number | undefined;
 
@@ -82,26 +81,16 @@ export const SeasonDropdown: React.FC<Props> = ({
         const initialSeason = seasons.find(
           (season: any) => season[keys.index] === initialIndex,
         );
+
         if (initialSeason) onSelect(initialSeason!);
         else throw Error("Initial index could not be found!");
       }
     }
-  }, [
-    isTv,
-    seasons,
-    seasonIndex,
-    item,
-    item[keys.id],
-    initialSeasonIndex,
-    keys,
-    onSelect,
-  ]);
+  }, [seasons, seasonIndex, item[keys.id], initialSeasonIndex]);
 
   const sortByIndex = (a: BaseItemDto, b: BaseItemDto) =>
     Number(a[keys.index]) - Number(b[keys.index]);
 
-  if (isTv) return null;
-
   return (
     <DropdownMenu.Root>
       <DropdownMenu.Trigger>

components/series/SeasonPicker.tsx

@@ -27,7 +27,7 @@ type Props = {
 
 export const seasonIndexAtom = atom<SeasonIndexState>({});
 
-export const SeasonPicker: React.FC<Props> = ({ item }) => {
+export const SeasonPicker: React.FC<Props> = ({ item, initialSeasonIndex }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
   const [seasonIndexState, setSeasonIndexState] = useAtom(seasonIndexAtom);

components/settings/AppLanguageSelector.tsx

@@ -10,12 +10,11 @@ import { ListItem } from "../list/ListItem";
 
 interface Props extends ViewProps {}
 
-export const AppLanguageSelector: React.FC<Props> = () => {
-  const isTv = Platform.isTV;
+export const AppLanguageSelector: React.FC<Props> = ({ ...props }) => {
+  if (Platform.isTV) return null;
   const [settings, updateSettings] = useSettings();
   const { t } = useTranslation();
 
-  if (isTv) return null;
   if (!settings) return null;
 
   return (

components/settings/AudioToggles.tsx

@@ -14,15 +14,13 @@ import { useMedia } from "./MediaContext";
 interface Props extends ViewProps {}
 
 export const AudioToggles: React.FC<Props> = ({ ...props }) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const media = useMedia();
   const [_, __, pluginSettings] = useSettings();
   const { settings, updateSettings } = media;
   const cultures = media.cultures;
   const { t } = useTranslation();
 
-  if (isTv) return null;
   if (!settings) return null;
 
   return (

components/settings/Dashboard.tsx

@@ -8,7 +8,7 @@ import { ListItem } from "../list/ListItem";
 
 export const Dashboard = () => {
   const [settings, _updateSettings] = useSettings();
-  const { sessions = [] } = useSessions({} as useSessionsProps);
+  const { sessions = [], isLoading } = useSessions({} as useSessionsProps);
   const router = useRouter();
 
   const { t } = useTranslation();

components/settings/DownloadSettings.tv.tsx

@@ -1,3 +0,0 @@
-export default function DownloadSettings() {
-  return null;
-}

components/settings/HomeIndex.tsx

@@ -19,7 +19,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
   ActivityIndicator,
-  Platform,
   RefreshControl,
   ScrollView,
   TouchableOpacity,
@@ -83,12 +82,6 @@ export const HomeIndex = () => {
 
   const { downloadedFiles, cleanCacheDirectory } = useDownload();
   useEffect(() => {
-    if (Platform.isTV) {
-      navigation.setOptions({
-        headerLeft: () => null,
-      });
-      return;
-    }
     const hasDownloads = downloadedFiles && downloadedFiles.length > 0;
     navigation.setOptions({
       headerLeft: () => (
@@ -227,164 +220,166 @@ export const HomeIndex = () => {
     [api, user?.Id],
   );
 
-  // Always call useMemo() at the top-level, using computed dependencies for both "default"/custom sections
-  const defaultSections = useMemo(() => {
-    if (!api || !user?.Id) return [];
+  let sections: Section[] = [];
+  if (!settings?.home || !settings?.home?.sections) {
+    sections = useMemo(() => {
+      if (!api || !user?.Id) return [];
 
-    const latestMediaViews = collections.map((c) => {
-      const includeItemTypes: BaseItemKind[] =
-        c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
-      const title = t("home.recently_added_in", { libraryName: c.Name });
-      const queryKey = [
-        "home",
-        `recentlyAddedIn${c.CollectionType}`,
-        user?.Id!,
-        c.Id!,
-      ];
-      return createCollectionConfig(
-        title || "",
-        queryKey,
-        includeItemTypes,
-        c.Id,
-      );
-    });
-
-    const ss: Section[] = [
-      {
-        title: t("home.continue_watching"),
-        queryKey: ["home", "resumeItems"],
-        queryFn: async () =>
-          (
-            await getItemsApi(api).getResumeItems({
-              userId: user.Id,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              includeItemTypes: ["Movie", "Series", "Episode"],
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-      {
-        title: t("home.next_up"),
-        queryKey: ["home", "nextUp-all"],
-        queryFn: async () =>
-          (
-            await getTvShowsApi(api).getNextUp({
-              userId: user?.Id,
-              fields: ["MediaSourceCount"],
-              limit: 20,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              enableResumable: false,
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-      ...latestMediaViews,
-      // ...(mediaListCollections?.map(
-      //   (ml) =>
-      //     ({
-      //       title: ml.Name,
-      //       queryKey: ["home", "mediaList", ml.Id!],
-      //       queryFn: async () => ml,
-      //       type: "MediaListSection",
-      //       orientation: "vertical",
-      //     } as Section)
-      // ) || []),
-      {
-        title: t("home.suggested_movies"),
-        queryKey: ["home", "suggestedMovies", user?.Id],
-        queryFn: async () =>
-          (
-            await getSuggestionsApi(api).getSuggestions({
-              userId: user?.Id,
-              limit: 10,
-              mediaType: ["Video"],
-              type: ["Movie"],
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "vertical",
-      },
-      {
-        title: t("home.suggested_episodes"),
-        queryKey: ["home", "suggestedEpisodes", user?.Id],
-        queryFn: async () => {
-          try {
-            const suggestions = await getSuggestions(api, user.Id);
-            const nextUpPromises = suggestions.map((series) =>
-              getNextUp(api, user.Id, series.Id),
-            );
-            const nextUpResults = await Promise.all(nextUpPromises);
-
-            return nextUpResults.filter((item) => item !== null) || [];
-          } catch (error) {
-            console.error("Error fetching data:", error);
-            return [];
-          }
-        },
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-    ];
-    return ss;
-  }, [api, user?.Id, collections, t, createCollectionConfig]);
-
-  const customSections = useMemo(() => {
-    if (!api || !user?.Id || !settings?.home?.sections) return [];
-    const ss: Section[] = [];
-    for (const key in settings.home?.sections) {
-      // @ts-expect-error
-      const section = settings.home?.sections[key];
-      const id = section.title || key;
-      ss.push({
-        title: id,
-        queryKey: ["home", id],
-        queryFn: async () => {
-          if (section.items) {
-            const response = await getItemsApi(api).getItems({
-              userId: user?.Id,
-              limit: section.items?.limit || 25,
-              recursive: true,
-              includeItemTypes: section.items?.includeItemTypes,
-              sortBy: section.items?.sortBy,
-              sortOrder: section.items?.sortOrder,
-              filters: section.items?.filters,
-              parentId: section.items?.parentId,
-            });
-            return response.data.Items || [];
-          }
-          if (section.nextUp) {
-            const response = await getTvShowsApi(api).getNextUp({
-              userId: user?.Id,
-              fields: ["MediaSourceCount"],
-              limit: section.items?.limit || 25,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              enableResumable: section.items?.enableResumable,
-              enableRewatching: section.items?.enableRewatching,
-            });
-            return response.data.Items || [];
-          }
-          if (section.latest) {
-            const response = await getUserLibraryApi(api).getLatestMedia({
-              userId: user?.Id,
-              includeItemTypes: section.latest?.includeItemTypes,
-              limit: section.latest?.limit || 25,
-              isPlayed: section.latest?.isPlayed,
-              groupItems: section.latest?.groupItems,
-            });
-            return response.data || [];
-          }
-          return [];
-        },
-        type: "ScrollingCollectionList",
-        orientation: section?.orientation || "vertical",
+      const latestMediaViews = collections.map((c) => {
+        const includeItemTypes: BaseItemKind[] =
+          c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
+        const title = t("home.recently_added_in", { libraryName: c.Name });
+        const queryKey = [
+          "home",
+          `recentlyAddedIn${c.CollectionType}`,
+          user?.Id!,
+          c.Id!,
+        ];
+        return createCollectionConfig(
+          title || "",
+          queryKey,
+          includeItemTypes,
+          c.Id,
+        );
       });
-    }
-    return ss;
-  }, [api, user?.Id, settings?.home?.sections]);
 
-  const sections = settings?.home?.sections ? customSections : defaultSections;
+      const ss: Section[] = [
+        {
+          title: t("home.continue_watching"),
+          queryKey: ["home", "resumeItems"],
+          queryFn: async () =>
+            (
+              await getItemsApi(api).getResumeItems({
+                userId: user.Id,
+                enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+                includeItemTypes: ["Movie", "Series", "Episode"],
+              })
+            ).data.Items || [],
+          type: "ScrollingCollectionList",
+          orientation: "horizontal",
+        },
+        {
+          title: t("home.next_up"),
+          queryKey: ["home", "nextUp-all"],
+          queryFn: async () =>
+            (
+              await getTvShowsApi(api).getNextUp({
+                userId: user?.Id,
+                fields: ["MediaSourceCount"],
+                limit: 20,
+                enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+                enableResumable: false,
+              })
+            ).data.Items || [],
+          type: "ScrollingCollectionList",
+          orientation: "horizontal",
+        },
+        ...latestMediaViews,
+        // ...(mediaListCollections?.map(
+        //   (ml) =>
+        //     ({
+        //       title: ml.Name,
+        //       queryKey: ["home", "mediaList", ml.Id!],
+        //       queryFn: async () => ml,
+        //       type: "MediaListSection",
+        //       orientation: "vertical",
+        //     } as Section)
+        // ) || []),
+        {
+          title: t("home.suggested_movies"),
+          queryKey: ["home", "suggestedMovies", user?.Id],
+          queryFn: async () =>
+            (
+              await getSuggestionsApi(api).getSuggestions({
+                userId: user?.Id,
+                limit: 10,
+                mediaType: ["Video"],
+                type: ["Movie"],
+              })
+            ).data.Items || [],
+          type: "ScrollingCollectionList",
+          orientation: "vertical",
+        },
+        {
+          title: t("home.suggested_episodes"),
+          queryKey: ["home", "suggestedEpisodes", user?.Id],
+          queryFn: async () => {
+            try {
+              const suggestions = await getSuggestions(api, user.Id);
+              const nextUpPromises = suggestions.map((series) =>
+                getNextUp(api, user.Id, series.Id),
+              );
+              const nextUpResults = await Promise.all(nextUpPromises);
+
+              return nextUpResults.filter((item) => item !== null) || [];
+            } catch (error) {
+              console.error("Error fetching data:", error);
+              return [];
+            }
+          },
+          type: "ScrollingCollectionList",
+          orientation: "horizontal",
+        },
+      ];
+      return ss;
+    }, [api, user?.Id, collections]);
+  } else {
+    sections = useMemo(() => {
+      if (!api || !user?.Id) return [];
+      const ss: Section[] = [];
+
+      for (const key in settings.home?.sections) {
+        // @ts-expect-error
+        const section = settings.home?.sections[key];
+        const id = section.title || key;
+        ss.push({
+          title: id,
+          queryKey: ["home", id],
+          queryFn: async () => {
+            if (section.items) {
+              const response = await getItemsApi(api).getItems({
+                userId: user?.Id,
+                limit: section.items?.limit || 25,
+                recursive: true,
+                includeItemTypes: section.items?.includeItemTypes,
+                sortBy: section.items?.sortBy,
+                sortOrder: section.items?.sortOrder,
+                filters: section.items?.filters,
+                parentId: section.items?.parentId,
+              });
+              return response.data.Items || [];
+            }
+            if (section.nextUp) {
+              const response = await getTvShowsApi(api).getNextUp({
+                userId: user?.Id,
+                fields: ["MediaSourceCount"],
+                limit: section.items?.limit || 25,
+                enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+                enableResumable: section.items?.enableResumable,
+                enableRewatching: section.items?.enableRewatching,
+              });
+              return response.data.Items || [];
+            }
+
+            if (section.latest) {
+              const response = await getUserLibraryApi(api).getLatestMedia({
+                userId: user?.Id,
+                includeItemTypes: section.latest?.includeItemTypes,
+                limit: section.latest?.limit || 25,
+                isPlayed: section.latest?.isPlayed,
+                groupItems: section.latest?.groupItems,
+              });
+              return response.data || [];
+            }
+            return [];
+          },
+          type: "ScrollingCollectionList",
+          orientation: section?.orientation || "vertical",
+        });
+      }
+      return ss;
+    }, [api, user?.Id, settings.home?.sections]);
+  }
 
   if (isConnected === false) {
     return (

components/settings/Jellyseerr.tsx

@@ -14,8 +14,12 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const JellyseerrSettings = () => {
-  const { jellyseerrUser, setJellyseerrUser, clearAllJellyseerData } =
-    useJellyseerr();
+  const {
+    jellyseerrApi,
+    jellyseerrUser,
+    setJellyseerrUser,
+    clearAllJellyseerData,
+  } = useJellyseerr();
 
   const { t } = useTranslation();
 

components/settings/MediaToggles.tsx

@@ -15,6 +15,8 @@ export const MediaToggles: React.FC<Props> = ({ ...props }) => {
 
   const [settings, updateSettings, pluginSettings] = useSettings();
 
+  if (!settings) return null;
+
   const disabled = useMemo(
     () =>
       pluginSettings?.forwardSkipTime?.locked === true &&
@@ -22,8 +24,6 @@ export const MediaToggles: React.FC<Props> = ({ ...props }) => {
     [pluginSettings],
   );
 
-  if (!settings) return null;
-
   return (
     <DisabledSetting disabled={disabled} {...props}>
       <ListGroup title={t("home.settings.media_controls.media_controls_title")}>

components/settings/OtherSettings.tsx

@@ -4,7 +4,7 @@ import { TFunction } from "i18next";
 import type React from "react";
 import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Linking, Platform, Switch, TouchableOpacity } from "react-native";
+import { Linking, Switch, TouchableOpacity } from "react-native";
 import { toast } from "sonner-native";
 import { BITRATES } from "@/components/BitrateSelector";
 import Dropdown from "@/components/common/Dropdown";
@@ -20,10 +20,7 @@ import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
-const BackgroundFetch = !Platform.isTV
-  ? require("expo-background-fetch")
-  : null;
-const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
+import * as TaskManager from "expo-task-manager";
 
 export const OtherSettings: React.FC = () => {
   const router = useRouter();
@@ -35,9 +32,8 @@ export const OtherSettings: React.FC = () => {
    * Background task
    *******************/
   const checkStatusAsync = async () => {
-    if (Platform.isTV) return;
-
-    await BackgroundFetch.getStatusAsync();
+    // expo-background-task doesn't have a direct status check
+    // Just check if the task is registered
     return await TaskManager.isTaskRegisteredAsync(BACKGROUND_FETCH_TASK);
   };
 

components/settings/StorageSettings.tsx

@@ -16,7 +16,7 @@ export const StorageSettings = () => {
   const successHapticFeedback = useHaptic("success");
   const errorHapticFeedback = useHaptic("error");
 
-  const { data: size } = useQuery({
+  const { data: size, isLoading: appSizeLoading } = useQuery({
     queryKey: ["appSize", appSizeUsage],
     queryFn: async () => {
       const app = await appSizeUsage;

components/settings/SubtitleToggles.tsx

@@ -17,15 +17,13 @@ import { useMedia } from "./MediaContext";
 interface Props extends ViewProps {}
 
 export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
-  const isTv = Platform.isTV;
-
+  if (Platform.isTV) return null;
   const media = useMedia();
   const [_, __, pluginSettings] = useSettings();
   const { settings, updateSettings } = media;
   const cultures = media.cultures;
   const { t } = useTranslation();
 
-  if (isTv) return null;
   if (!settings) return null;
 
   const subtitleModes = [

components/video-player/controls/AudioSlider.tsx

@@ -1,22 +1,19 @@
-import { Ionicons } from "@expo/vector-icons";
 import type React from "react";
 import { useEffect, useRef } from "react";
-import { Platform, StyleSheet, View } from "react-native";
+import { StyleSheet, View } from "react-native";
 import { Slider } from "react-native-awesome-slider";
 import { useSharedValue } from "react-native-reanimated";
-import type { VolumeResult } from "react-native-volume-manager";
 
-const VolumeManager = Platform.isTV
-  ? null
-  : require("react-native-volume-manager");
+const VolumeManager = require("react-native-volume-manager");
+
+import { Ionicons } from "@expo/vector-icons";
+import type { VolumeResult } from "react-native-volume-manager";
 
 interface AudioSliderProps {
   setVisibility: (show: boolean) => void;
 }
 
 const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
-  const isTv = Platform.isTV;
-
   const volume = useSharedValue<number>(50); // Explicitly type as number
   const min = useSharedValue<number>(0); // Explicitly type as number
   const max = useSharedValue<number>(100); // Explicitly type as number
@@ -24,7 +21,6 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
   const timeoutRef = useRef<number | null>(null); // Use a ref to store the timeout ID
 
   useEffect(() => {
-    if (isTv) return;
     const fetchInitialVolume = async () => {
       try {
         const { volume: initialVolume } = await VolumeManager.getVolume();
@@ -42,19 +38,18 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
       // Re-enable the native volume UI when the component unmounts
       VolumeManager.showNativeVolumeUI({ enabled: true });
     };
-  }, [isTv, volume]);
+  }, []);
 
   const handleValueChange = async (value: number) => {
     volume.value = value;
-    // await VolumeManager.setVolume(value / 100);
+    await VolumeManager.setVolume(value / 100);
 
     // Re-call showNativeVolumeUI to ensure the setting is applied on iOS
     VolumeManager.showNativeVolumeUI({ enabled: false });
   };
 
   useEffect(() => {
-    if (isTv) return;
-    const _volumeListener = VolumeManager.addVolumeListener(
+    const volumeListener = VolumeManager.addVolumeListener(
       (result: VolumeResult) => {
         volume.value = result.volume * 100;
         setVisibility(true);
@@ -72,14 +67,12 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
     );
 
     return () => {
-      // volumeListener.remove();
+      volumeListener.remove();
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
     };
-  }, [isTv, volume, setVisibility]);
-
-  if (isTv) return;
+  }, [volume]);
 
   return (
     <View style={styles.sliderContainer}>

components/video-player/controls/BrightnessSlider.tsx

@@ -9,28 +9,25 @@ const Brightness = !Platform.isTV ? require("expo-brightness") : null;
 import { Ionicons } from "@expo/vector-icons";
 
 const BrightnessSlider = () => {
-  const isTv = Platform.isTV;
+  if (Platform.isTV) return;
 
   const brightness = useSharedValue(50);
   const min = useSharedValue(0);
   const max = useSharedValue(100);
 
   useEffect(() => {
-    if (isTv) return;
     const fetchInitialBrightness = async () => {
       const initialBrightness = await Brightness.getBrightnessAsync();
       brightness.value = initialBrightness * 100;
     };
     fetchInitialBrightness();
-  }, [brightness, isTv]);
+  }, []);
 
   const handleValueChange = async (value: number) => {
     brightness.value = value;
     await Brightness.setBrightnessAsync(value / 100);
   };
 
-  if (isTv) return;
-
   return (
     <View style={styles.sliderContainer}>
       <Slider

components/video-player/controls/Controls.tsx

@@ -17,13 +17,7 @@ import {
   useRef,
   useState,
 } from "react";
-import {
-  Platform,
-  TouchableOpacity,
-  useTVEventHandler,
-  useWindowDimensions,
-  View,
-} from "react-native";
+import { TouchableOpacity, useWindowDimensions, View } from "react-native";
 import { Slider } from "react-native-awesome-slider";
 import {
   runOnJS,
@@ -157,134 +151,6 @@ export const Controls: FC<Props> = ({
     prefetchAllTrickplayImages();
   }, []);
 
-  const remoteScrubProgress = useSharedValue<number | null>(null);
-  const isRemoteScrubbing = useSharedValue(false);
-  const SCRUB_INTERVAL = isVlc ? secondsToMs(10) : msToTicks(secondsToMs(10));
-  const [showRemoteBubble, setShowRemoteBubble] = useState(false);
-
-  const [longPressScrubMode, setLongPressScrubMode] = useState<
-    "FF" | "RW" | null
-  >(null);
-
-  useTVEventHandler((evt) => {
-    if (!evt) return;
-
-    switch (evt.eventType) {
-      case "longLeft": {
-        setLongPressScrubMode((prev) => (!prev ? "RW" : null));
-        break;
-      }
-      case "longRight": {
-        setLongPressScrubMode((prev) => (!prev ? "FF" : null));
-        break;
-      }
-      case "left":
-      case "right": {
-        isRemoteScrubbing.value = true;
-        setShowRemoteBubble(true);
-
-        const direction = evt.eventType === "left" ? -1 : 1;
-        const base = remoteScrubProgress.value ?? progress.value;
-        const updated = Math.max(
-          min.value,
-          Math.min(max.value, base + direction * SCRUB_INTERVAL),
-        );
-        remoteScrubProgress.value = updated;
-        const progressInTicks = isVlc ? msToTicks(updated) : updated;
-        calculateTrickplayUrl(progressInTicks);
-        const progressInSeconds = Math.floor(ticksToSeconds(progressInTicks));
-        const hours = Math.floor(progressInSeconds / 3600);
-        const minutes = Math.floor((progressInSeconds % 3600) / 60);
-        const seconds = progressInSeconds % 60;
-        setTime({ hours, minutes, seconds });
-        break;
-      }
-      case "select": {
-        if (isRemoteScrubbing.value && remoteScrubProgress.value != null) {
-          progress.value = remoteScrubProgress.value;
-
-          const seekTarget = isVlc
-            ? Math.max(0, remoteScrubProgress.value)
-            : Math.max(0, ticksToSeconds(remoteScrubProgress.value));
-
-          seek(seekTarget);
-          if (isPlaying) play();
-
-          isRemoteScrubbing.value = false;
-          remoteScrubProgress.value = null;
-          setShowRemoteBubble(false);
-        } else {
-          togglePlay();
-        }
-        break;
-      }
-      case "down":
-      case "up":
-        // cancel scrubbing on other directions
-        isRemoteScrubbing.value = false;
-        remoteScrubProgress.value = null;
-        setShowRemoteBubble(false);
-        break;
-      default:
-        break;
-    }
-
-    if (!showControls) toggleControls();
-  });
-
-  const longPressTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
-
-  useEffect(() => {
-    let isActive = true;
-    let seekTime = 10;
-
-    const scrubWithLongPress = () => {
-      if (!isActive || !longPressScrubMode) return;
-
-      setIsSliding(true);
-      const scrubFn =
-        longPressScrubMode === "FF" ? handleSeekForward : handleSeekBackward;
-      scrubFn(seekTime);
-      seekTime *= 1.1;
-
-      longPressTimeoutRef.current = setTimeout(scrubWithLongPress, 300);
-    };
-
-    if (longPressScrubMode) {
-      isActive = true;
-      scrubWithLongPress();
-    }
-
-    return () => {
-      isActive = false;
-      setIsSliding(false);
-      if (longPressTimeoutRef.current) {
-        clearTimeout(longPressTimeoutRef.current);
-        longPressTimeoutRef.current = null;
-      }
-    };
-  }, [longPressScrubMode]);
-
-  const effectiveProgress = useSharedValue(0);
-
-  // Recompute progress whenever remote scrubbing is active
-  useAnimatedReaction(
-    () => ({
-      isScrubbing: isRemoteScrubbing.value,
-      scrub: remoteScrubProgress.value,
-      actual: progress.value,
-    }),
-    (current) => {
-      effectiveProgress.value =
-        current.isScrubbing && current.scrub != null
-          ? current.scrub
-          : current.actual;
-    },
-    [],
-  );
-
   useEffect(() => {
     if (item) {
       progress.value = isVlc
@@ -503,19 +369,20 @@ export const Controls: FC<Props> = ({
 
     pause();
     isSeeking.value = true;
-  }, [showControls, isPlaying, pause]);
+  }, [showControls, isPlaying]);
 
   const handleSliderComplete = useCallback(
     async (value: number) => {
       isSeeking.value = false;
       progress.value = value;
       setIsSliding(false);
+
       seek(Math.max(0, Math.floor(isVlc ? value : ticksToSeconds(value))));
       if (wasPlayingRef.current) {
         play();
       }
     },
-    [isVlc, seek, play],
+    [isVlc],
   );
 
   const [time, setTime] = useState({ hours: 0, minutes: 0, seconds: 0 });
@@ -552,43 +419,7 @@ export const Controls: FC<Props> = ({
     } catch (error) {
       writeToLog("ERROR", "Error seeking video backwards", error);
     }
-  }, [settings, isPlaying, isVlc, play, seek]);
-
-  const handleSeekBackward = useCallback(
-    async (seconds: number) => {
-      wasPlayingRef.current = isPlaying;
-      try {
-        const curr = progress.value;
-        if (curr !== undefined) {
-          const newTime = isVlc
-            ? Math.max(0, curr - secondsToMs(seconds))
-            : Math.max(0, ticksToSeconds(curr) - seconds);
-          seek(newTime);
-        }
-      } catch (error) {
-        writeToLog("ERROR", "Error seeking video backwards", error);
-      }
-    },
-    [isPlaying, isVlc, seek],
-  );
-
-  const handleSeekForward = useCallback(
-    async (seconds: number) => {
-      wasPlayingRef.current = isPlaying;
-      try {
-        const curr = progress.value;
-        if (curr !== undefined) {
-          const newTime = isVlc
-            ? curr + secondsToMs(seconds)
-            : ticksToSeconds(curr) + seconds;
-          seek(Math.max(0, newTime));
-        }
-      } catch (error) {
-        writeToLog("ERROR", "Error seeking video forwards", error);
-      }
-    },
-    [isPlaying, isVlc, seek],
-  );
+  }, [settings, isPlaying, isVlc]);
 
   const handleSkipForward = useCallback(async () => {
     if (!settings?.forwardSkipTime) {
@@ -610,7 +441,7 @@ export const Controls: FC<Props> = ({
     } catch (error) {
       writeToLog("ERROR", "Error seeking video forwards", error);
     }
-  }, [settings, isPlaying, isVlc, play, seek]);
+  }, [settings, isPlaying, isVlc]);
 
   const toggleIgnoreSafeAreas = useCallback(() => {
     setIgnoreSafeAreas((prev) => !prev);
@@ -726,35 +557,32 @@ export const Controls: FC<Props> = ({
             pointerEvents={showControls ? "auto" : "none"}
             className={"flex flex-row w-full pt-2"}
           >
-            {!Platform.isTV && (
-              <View className='mr-auto'>
-                <VideoProvider
-                  getAudioTracks={getAudioTracks}
-                  getSubtitleTracks={getSubtitleTracks}
-                  setAudioTrack={setAudioTrack}
-                  setSubtitleTrack={setSubtitleTrack}
-                  setSubtitleURL={setSubtitleURL}
-                >
-                  <DropdownView />
-                </VideoProvider>
-              </View>
-            )}
+            <View className='mr-auto'>
+              <VideoProvider
+                getAudioTracks={getAudioTracks}
+                getSubtitleTracks={getSubtitleTracks}
+                setAudioTrack={setAudioTrack}
+                setSubtitleTrack={setSubtitleTrack}
+                setSubtitleURL={setSubtitleURL}
+              >
+                <DropdownView />
+              </VideoProvider>
+            </View>
 
             <View className='flex flex-row items-center space-x-2 '>
-              {!Platform.isTV &&
-                settings.defaultPlayer === VideoPlayer.VLC_4 && (
-                  <TouchableOpacity
-                    onPress={startPictureInPicture}
-                    className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
-                  >
-                    <MaterialIcons
-                      name='picture-in-picture'
-                      size={24}
-                      color='white'
-                      style={{ opacity: showControls ? 1 : 0 }}
-                    />
-                  </TouchableOpacity>
-                )}
+              {settings.defaultPlayer === VideoPlayer.VLC_4 && (
+                <TouchableOpacity
+                  onPress={startPictureInPicture}
+                  className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+                >
+                  <MaterialIcons
+                    name='picture-in-picture'
+                    size={24}
+                    color='white'
+                    style={{ opacity: showControls ? 1 : 0 }}
+                  />
+                </TouchableOpacity>
+              )}
 
               {item?.Type === "Episode" && !offline && (
                 <TouchableOpacity
@@ -831,87 +659,80 @@ export const Controls: FC<Props> = ({
             >
               <BrightnessSlider />
             </View>
-            {!Platform.isTV && (
-              <TouchableOpacity onPress={handleSkipBackward}>
-                <View
-                  style={{
-                    position: "relative",
-                    justifyContent: "center",
-                    alignItems: "center",
-                    opacity: showControls ? 1 : 0,
-                  }}
-                >
-                  <Ionicons
-                    name='refresh-outline'
-                    size={50}
-                    color='white'
-                    style={{
-                      transform: [{ scaleY: -1 }, { rotate: "180deg" }],
-                    }}
-                  />
-                  <Text
-                    style={{
-                      position: "absolute",
-                      color: "white",
-                      fontSize: 16,
-                      fontWeight: "bold",
-                      bottom: 10,
-                    }}
-                  >
-                    {settings?.rewindSkipTime}
-                  </Text>
-                </View>
-              </TouchableOpacity>
-            )}
-
-            <View
-              style={Platform.isTV ? { flex: 1, alignItems: "center" } : {}}
-            >
-              <TouchableOpacity
-                onPress={() => {
-                  togglePlay();
+            <TouchableOpacity onPress={handleSkipBackward}>
+              <View
+                style={{
+                  position: "relative",
+                  justifyContent: "center",
+                  alignItems: "center",
+                  opacity: showControls ? 1 : 0,
                 }}
               >
-                {!isBuffering ? (
-                  <Ionicons
-                    name={isPlaying ? "pause" : "play"}
-                    size={50}
-                    color='white'
-                    style={{
-                      opacity: showControls ? 1 : 0,
-                    }}
-                  />
-                ) : (
-                  <Loader size={"large"} />
-                )}
-              </TouchableOpacity>
-            </View>
-
-            {!Platform.isTV && (
-              <TouchableOpacity onPress={handleSkipForward}>
-                <View
+                <Ionicons
+                  name='refresh-outline'
+                  size={50}
+                  color='white'
                   style={{
-                    position: "relative",
-                    justifyContent: "center",
-                    alignItems: "center",
-                    opacity: showControls ? 1 : 0,
+                    transform: [{ scaleY: -1 }, { rotate: "180deg" }],
+                  }}
+                />
+                <Text
+                  style={{
+                    position: "absolute",
+                    color: "white",
+                    fontSize: 16,
+                    fontWeight: "bold",
+                    bottom: 10,
                   }}
                 >
-                  <Ionicons name='refresh-outline' size={50} color='white' />
-                  <Text
-                    style={{
-                      position: "absolute",
-                      color: "white",
-                      fontSize: 16,
-                      fontWeight: "bold",
-                      bottom: 10,
-                    }}
-                  >
-                    {settings?.forwardSkipTime}
-                  </Text>
-                </View>
-              </TouchableOpacity>
-            )}
+                  {settings?.rewindSkipTime}
+                </Text>
+              </View>
+            </TouchableOpacity>
+
+            <TouchableOpacity
+              onPress={() => {
+                togglePlay();
+              }}
+            >
+              {!isBuffering ? (
+                <Ionicons
+                  name={isPlaying ? "pause" : "play"}
+                  size={50}
+                  color='white'
+                  style={{
+                    opacity: showControls ? 1 : 0,
+                  }}
+                />
+              ) : (
+                <Loader size={"large"} />
+              )}
+            </TouchableOpacity>
+
+            <TouchableOpacity onPress={handleSkipForward}>
+              <View
+                style={{
+                  position: "relative",
+                  justifyContent: "center",
+                  alignItems: "center",
+                  opacity: showControls ? 1 : 0,
+                }}
+              >
+                <Ionicons name='refresh-outline' size={50} color='white' />
+                <Text
+                  style={{
+                    position: "absolute",
+                    color: "white",
+                    fontSize: 16,
+                    fontWeight: "bold",
+                    bottom: 10,
+                  }}
+                >
+                  {settings?.forwardSkipTime}
+                </Text>
+              </View>
+            </TouchableOpacity>
+
             <View
               style={{
                 position: "absolute",
@@ -1021,12 +842,10 @@ export const Controls: FC<Props> = ({
                   containerStyle={{
                     borderRadius: 100,
                   }}
-                  renderBubble={() =>
-                    (isSliding || showRemoteBubble) && memoizedRenderBubble()
-                  }
+                  renderBubble={() => isSliding && memoizedRenderBubble()}
                   sliderHeight={10}
                   thumbWidth={0}
-                  progress={effectiveProgress}
+                  progress={progress}
                   minimumValue={min}
                   maximumValue={max}
                 />

components/video-player/controls/EpisodeList.tsx

@@ -93,7 +93,7 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
     [seasons, seasonIndex],
   );
 
-  const { data: episodes } = useQuery({
+  const { data: episodes, isFetching } = useQuery({
     queryKey: ["episodes", item.SeriesId, selectedSeasonId],
     queryFn: async () => {
       if (!api || !user?.Id || !item.Id || !selectedSeasonId) return [];