feat: adding exoplayer for HDR playback

Currently MPV doesn't support HDR via external displays. giving people
the choice of HDR/limited ass sub support/SDR full sub support

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>

.github/ISSUE_TEMPLATE/issue_report.yml

@@ -75,10 +75,13 @@ body:
     id: version
     attributes:
       label: Streamyfin Version
-      description: What version of Streamyfin are you using?
+      description: What version of Streamyfin are you running? On a TestFlight or development build, choose "TestFlight/Development build" and include the exact version string shown in the app's Settings.
       options:
         - 0.54.1
         - 0.51.0
+        - 0.47.1
+        - 0.30.2
+        - 0.28.0
         - Older
         - TestFlight/Development build
     validations:

.github/actions/refresh-pr-comment/action.yml

@@ -0,0 +1,21 @@
+name: Refresh PR build comment
+description: >-
+  Nudge artifact-comment.yml (via workflow_dispatch) so the PR build-status
+  comment reflects live per-platform progress as each build job finishes.
+
+runs:
+  using: composite
+  steps:
+    # workflow_dispatch fires even when triggered by the GITHUB_TOKEN, and
+    # artifact-comment's concurrency group collapses simultaneous nudges, so
+    # this can't spam the comment. Skipped on forks (their read-only token
+    # cannot dispatch). github.token is used because composite actions cannot
+    # read the secrets context.
+    - if: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+      continue-on-error: true
+      shell: bash
+      env:
+        GH_TOKEN: ${{ github.token }}
+        HEAD_REF: ${{ github.head_ref }}
+        REPO: ${{ github.repository }}
+      run: gh workflow run artifact-comment.yml --ref "$HEAD_REF" -R "$REPO"

.github/copilot-instructions.md

@@ -42,7 +42,7 @@ and provides seamless media streaming with offline capabilities and Chromecast s
 
 ## Coding Standards
 
-- Use TypeScript for ALL files (no .js files)
+- Use TypeScript for ALL files (no .js files). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
 - Use descriptive English names for variables, functions, and components
 - Prefer functional React components with hooks
 - Use Jotai atoms for global state management

.github/renovate.json

@@ -30,9 +30,17 @@
       "customType": "regex",
       "managerFilePatterns": ["/\\.ya?ml$/"],
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+xcode-version:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
+        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+[A-Za-z0-9._-]+:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}loose{{/if}}"
+    },
+    {
+      "customType": "regex",
+      "description": "Track the Bun version pinned in eas.json build profiles (strict JSON can't hold inline annotations)",
+      "managerFilePatterns": ["/(^|/)eas\\.json$/"],
+      "matchStrings": ["\"bun\"\\s*:\\s*\"(?<currentValue>[^\"]+)\""],
+      "datasourceTemplate": "npm",
+      "depNameTemplate": "bun"
     }
   ],
   "customDatasources": {

.github/workflows/artifact-comment.yml

@@ -18,7 +18,7 @@ jobs:
   comment-artifacts:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request')
     name: 📦 Post Build Artifacts
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
       pull-requests: write
@@ -144,7 +144,7 @@ jobs:
               )
               .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
 
-            console.log(`Found ${buildRuns.length} non-cancelled build workflow runs for this commit`);
+            console.log(`Found ${buildRuns.length} build workflow runs for this commit`);
 
             // Log current status of each build for debugging
             buildRuns.forEach(run => {
@@ -184,21 +184,35 @@ jobs:
             const latestAndroidRun = findBestRun('Android APK Build');
             const latestIOSRun = findBestRun('iOS IPA Build');
 
+            // Map our build targets to their job display names. Exact name is
+            // tried first so a signed target never collides with its
+            // "(Unsigned)" sibling (whose name contains the signed name).
+            const jobMappings = {
+              'Android Phone': ['🤖 Build Android APK (Phone)'],
+              'Android TV': ['🤖 Build Android APK (TV)'],
+              'iOS': ['🍎 Build iOS IPA (Phone)'],
+              'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)'],
+              'tvOS': ['🍎 Build tvOS IPA'],
+              'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)']
+            };
+
+            // Prefer an exact name match over a substring match so
+            // '...(Phone)' doesn't swallow '...(Phone - Unsigned)'.
+            const findJobForTarget = (jobs, jobNames) =>
+              jobs.find(j => jobNames.some(name => j.name === name)) ||
+              jobs.find(j => jobNames.some(name => j.name.includes(name)));
+
+            // Format a millisecond duration as "Xm Ys".
+            const fmtDuration = (ms) => {
+              const min = Math.floor(ms / 60000);
+              const sec = Math.floor((ms % 60000) / 1000);
+              return `${min}m ${sec}s`;
+            };
+
             // For the consolidated workflow, get individual job statuses
             if (latestAppsRun) {
               console.log(`Getting individual job statuses for run ${latestAppsRun.id} (status: ${latestAppsRun.status}, conclusion: ${latestAppsRun.conclusion || 'none'})`);
               
-              // Map job names to our build targets. Declared outside the try so
-              // the catch fallback can reuse the same keys.
-              const jobMappings = {
-                'Android Phone': ['🤖 Build Android APK (Phone)', 'build-android-phone'],
-                'Android TV': ['🤖 Build Android APK (TV)', 'build-android-tv'],
-                'iOS': ['🍎 Build iOS IPA (Phone)', 'build-ios-phone'],
-                'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)', 'build-ios-phone-unsigned'],
-                'tvOS': ['🍎 Build tvOS IPA', 'build-ios-tv'],
-                'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)', 'build-ios-tv-unsigned']
-              };
-
               try {
                 // Get all jobs for this workflow run
                 const { data: jobs } = await github.rest.actions.listJobsForWorkflowRun({
@@ -229,10 +243,8 @@ jobs:
                 
                 // Create individual status for each job
                 for (const [platform, jobNames] of Object.entries(jobMappings)) {
-                  const job = jobs.jobs.find(j => 
-                    jobNames.some(name => j.name.includes(name) || j.name === name)
-                  );
-                  
+                  const job = findJobForTarget(jobs.jobs, jobNames);
+
                   if (job) {
                     buildStatuses[platform] = {
                       name: job.name,
@@ -358,6 +370,43 @@ jobs:
               console.log(`- Artifact: ${artifact.name} (from run ${artifact.workflow_run.id})`);
             });
 
+            // Pull per-job durations from the latest successful develop build so
+            // in-progress / queued targets can show a realistic ETA instead of
+            // an open-ended spinner. Best-effort: any failure just drops the ETA.
+            let referenceDurations = {};
+            try {
+              const { data: devRuns } = await github.rest.actions.listWorkflowRuns({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                workflow_id: 'build-apps.yml',
+                branch: 'develop',
+                status: 'success',
+                per_page: 1
+              });
+
+              if (devRuns.workflow_runs.length > 0) {
+                const refRun = devRuns.workflow_runs[0];
+                const { data: refJobs } = await github.rest.actions.listJobsForWorkflowRun({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  run_id: refRun.id
+                });
+
+                for (const [platform, jobNames] of Object.entries(jobMappings)) {
+                  const job = findJobForTarget(refJobs.jobs, jobNames);
+                  if (job && job.conclusion === 'success' && job.started_at && job.completed_at) {
+                    referenceDurations[platform] = new Date(job.completed_at) - new Date(job.started_at);
+                  }
+                }
+                console.log(`Reference durations from develop run ${refRun.id}:`,
+                  Object.fromEntries(Object.entries(referenceDurations).map(([k, v]) => [k, fmtDuration(v)])));
+              } else {
+                console.log('No successful develop build found for ETA reference');
+              }
+            } catch (error) {
+              console.log('Failed to fetch develop reference durations:', error.message);
+            }
+
             // Build comment body with progressive status for individual builds
             let commentBody = `## 🔧 Build Status for PR #${pr.number}\n\n`;
             commentBody += `🔗 **Commit**: [\`${targetCommitSha.substring(0, 7)}\`](https://github.com/${context.repo.owner}/${context.repo.repo}/commit/${targetCommitSha})\n\n`;            // Progressive build status and downloads table
@@ -369,9 +418,9 @@ jobs:
             const buildTargets = [
               { name: 'Android Phone', platform: '🤖', device: '📱 Phone', statusKey: 'Android Phone', artifactPattern: /android.*phone/i },
               { name: 'Android TV', platform: '🤖', device: '📺 TV', statusKey: 'Android TV', artifactPattern: /android.*tv/i },
-              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /ios.*phone.*ipa(?!.*unsigned)/i },
+              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /^(?!.*unsigned).*ios.*phone.*ipa/i },
               { name: 'iOS Unsigned', platform: '🍎', device: '📱 Phone Unsigned', statusKey: 'iOS Unsigned', artifactPattern: /ios.*phone.*unsigned/i },
-              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /ios.*tv.*ipa(?!.*unsigned)/i },
+              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /^(?!.*unsigned).*ios.*tv.*ipa/i },
               { name: 'tvOS Unsigned', platform: '🍎', device: '📺 TV Unsigned', statusKey: 'tvOS Unsigned', artifactPattern: /ios.*tv.*unsigned/i }
             ];
 
@@ -387,11 +436,12 @@ jobs:
               let status = '⏳ Pending';
               let downloadLink = '*Waiting for build...*';
 
-              // tvOS builds are temporarily disabled until feat/tv-interface
-              // is merged - show them as disabled instead of stuck pending.
-              if (target.name === 'tvOS' || target.name === 'tvOS Unsigned') {
+              // Signed tvOS stays disabled until EAS has tvOS provisioning
+              // profiles (app + TopShelf targets); non-interactive builds can't
+              // create them. Unsigned tvOS builds, so it flows through normally.
+              if (target.name === 'tvOS') {
                 status = '💤 Disabled';
-                downloadLink = '*Disabled until feat/tv-interface is merged*';
+                downloadLink = '*Disabled — signed tvOS needs EAS provisioning profiles*';
               } else if (matchingStatus) {
                 if (matchingStatus.conclusion === 'success' && matchingArtifact) {
                   status = '✅ Complete';
@@ -406,11 +456,9 @@ jobs:
                   let durationInfo = '';
                   if (matchingStatus.started_at && matchingStatus.completed_at) {
                     const durationMs = new Date(matchingStatus.completed_at) - new Date(matchingStatus.started_at);
-                    const durationMin = Math.floor(durationMs / 60000);
-                    const durationSec = Math.floor((durationMs % 60000) / 1000);
-                    durationInfo = ` - ${durationMin}m ${durationSec}s`;
+                    durationInfo = ` - ${fmtDuration(durationMs)}`;
                   }
-                  
+
                   downloadLink = `[📥 Download ${fileType}](${directLink}) ${sizeInfo}${durationInfo}`;
                 } else if (matchingStatus.conclusion === 'failure') {
                   status = `❌ [Failed](${matchingStatus.url})`;
@@ -420,10 +468,16 @@ jobs:
                   downloadLink = '*Build cancelled*';
                 } else if (matchingStatus.status === 'in_progress') {
                   status = `🔄 [Building...](${matchingStatus.url})`;
-                  downloadLink = '*Build in progress...*';
+                  const ref = referenceDurations[target.statusKey];
+                  downloadLink = ref
+                    ? `*Building… ~${fmtDuration(ref)} (avg on develop)*`
+                    : '*Build in progress...*';
                 } else if (matchingStatus.status === 'queued') {
                   status = `⏳ [Queued](${matchingStatus.url})`;
-                  downloadLink = '*Waiting to start...*';
+                  const ref = referenceDurations[target.statusKey];
+                  downloadLink = ref
+                    ? `*Waiting to start… ~${fmtDuration(ref)} once running (avg on develop)*`
+                    : '*Waiting to start...*';
                 } else if (matchingStatus.status === 'completed' && !matchingStatus.conclusion) {
                   // Workflow completed but conclusion not yet available (rare edge case)
                   status = `🔄 [Finishing...](${matchingStatus.url})`;
@@ -444,7 +498,22 @@ jobs:
 
             commentBody += `\n`;
 
-            // Show installation instructions if we have any artifacts
+            // Static rundown of the build optimisations + what each artifact
+            // installs on. Always shown (even mid-build) so testers know what
+            // to expect before downloads are ready.
+            commentBody += `<details>\n`;
+            commentBody += `<summary>📦 Build details &amp; device compatibility</summary>\n\n`;
+            commentBody += `These CI builds are trimmed for size and speed. What that means for installing them:\n\n`;
+            commentBody += `| Artifact | Architectures | Installs on |\n`;
+            commentBody += `|---|---|---|\n`;
+            commentBody += `| 🤖 Android Phone APK | \`arm64-v8a\` | Every 64-bit Android phone (all since ~2017). **Not** an x86_64 emulator or a 32-bit device. |\n`;
+            commentBody += `| 📺 Android TV APK | \`arm64-v8a\` + \`armeabi-v7a\` | Modern boxes **and** older / cheap 32-bit Android TV sticks. No x86_64. |\n`;
+            commentBody += `| 🍎 iOS / tvOS IPA | \`arm64\` | iPhone / Apple TV (all current devices). |\n\n`;
+            commentBody += `**Why no x86_64?** That slice only runs on Android emulators / Chromebooks, never a real phone or TV box — dropping it shrinks the APK and speeds up the build. Local \`bun run android\` is unaffected (it still builds x86_64 from \`app.json\`).\n\n`;
+            commentBody += `**Runners:** Android on \`ubuntu-26.04\`; iOS / tvOS on Apple Silicon (\`macos-26\`). The size/speed win comes from the ABI trim above, not the runner.\n`;
+            commentBody += `</details>\n\n`;
+
+            // Installation instructions only matter once something is downloadable.
             if (allArtifacts.length > 0) {
               commentBody += `### 🔧 Installation Instructions\n\n`;
               commentBody += `- **Android APK**: Download and install directly on your device (enable "Install from unknown sources")\n`;

.github/workflows/build-apps.yml

@@ -11,13 +11,23 @@ on:
   push:
     branches: [develop, master]
 
+# Exposed to `expo prebuild` (app.config.ts → extra.build) so Settings can show the
+# branch + commit + Actions run a CI build was made from. EAS cloud builds use
+# EAS_BUILD_* instead. The run number maps a sideloaded build back to its Actions
+# run (artifacts + logs) without needing Expo access.
+env:
+  EXPO_PUBLIC_GIT_BRANCH: ${{ github.head_ref || github.ref_name }}
+  EXPO_PUBLIC_GIT_COMMIT: ${{ github.sha }}
+  EXPO_PUBLIC_GIT_RUN_NUMBER: ${{ github.run_number }}
+
 jobs:
   build-android-phone:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     name: 🤖 Build Android APK (Phone)
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 🗑️ Free Disk Space
@@ -28,12 +38,12 @@ jobs:
           android: false
           dotnet: true
           haskell: true
-          large-packages: true
+          large-packages: false
           docker-images: true
           swap-storage: false
 
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -43,45 +53,58 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-develop
-            ${{ runner.os }}-bun-develop
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
+      - name: ☕ Set up JDK 17
+        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
+        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
+        # fail). Pin Temurin 17 for a deterministic Android build.
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        with:
+          distribution: temurin
+          java-version: "17"
+
       - name: 💾 Cache Gradle global
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: |
-            ~/.gradle/caches
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-
+            ${{ runner.os }}-${{ runner.arch }}-gradle-
 
       - name: 🛠️ Generate project files
         run: bun run prebuild
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         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
+          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
 
       - name: 🚀 Build APK
         env:
           EXPO_TV: 0
+          # CI artifact ships arm64 only (phones; emulators/Chromebooks not a
+          # sideload target). Overrides app.json buildArchs for this build only,
+          # so local `bun run android` (x86_64 emulator) is unaffected.
+          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a
         run: bun run build:android:local
 
       - name: 📅 Set date tag
@@ -95,12 +118,16 @@ jobs:
             android/app/build/outputs/apk/release/*.apk
           retention-days: 7
 
+      - name: 🔄 Refresh PR build comment
+        uses: ./.github/actions/refresh-pr-comment
+
   build-android-tv:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     name: 🤖 Build Android APK (TV)
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 🗑️ Free Disk Space
@@ -111,12 +138,12 @@ jobs:
           android: false
           dotnet: true
           haskell: true
-          large-packages: true
+          large-packages: false
           docker-images: true
           swap-storage: false
 
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -126,45 +153,57 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-develop
-            ${{ runner.os }}-bun-develop
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
+      - name: ☕ Set up JDK 17
+        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
+        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
+        # fail). Pin Temurin 17 for a deterministic Android build.
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
+        with:
+          distribution: temurin
+          java-version: "17"
+
       - name: 💾 Cache Gradle global
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: |
-            ~/.gradle/caches
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-
+            ${{ runner.os }}-${{ runner.arch }}-gradle-
 
       - name: 🛠️ Generate project files
         run: bun run prebuild:tv
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         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
+          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
 
       - name: 🚀 Build APK
         env:
           EXPO_TV: 1
+          # TV artifact keeps armeabi-v7a too: many older/cheap Android TV boxes
+          # and sticks are still 32-bit ARM. Drops only x86_64. CI build only.
+          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a,armeabi-v7a
         run: bun run build:android:local
 
       - name: 📅 Set date tag
@@ -178,16 +217,20 @@ jobs:
             android/app/build/outputs/apk/release/*.apk
           retention-days: 7
 
+      - name: 🔄 Refresh PR build comment
+        uses: ./.github/actions/refresh-pr-comment
+
   build-ios-phone:
     if: (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
     runs-on: macos-26
     name: 🍎 Build iOS IPA (Phone)
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -197,15 +240,16 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -231,7 +275,9 @@ jobs:
       - name: 🚀 Build iOS app
         env:
           EXPO_TV: 0
-        run: eas build -p ios --local --non-interactive
+        # `ci` profile (extends production, autoIncrement off): keeps CI builds out of
+        # the production version tier and stops them inflating the store build counter.
+        run: eas build -p ios --local --non-interactive --profile ci
 
       - name: 📅 Set date tag
         run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -243,16 +289,20 @@ jobs:
           path: build-*.ipa
           retention-days: 7
 
+      - name: 🔄 Refresh PR build comment
+        uses: ./.github/actions/refresh-pr-comment
+
   build-ios-phone-unsigned:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
     runs-on: macos-26
     name: 🍎 Build iOS IPA (Phone - Unsigned)
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -262,15 +312,16 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -301,18 +352,24 @@ jobs:
           path: build/*.ipa
           retention-days: 7
 
+      - name: 🔄 Refresh PR build comment
+        uses: ./.github/actions/refresh-pr-comment
+
   build-ios-tv:
-    # Temporarily disabled until feat/tv-interface is merged (TV UI not ready).
-    # Re-enable by removing the `false &&` prefix below.
+    # Disabled: EAS has no provisioning profiles / distribution cert for the tvOS
+    # targets (app + StreamyfinTopShelf extension), so non-interactive signed
+    # builds fail. Set up tvOS credentials in EAS (`eas credentials`), then remove
+    # the `false &&` prefix below. Unsigned tvOS builds run (see job below).
     if: false && (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
     runs-on: macos-26
     name: 🍎 Build tvOS IPA
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -322,15 +379,16 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -356,7 +414,7 @@ jobs:
       - name: 🚀 Build iOS app
         env:
           EXPO_TV: 1
-        run: eas build -p ios --local --non-interactive
+        run: eas build -p ios --local --non-interactive --profile ci_tv
 
       - name: 📅 Set date tag
         run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
@@ -377,10 +435,11 @@ jobs:
     name: 🍎 Build tvOS IPA (Unsigned)
     permissions:
       contents: read
+      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -390,15 +449,16 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -428,3 +488,6 @@ jobs:
           name: streamyfin-ios-tv-unsigned-ipa-${{ env.DATE_TAG }}
           path: build/*.ipa
           retention-days: 7
+
+      - name: 🔄 Refresh PR build comment
+        uses: ./.github/actions/refresh-pr-comment

.github/workflows/check-lockfile.yml

@@ -13,13 +13,13 @@ concurrency:
 jobs:
   check-lockfile:
     name: 🔍 Check bun.lock and package.json consistency
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           show-progress: false
@@ -29,14 +29,17 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: |
             ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 🛡️ Verify lockfile consistency
         run: |

.github/workflows/ci-codeql.yml

@@ -8,11 +8,14 @@ on:
   schedule:
     - cron: '24 2 * * *'
 
+concurrency:
+  group: codeql-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   analyze:
     name: 🔎 Analyze with CodeQL
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
       security-events: write
@@ -24,7 +27,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: 🏁 Initialize CodeQL
         uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/conflict.yml

@@ -10,14 +10,14 @@ on:
 jobs:
   label:
     name: 🏷️ Labeling Merge Conflicts
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     if: ${{ github.repository == 'streamyfin/streamyfin' }}
     permissions:
       contents: read
       pull-requests: write
     steps:
       - name: 🚩 Apply merge conflict label
-        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
           dirtyLabel: '⚔️ merge-conflict'
           commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'

.github/workflows/crowdin.yml

@@ -19,16 +19,16 @@ permissions:
 
 jobs:
   sync-translations:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
 
     steps:
       - name: 📥 Checkout Repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 
       - name: 🌐 Sync Translations with Crowdin
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
+        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
         with:
           upload_sources: true
           upload_translations: true

.github/workflows/detect-duplicate.yml

@@ -15,21 +15,22 @@ jobs:
   detect:
     name: 🔍 Find similar issues
     if: github.actor != 'github-actions[bot]'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       issues: write
       contents: read
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 🔍 Detect duplicate issues
-        run: bun scripts/detect-duplicate-issue.mjs
+        run: bun scripts/detect-duplicate-issue.ts
         env:
           GH_TOKEN: ${{ github.token }}
           GITHUB_REPOSITORY: ${{ github.repository }}

.github/workflows/linting.yml

@@ -15,7 +15,7 @@ jobs:
   validate_pr_title:
     name: "📝 Validate PR Title"
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       pull-requests: write
       contents: read
@@ -46,12 +46,12 @@ jobs:
 
   dependency-review:
     name: 🔍 Vulnerable Dependencies
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -65,11 +65,10 @@ jobs:
 
   expo-doctor:
     name: 🚑 Expo Doctor Check
-    if: false
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
@@ -78,17 +77,21 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 📦 Install dependencies (bun)
         run: bun install --frozen-lockfile
 
       - name: 🚑 Run Expo Doctor
+        # Re-enabled but non-blocking: surfaces doctor warnings in the logs
+        # without failing the gate (some checks are known-noisy for this setup).
+        continue-on-error: true
         run: bun expo-doctor
 
   code_quality:
     name: "🔍 Lint & Test (${{ matrix.command }})"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       fail-fast: false
       matrix:
@@ -101,7 +104,7 @@ jobs:
 
     steps:
       - name: "📥 Checkout PR code"
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
@@ -110,12 +113,14 @@ jobs:
       - name: "🟢 Setup Node.js"
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          node-version: '24.x'
+          # renovate: datasource=node-version depName=node versioning=node
+          node-version: "24.18.0"
 
       - name: "🍞 Setup Bun"
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: "📦 Install dependencies"
         run: bun install --frozen-lockfile

.github/workflows/notification.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   notify:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     if: github.event_name == 'pull_request'
     steps:
       - name: 🛎️ Notify Discord
@@ -29,7 +29,7 @@ jobs:
             🔗 ${{ github.event.pull_request.html_url }}
 
   notify-on-failure:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure'
     steps:
       - name: 🚨 Notify Discord on Failure

.github/workflows/release.yml

@@ -22,8 +22,9 @@ on:
 jobs:
   approve:
     name: 🔐 Approve release
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     environment: production
+    permissions: {}
     steps:
       - name: ✅ Release approved
         run: echo "Release approved for ${{ github.sha }}"
@@ -31,7 +32,7 @@ jobs:
   build:
     name: 🚀 ${{ matrix.name }}
     needs: approve
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
     strategy:
@@ -63,7 +64,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           submodules: recursive
@@ -72,15 +73,16 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          bun-version: latest
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-bun-cache
+            ${{ runner.os }}-${{ runner.arch }}-bun-
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -176,13 +178,13 @@ jobs:
     name: 📦 Draft GitHub Release
     needs: build
     if: ${{ !cancelled() }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: write
       actions: read # required for `gh run download` to list/fetch this run's artifacts
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
           show-progress: false

.github/workflows/trivy-scan.yml

@@ -21,27 +21,17 @@ concurrency:
 jobs:
   trivy:
     name: 🔎 Filesystem scan
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     permissions:
       contents: read
       security-events: write # upload SARIF to code scanning
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      # Rotate the DB cache weekly (matches the scheduled scan): cache hits within the week
-      # instead of a fresh immutable entry per run, still refreshing the DB every week.
-      - name: 🗓️ Compute weekly Trivy cache key
-        id: trivy-cache-key
-        run: echo "value=trivy-db-${{ runner.os }}-$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
-
-      - name: 💾 Cache Trivy vulnerability DB
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ~/.cache/trivy
-          key: ${{ steps.trivy-cache-key.outputs.value }}
-          restore-keys: trivy-db-${{ runner.os }}-
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
+      # Trivy's own action caches the vulnerability DB + binary internally
+      # (cache-trivy-* / trivy-binary-* entries), so no manual ~/.cache/trivy
+      # step is needed — it only duplicated the cache.
       - name: 🔎 Run Trivy filesystem scan
         uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:

.github/workflows/update-issue-form.yml

@@ -1,67 +1,103 @@
-name: 🐛 Update Bug Report Template
+name: 🐛 Update Issue Form Versions
 
 on:
   release:
-    types: [published]  # Run on every published release on any branch
+    # Only full releases populate the dropdown (no drafts/prereleases).
+    types: [released]
+  schedule:
+    - cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
+  workflow_dispatch:
 
+# Fixed group so a release event and the weekly cron can't race on the same
+# ci/update-issue-form branch — runs queue instead of force-pushing over each other.
 concurrency:
-   group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
-   cancel-in-progress: true
+  group: update-issue-form
+  cancel-in-progress: false
+
+permissions:
+  contents: read
 
 jobs:
-  update-bug-report:
+  update-issue-form:
+    name: 🔢 Populate version dropdown
+    runs-on: ubuntu-26.04
     permissions:
       contents: write
       pull-requests: write
-      issues: write
-    runs-on: ubuntu-24.04
-
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: "🟢 Setup Node.js"
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
-          node-version: '24.x'
-          cache: 'npm'
+          # On `release` events GITHUB_SHA is the tagged commit — without this the
+          # script would regenerate the form from the tag's (stale) copy and the bot
+          # PR would revert any form edits made on develop since that release.
+          ref: develop
 
-      - name: 🔍 Extract minor version from app.json
-        id: minor
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
+      - name: 🍞 Setup Bun
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          result-encoding: string
-          script: |
-            const fs = require('fs-extra');
-            const semver = require('semver');
-            const content = fs.readJsonSync('./app.json');
-            const version = content.expo.version;
-            const minorVersion = semver.minor(version);
-            return minorVersion.toString();
+          # renovate: datasource=npm depName=bun
+          bun-version: "1.3.14"
 
-      - name: 📝 Update bug report version
-        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
-        with:
-          semver: '^0.${{ steps.minor.outputs.result }}.0'
-          dry_run: no-push
+      - name: 🔢 Populate version dropdown from GitHub releases
+        id: populate
+        run: bun scripts/update-issue-form.mjs
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
 
-      - name: ⚙️ Update bug report node version dropdown
-        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
-        with:
-          dropdown: _node_version
-          package: node
-          semver: '>=24.0.0'
-          dry_run: no-push
-
-      - name: 📬 Commit and create pull request
+      - name: 📬 Create pull request
+        id: cpr
         uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
-          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
-          branch: ci-update-bug-report
+          add-paths: .github/ISSUE_TEMPLATE/issue_report.yml
+          branch: ci/update-issue-form
           base: develop
           delete-branch: true
           labels: ⚙️ ci, 🤖 github-actions
-          title: 'chore(): Update bug report template to match release version'
+          commit-message: "chore: update issue form version dropdown"
+          title: "chore: update issue form version dropdown"
+          # Follows .github/pull_request_template.md so the bot PR isn't flagged by PR validation.
           body: |
-            Automated update to `.github/ISSUE_TEMPLATE/bug_report.yml`
-            Triggered by workflow run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            # 📦 Pull Request
+
+            ## 📝 Description
+
+            Automated update of the **Streamyfin Version** dropdown in `.github/ISSUE_TEMPLATE/issue_report.yml`, populated from the latest published GitHub releases by `scripts/update-issue-form.mjs`.
+
+            **Version dropdown now lists:** ${{ steps.populate.outputs.versions }}
+
+            Triggered by `${{ github.event_name }}`${{ github.event.release.tag_name && format(' — release {0}', github.event.release.tag_name) || '' }} · [run ${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
+
+            ## 🏷️ Ticket / Issue
+
+            N/A — automated maintenance.
+
+            ### 🖼️ Screenshots / GIFs (if UI)
+
+            N/A — issue-template metadata only, no app UI.
+
+            ## ✅ Checklist
+
+            - [x] I’ve read the [contribution guidelines](CONTRIBUTING.md)
+            - [x] Verified that changes behave as expected for all platforms
+            - [x] Code passes lint/formatting and type checks (`tsc`/`biome`)
+            - [x] No secrets, hardcoded credentials, or private config files are included
+            - [x] I've declared if AI was used to assist with this PR (by uncommenting the line at the bottom, or not)
+
+            ## 🔍 Testing Instructions
+
+            N/A — generated by CI from published releases; review the dropdown diff in `issue_report.yml`.
+
+      - name: 🔀 Enable auto-merge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        # Known limitation: PRs created with GITHUB_TOKEN don't trigger CI workflows
+        # (GitHub anti-recursion), so the required checks stay "Expected" until a
+        # maintainer kicks them (close/reopen the PR, or push an empty commit).
+        # Auto-merge is still worth enabling: once checks run and reviews land,
+        # the PR merges itself.
+        run: |
+          gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
+            || echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."

.gitignore

@@ -12,10 +12,6 @@ web-build/
 # Platform-specific Build Directories
 /ios
 /android
-/iostv
-/iosmobile
-/androidmobile
-/androidtv
 
 # Gradle caches (top-level + per-module native projects)
 **/.gradle/

CLAUDE.md

@@ -152,7 +152,7 @@ import { apiAtom } from "@/providers/JellyfinProvider";
 
 ## Coding Standards
 
-- Use TypeScript for all files (no .js)
+- Use TypeScript for all files (no .js). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
 - Use functional React components with hooks
 - Use Jotai atoms for global state, React Query for server state
 - Follow BiomeJS formatting rules (2-space indent, semicolons, LF line endings)

GLOBAL_MODAL_GUIDE.md

@@ -143,14 +143,6 @@ interface ModalOptions {
 }
 ```
 
-## Examples
-
-See `components/ExampleGlobalModalUsage.tsx` for comprehensive examples including:
-- Simple content modal
-- Modal with custom snap points
-- Complex component in modal
-- Success/error modals triggered from functions
-
 ## Default Styling
 
 The modal uses these default styles (can be overridden via options):

README.md

@@ -73,7 +73,7 @@ Thanks to [@Alexk2309](https://github.com/Alexk2309) for the hard work building
 
 ## 🛣️ Roadmap
 
-Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
+Check out our [Roadmap](https://github.com/orgs/streamyfin/projects/3/views/1) to see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
 
 ## 📥 Download Streamyfin
 

app.config.js

@@ -1,29 +0,0 @@
-module.exports = ({ config }) => {
-  if (process.env.EXPO_TV !== "1") {
-    config.plugins.push("expo-background-task");
-
-    config.plugins.push([
-      "react-native-google-cast",
-      { useDefaultExpandedMediaControls: true },
-    ]);
-
-    config.plugins.push([
-      "expo-camera",
-      {
-        cameraPermission:
-          "Allow Streamyfin to access the camera to scan QR codes for TV login.",
-      },
-    ]);
-  }
-
-  // Only override googleServicesFile if env var is set
-  const androidConfig = {};
-  if (process.env.GOOGLE_SERVICES_JSON) {
-    androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
-  }
-
-  return {
-    ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
-    ...config,
-  };
-};

app.config.ts

@@ -0,0 +1,79 @@
+// Registers the tsx require hook so the TypeScript config plugins referenced
+// from app.json ("./plugins/*.ts") can be loaded by Node during config evaluation.
+import "tsx/cjs";
+import { execFileSync } from "node:child_process";
+import type { ConfigContext, ExpoConfig } from "expo/config";
+
+// Build metadata, injected into `extra.build` and read at runtime via
+// expo-constants (see utils/version.ts). Sources in priority order:
+// EAS cloud build → GitHub Actions → explicit EXPO_PUBLIC_* → local git → null.
+const git = (args: string[]): string | null => {
+  try {
+    return execFileSync("git", args, { stdio: ["ignore", "pipe", "ignore"] })
+      .toString()
+      .trim();
+  } catch {
+    return null;
+  }
+};
+
+const buildMeta = {
+  commit:
+    (
+      process.env.EAS_BUILD_GIT_COMMIT_HASH ||
+      process.env.GITHUB_SHA ||
+      process.env.EXPO_PUBLIC_GIT_COMMIT ||
+      git(["rev-parse", "HEAD"]) ||
+      ""
+    ).slice(0, 7) || null,
+  branch:
+    process.env.EAS_BUILD_GIT_BRANCH ||
+    process.env.GITHUB_HEAD_REF ||
+    process.env.GITHUB_REF_NAME ||
+    process.env.EXPO_PUBLIC_GIT_BRANCH ||
+    git(["rev-parse", "--abbrev-ref", "HEAD"]) ||
+    null,
+  profile:
+    process.env.EAS_BUILD_PROFILE ||
+    process.env.EXPO_PUBLIC_BUILD_PROFILE ||
+    null,
+  // GitHub Actions run number (#2098) — lets anyone map a sideloaded CI build back
+  // to its Actions run (artifacts + logs) without Expo access. Null outside CI.
+  runNumber:
+    process.env.GITHUB_RUN_NUMBER ||
+    process.env.EXPO_PUBLIC_GIT_RUN_NUMBER ||
+    null,
+  builtAt: new Date().toISOString(),
+};
+
+export default ({ config }: ConfigContext): ExpoConfig => {
+  if (process.env.EXPO_TV !== "1") {
+    config.plugins?.push("expo-background-task");
+
+    config.plugins?.push([
+      "react-native-google-cast",
+      { useDefaultExpandedMediaControls: true },
+    ]);
+
+    config.plugins?.push([
+      "expo-camera",
+      {
+        cameraPermission:
+          "Allow Streamyfin to access the camera to scan QR codes for TV login.",
+      },
+    ]);
+  }
+
+  // Only override googleServicesFile if env var is set
+  const androidConfig: { googleServicesFile?: string } = {};
+  if (process.env.GOOGLE_SERVICES_JSON) {
+    androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
+  }
+
+  config.extra = { ...config.extra, build: buildMeta };
+
+  return {
+    ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
+    ...config,
+  } as ExpoConfig;
+};

app.json

@@ -71,8 +71,8 @@
       ],
       "expo-router",
       "expo-font",
-      "./plugins/withExcludeMedia3Dash.js",
-      "./plugins/withTVUserManagement.js",
+      "./plugins/withExcludeMedia3Dash.ts",
+      "./plugins/withTVUserManagement.ts",
       [
         "expo-build-properties",
         {
@@ -107,6 +107,9 @@
       ],
       "expo-localization",
       "expo-asset",
+      "expo-audio",
+      "expo-image",
+      "expo-sharing",
       [
         "react-native-edge-to-edge",
         {
@@ -131,17 +134,17 @@
         }
       ],
       "expo-web-browser",
-      ["./plugins/with-runtime-framework-headers.js"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withAndroidAlertColors.js"],
-      ["./plugins/withAndroidManifest.js"],
-      ["./plugins/withTrustLocalCerts.js"],
-      ["./plugins/withGradleProperties.js"],
-      ["./plugins/withTVOSAppIcon.js"],
-      ["./plugins/withTVOSTopShelf.js"],
-      ["./plugins/withTVXcodeEnv.js"],
+      ["./plugins/with-runtime-framework-headers.ts"],
+      ["./plugins/withChangeNativeAndroidTextToWhite.ts"],
+      ["./plugins/withAndroidAlertColors.ts"],
+      ["./plugins/withAndroidManifest.ts"],
+      ["./plugins/withTrustLocalCerts.ts"],
+      ["./plugins/withGradleProperties.ts"],
+      ["./plugins/withTVOSAppIcon.ts"],
+      ["./plugins/withTVOSTopShelf.ts"],
+      ["./plugins/withTVXcodeEnv.ts"],
       [
-        "./plugins/withGitPod.js",
+        "./plugins/withGitPod.ts",
         {
           "podName": "MPVKit",
           "podspecUrl": "https://raw.githubusercontent.com/mpv-ios/MPVKit/0.41.0-av/MPVKit.podspec"

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

@@ -5,7 +5,7 @@ import { Image } from "expo-image";
 import { useAtom } from "jotai";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Alert, ScrollView, View } from "react-native";
+import { Alert, Platform, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TVPasswordEntryModal } from "@/components/login/TVPasswordEntryModal";
@@ -33,13 +33,16 @@ import {
 } from "@/providers/JellyfinProvider";
 import {
   AudioTranscodeMode,
+  getActiveVideoPlayer,
   InactivityTimeout,
   type MpvCacheMode,
   type MpvVoDriver,
   TVTypographyScale,
   useSettings,
+  VideoPlayer,
 } from "@/utils/atoms/settings";
 import { storage } from "@/utils/mmkv";
+import { scaleSize } from "@/utils/scaleSize";
 import {
   getPreviousServers,
   type SavedServer,
@@ -262,6 +265,25 @@ export default function SettingsTV() {
   const currentVoDriver = settings.mpvVoDriver ?? "gpu-next";
   const currentLanguage = settings.preferedLanguage;
 
+  // Video player selection. MPV is the default; ExoPlayer is only offered
+  // as an opt-in alternative on Android TV. The selector is hidden on
+  // other platforms.
+  const isAndroidTv = Platform.OS === "android" && Platform.isTV;
+  const currentVideoPlayer = getActiveVideoPlayer(settings);
+  const isMpv = currentVideoPlayer !== VideoPlayer.ExoPlayer;
+
+  // Shared style for the ExoPlayer / MPV limitation notes shown under the
+  // selector when the respective player is active. All pixel values scaled
+  // so the layout holds on 4K TVs (see utils/scaleSize.ts).
+  const playerNoteStyle = {
+    color: "#9CA3AF",
+    fontSize: typography.callout - 2,
+    marginTop: scaleSize(4),
+    marginBottom: scaleSize(12),
+    marginLeft: scaleSize(8),
+    marginRight: scaleSize(8),
+  } as const;
+
   // Audio transcoding options
   const audioTranscodeModeOptions: TVOptionItem<AudioTranscodeMode>[] = useMemo(
     () => [
@@ -391,6 +413,23 @@ export default function SettingsTV() {
     [t, currentVoDriver],
   );
 
+  // Video player backend options (Android TV only)
+  const videoPlayerOptions: TVOptionItem<VideoPlayer>[] = useMemo(
+    () => [
+      {
+        label: t("home.settings.video_player.exoplayer"),
+        value: VideoPlayer.ExoPlayer,
+        selected: currentVideoPlayer === VideoPlayer.ExoPlayer,
+      },
+      {
+        label: t("home.settings.video_player.mpv"),
+        value: VideoPlayer.MPV,
+        selected: currentVideoPlayer === VideoPlayer.MPV,
+      },
+    ],
+    [t, currentVideoPlayer],
+  );
+
   // Typography scale options
   const typographyScaleOptions: TVOptionItem<TVTypographyScale>[] = useMemo(
     () => [
@@ -522,6 +561,11 @@ export default function SettingsTV() {
     return option?.label || t("home.settings.vo_driver.gpu_next");
   }, [voDriverOptions, t]);
 
+  const videoPlayerLabel = useMemo(() => {
+    const option = videoPlayerOptions.find((o) => o.selected);
+    return option?.label || "MPV";
+  }, [videoPlayerOptions]);
+
   const languageLabel = useMemo(() => {
     if (!currentLanguage) return t("home.settings.languages.system");
     const option = APP_LANGUAGES.find((l) => l.value === currentLanguage);
@@ -586,6 +630,34 @@ export default function SettingsTV() {
 
           {/* Audio Section */}
           <TVSectionHeader title={t("home.settings.audio.audio_title")} />
+
+          {/* Video Player selector — Android TV only */}
+          {isAndroidTv && (
+            <>
+              <TVSettingsOptionButton
+                label={t("home.settings.video_player.title")}
+                value={videoPlayerLabel}
+                onPress={() =>
+                  showOptions({
+                    title: t("home.settings.video_player.title"),
+                    options: videoPlayerOptions,
+                    onSelect: (value) => updateSettings({ videoPlayer: value }),
+                  })
+                }
+              />
+              {!isMpv && (
+                <Text style={playerNoteStyle}>
+                  {t("home.settings.video_player.exoplayer_note")}
+                </Text>
+              )}
+              {isMpv && (
+                <Text style={playerNoteStyle}>
+                  {t("home.settings.video_player.mpv_note")}
+                </Text>
+              )}
+            </>
+          )}
+
           <TVSettingsOptionButton
             label={t("home.settings.audio.transcode_mode.title")}
             value={audioTranscodeLabel}
@@ -662,20 +734,23 @@ export default function SettingsTV() {
               updateSettings({ mpvSubtitleMarginY: newValue });
             }}
           />
-          <TVSettingsOptionButton
-            label='Horizontal Alignment'
-            value={alignXLabel}
-            onPress={() =>
-              showOptions({
-                title: "Horizontal Alignment",
-                options: alignXOptions,
-                onSelect: (value) =>
-                  updateSettings({
-                    mpvSubtitleAlignX: value as "left" | "center" | "right",
-                  }),
-              })
-            }
-          />
+          {isMpv && (
+            <TVSettingsOptionButton
+              label='Horizontal Alignment'
+              value={alignXLabel}
+              // ExoPlayer follows authored cue alignment; hide on ExoPlayer.
+              onPress={() =>
+                showOptions({
+                  title: "Horizontal Alignment",
+                  options: alignXOptions,
+                  onSelect: (value) =>
+                    updateSettings({
+                      mpvSubtitleAlignX: value as "left" | "center" | "right",
+                    }),
+                })
+              }
+            />
+          )}
           <TVSettingsOptionButton
             label='Vertical Alignment'
             value={alignYLabel}
@@ -748,19 +823,24 @@ export default function SettingsTV() {
             }
           />
 
-          {/* Video Output Section */}
-          <TVSectionHeader title={t("home.settings.vo_driver.title")} />
-          <TVSettingsOptionButton
-            label={t("home.settings.vo_driver.vo_mode")}
-            value={voDriverLabel}
-            onPress={() =>
-              showOptions({
-                title: t("home.settings.vo_driver.vo_mode"),
-                options: voDriverOptions,
-                onSelect: (value) => updateSettings({ mpvVoDriver: value }),
-              })
-            }
-          />
+          {/* Video Output Section — MPV only (gpu-next/gpu is a libmpv concept) */}
+          {isMpv && (
+            <>
+              <TVSectionHeader title={t("home.settings.vo_driver.title")} />
+              <TVSettingsOptionButton
+                label={t("home.settings.vo_driver.vo_mode")}
+                value={voDriverLabel}
+                onPress={() =>
+                  showOptions({
+                    title: t("home.settings.vo_driver.vo_mode"),
+                    options: voDriverOptions,
+                    onSelect: (value) => updateSettings({ mpvVoDriver: value }),
+                  })
+                }
+              />
+            </>
+          )}
+
           <TVSettingsStepper
             label={t("home.settings.buffer.buffer_duration")}
             value={settings.mpvCacheSeconds ?? 10}

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

@@ -12,11 +12,16 @@ import {
 import { FlashList } from "@shopify/flash-list";
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { Image } from "expo-image";
-import { useLocalSearchParams, useNavigation } from "expo-router";
+import {
+  useFocusEffect,
+  useLocalSearchParams,
+  useNavigation,
+} from "expo-router";
 import { useAtom } from "jotai";
-import React, { useCallback, useEffect, useMemo } from "react";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import {
+  BackHandler,
   FlatList,
   Platform,
   ScrollView,
@@ -80,8 +85,9 @@ const Page = () => {
     sortBy?: string;
     sortOrder?: string;
     filterBy?: string;
+    fromSeeAll?: string;
   };
-  const { libraryId } = searchParams;
+  const { libraryId, fromSeeAll } = searchParams;
 
   const typography = useScaledTVTypography();
   const posterSizes = useScaledTVPosterSizes();
@@ -112,6 +118,22 @@ const Page = () => {
   const { t } = useTranslation();
   const router = useRouter();
   const { showOptions } = useTVOptionModal();
+
+  // When this library detail was opened from the home "See All" button, its
+  // libraries stack is just [detail], so the default TV Back would exit to home.
+  // Intercept Back (scoped to while this screen is focused via useFocusEffect) and
+  // route to the library list instead, so the user can switch libraries. Normal
+  // entries from the list keep their native pop-to-list behavior.
+  useFocusEffect(
+    useCallback(() => {
+      if (!Platform.isTV || fromSeeAll !== "true") return;
+      const sub = BackHandler.addEventListener("hardwareBackPress", () => {
+        router.replace("/(auth)/(tabs)/(libraries)");
+        return true;
+      });
+      return () => sub.remove();
+    }, [fromSeeAll, router]),
+  );
   const { showItemActions } = useTVItemActionModal();
 
   // TV Filter queries
@@ -269,6 +291,23 @@ const Page = () => {
     });
   }, [library]);
 
+  // If this See-All detail was deep-linked on top of the libraries index, collapse
+  // the libraries stack to just this screen. Otherwise the stack is [index, detail],
+  // which the native bottom tab reliably auto-pops back to the index (the detail
+  // "bounces" to the library list ~0.5s after opening). With [detail] alone it stays
+  // put, and Back is handled explicitly by the fromSeeAll interceptor above.
+  const didCollapseRef = useRef(false);
+  useEffect(() => {
+    if (!Platform.isTV || fromSeeAll !== "true" || didCollapseRef.current)
+      return;
+    const state = navigation.getState();
+    if (state?.routes && state.routes.length > 1) {
+      didCollapseRef.current = true;
+      const top = state.routes[state.routes.length - 1];
+      navigation.reset({ index: 0, routes: [top] } as any);
+    }
+  }, [navigation, fromSeeAll]);
+
   const fetchItems = useCallback(
     async ({
       pageParam,

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

@@ -305,6 +305,8 @@ export default function SearchPage() {
         },
         hideWhenScrolling: false,
         autoFocus: false,
+        // Android: color of the user-typed text (was dark and unreadable on the dark header)
+        textColor: "#fff",
         // Android: placeholder and icon color
         hintTextColor: "#fff",
         headerIconColor: "#fff",

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

@@ -3,16 +3,24 @@ import {
   type NativeBottomTabNavigationEventMap,
   type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { withLayoutContext } from "expo-router";
+import { Stack, useSegments, withLayoutContext } from "expo-router";
 import type {
   ParamListBase,
   TabNavigationState,
 } from "expo-router/react-navigation";
+import { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
+import type { TVNavBarTab } from "@/components/tv/TVNavBar";
+import { TVNavBar } from "@/components/tv/TVNavBar";
 import { Colors } from "@/constants/Colors";
-import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
+import useRouter from "@/hooks/useAppRouter";
+import {
+  isTabRoute,
+  useTVHomeBackHandler,
+  useTVTabRootBackHandler,
+} from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
 
@@ -33,13 +41,108 @@ export const NativeTabs = withLayoutContext<
   NativeBottomTabNavigationEventMap
 >(Navigator);
 
+const IS_ANDROID_TV = Platform.isTV && Platform.OS === "android";
+
+function TVTabLayout() {
+  const { settings } = useSettings();
+  const { t } = useTranslation();
+  const segments = useSegments();
+  const router = useRouter();
+
+  const currentTab = segments.find(isTabRoute);
+  const lastSegment = segments[segments.length - 1] ?? "";
+  const atTabRoot = isTabRoute(lastSegment) || lastSegment === "index";
+
+  const tabs: TVNavBarTab[] = useMemo(
+    () =>
+      [
+        { key: "(home)", label: t("tabs.home") },
+        { key: "(search)", label: t("tabs.search") },
+        { key: "(favorites)", label: t("tabs.favorites") },
+        !settings?.streamyStatsServerUrl || settings?.hideWatchlistsTab
+          ? null
+          : { key: "(watchlists)", label: t("watchlists.title") },
+        { key: "(libraries)", label: t("tabs.library") },
+        !settings?.showCustomMenuLinks
+          ? null
+          : { key: "(custom-links)", label: t("tabs.custom_links") },
+        { key: "(settings)", label: t("tabs.settings") },
+      ].filter((tab): tab is TVNavBarTab => tab !== null),
+    [
+      settings?.streamyStatsServerUrl,
+      settings?.hideWatchlistsTab,
+      settings?.showCustomMenuLinks,
+      t,
+    ],
+  );
+
+  const activeTabKey = currentTab ?? "(home)";
+
+  const visibleKeys = useMemo(
+    () => new Set(tabs.map((tab) => tab.key)),
+    [tabs],
+  );
+
+  const handleTabChange = useCallback(
+    (key: string) => {
+      if (key === currentTab) return;
+
+      if (key === "(home)") eventBus.emit("scrollToTop");
+      if (key === "(search)") eventBus.emit("searchTabPressed");
+
+      router.replace(`/(auth)/(tabs)/${key}`);
+    },
+    [currentTab, router],
+  );
+
+  const navigateHome = useCallback(() => {
+    router.replace("/(auth)/(tabs)/(home)");
+  }, [router]);
+  useTVTabRootBackHandler(navigateHome, atTabRoot, currentTab);
+
+  // If current tab is no longer visible (setting changed), navigate to home
+  useEffect(() => {
+    if (!visibleKeys.has(activeTabKey) && activeTabKey !== "(home)") {
+      router.replace("/(auth)/(tabs)/(home)");
+    }
+  }, [visibleKeys, activeTabKey, router]);
+
+  return (
+    <View style={{ flex: 1 }}>
+      <SystemBars hidden={false} style='light' />
+      <Stack
+        screenOptions={{ headerShown: false, animation: "none" }}
+        initialRouteName='(home)'
+      >
+        <Stack.Screen name='index' redirect />
+      </Stack>
+      <TVNavBar
+        tabs={tabs}
+        activeTabKey={activeTabKey}
+        onTabChange={handleTabChange}
+        style={{
+          position: "absolute",
+          top: 0,
+          left: 0,
+          right: 0,
+          zIndex: 1000,
+        }}
+      />
+    </View>
+  );
+}
+
 export default function TabLayout() {
   const { settings } = useSettings();
   const { t } = useTranslation();
 
-  // Handle TV back button - prevent app exit when at root
+  // Must be called before any conditional return (rules of hooks)
   useTVHomeBackHandler();
 
+  if (IS_ANDROID_TV) {
+    return <TVTabLayout />;
+  }
+
   return (
     <View style={{ flex: 1 }}>
       <SystemBars hidden={false} style='light' />

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

@@ -29,6 +29,7 @@ import {
   PlaybackSpeedScope,
   updatePlaybackSpeedSettings,
 } from "@/components/video-player/controls/utils/playback-speed-settings";
+import { VideoPlayerView } from "@/components/video-player/VideoPlayerView";
 import useRouter from "@/hooks/useAppRouter";
 import { useHaptic } from "@/hooks/useHaptic";
 import { useOrientation } from "@/hooks/useOrientation";
@@ -40,7 +41,6 @@ import {
   type MpvOnErrorEventPayload,
   type MpvOnPlaybackStateChangePayload,
   type MpvOnProgressEventPayload,
-  MpvPlayerView,
   type MpvPlayerViewRef,
   type MpvVideoSource,
 } from "@/modules";
@@ -51,7 +51,7 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
 
 import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
-import { useSettings } from "@/utils/atoms/settings";
+import { getActivePlayerType, useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
@@ -364,7 +364,13 @@ export default function DirectPlayerPage() {
             maxStreamingBitrate: bitrateValue,
             mediaSourceId: mediaSourceId,
             subtitleStreamIndex: subtitleIndex,
-            deviceProfile: generateDeviceProfile(),
+            // Match the device profile to the player that will render the
+            // stream so the server picks a codec/container the player can
+            // actually decode.
+            deviceProfile: generateDeviceProfile({
+              player: getActivePlayerType(settings),
+              audioMode: settings.audioTranscodeMode,
+            }),
           });
           if (!res) return null;
           const { mediaSource, sessionId, url, requiredHttpHeaders } = res;
@@ -456,10 +462,23 @@ export default function DirectPlayerPage() {
     });
     reportPlaybackStopped();
     setIsPlaybackStopped(true);
-    videoRef.current?.pause();
+    // Synchronously destroy the mpv instance + decoder + surface buffers
+    // BEFORE the screen unmounts. Otherwise the next screen (or the next
+    // episode's player) mounts while the old 4K decoder is still alive,
+    // causing OOM on low-RAM devices. Native stop() is idempotent so the
+    // later React unmount cleanup is still safe.
+    videoRef.current?.destroy().catch(() => {});
+    // Pre-libmpv-1.0 used `stop()`:
+    // videoRef.current?.stop();
     revalidateProgressCache();
     // Resume inactivity timer when leaving player (TV only)
     resumeInactivityTimer();
+    // Release the keep-awake wakelock acquired during playback so it
+    // doesn't follow us back to the home screen and block the TV
+    // screensaver. activateKeepAwakeAsync() is tag-scoped to this module
+    // and only released on the "paused" event; without this, navigating
+    // away mid-play leaves FLAG_KEEP_SCREEN_ON set on the window.
+    deactivateKeepAwake();
   }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);
 
   useEffect(() => {
@@ -1105,6 +1124,15 @@ export default function DirectPlayerPage() {
         nextItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
     }).toString();
 
+    // Destroy the current mpv instance BEFORE navigating so the old 4K
+    // decoder + surface buffers are freed before the new player screen
+    // mounts. Without this, Expo Router briefly holds two simultaneous
+    // mpv instances during the transition (~768 MB of surface buffers
+    // for two 4K HDR10+ decoders) and OOM-kills the app on low-RAM
+    // devices. Native stop() is idempotent so the subsequent React
+    // unmount cleanup is still safe.
+    videoRef.current?.destroy().catch(() => {});
+
     router.replace(`player/direct-player?${queryParams}` as any);
   }, [
     nextItem,
@@ -1115,6 +1143,7 @@ export default function DirectPlayerPage() {
     bitrateValue,
     router,
     isPlaybackStopped,
+    videoRef,
   ]);
 
   // Apply subtitle settings when video loads
@@ -1254,7 +1283,7 @@ export default function DirectPlayerPage() {
                 justifyContent: "center",
               }}
             >
-              <MpvPlayerView
+              <VideoPlayerView
                 ref={videoRef}
                 source={videoSource}
                 style={{ width: "100%", height: "100%" }}

app/_layout.tsx

@@ -7,6 +7,7 @@ import { onlineManager, QueryClient } from "@tanstack/react-query";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import * as BackgroundTask from "expo-background-task";
 import * as Device from "expo-device";
+import { Image } from "expo-image";
 import { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
@@ -100,6 +101,22 @@ SplashScreen.setOptions({
   fade: true,
 });
 
+// Cap expo-image's in-memory cache. Default is unbounded (maxMemoryCost=0),
+// which on a 2GB Android TV box leads to ~200MB of decoded backdrops/posters
+// pinned in RAM after browsing. Caps are intentionally tighter on TV (which
+// has less RAM and runs alongside libmpv/MediaCodec) than on mobile.
+// Cost is measured in bytes of decoded bitmap (ARGB8888 = 4 bytes/pixel).
+try {
+  Image.configureCache({
+    maxMemoryCost: Platform.isTV
+      ? 8 * 1024 * 1024 // ~8 MB on TV
+      : 128 * 1024 * 1024, // ~128 MB on mobile
+    maxDiskSize: 200 * 1024 * 1024, // 200 MB disk cache on all platforms
+  });
+} catch {
+  // configureCache is a no-op on some platforms/versions; safe to ignore.
+}
+
 function useNotificationObserver() {
   const router = useRouter();
 

augmentations/index.ts

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

augmentations/number.ts

@@ -3,7 +3,6 @@ declare global {
     bytesToReadable(decimals?: number): string;
     secondsToMilliseconds(): number;
     minutesToMilliseconds(): number;
-    hoursToMilliseconds(): number;
   }
 }
 
@@ -28,8 +27,4 @@ Number.prototype.minutesToMilliseconds = function () {
   return this.valueOf() * (60).secondsToMilliseconds();
 };
 
-Number.prototype.hoursToMilliseconds = function () {
-  return this.valueOf() * (60).minutesToMilliseconds();
-};
-
 export {};

augmentations/string.ts

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

components/ExampleGlobalModalUsage.tsx

@@ -1,203 +0,0 @@
-/**
- * Example Usage of Global Modal
- *
- * This file demonstrates how to use the global modal system from anywhere in your app.
- * You can delete this file after understanding how it works.
- */
-
-import { Ionicons } from "@expo/vector-icons";
-import { TouchableOpacity, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useGlobalModal } from "@/providers/GlobalModalProvider";
-
-/**
- * Example 1: Simple Content Modal
- */
-export const SimpleModalExample = () => {
-  const { showModal } = useGlobalModal();
-
-  const handleOpenModal = () => {
-    showModal(
-      <View className='p-6'>
-        <Text className='text-2xl font-bold mb-4 text-white'>Simple Modal</Text>
-        <Text className='text-white mb-4'>
-          This is a simple modal with just some text content.
-        </Text>
-        <Text className='text-neutral-400'>
-          Swipe down or tap outside to close.
-        </Text>
-      </View>,
-    );
-  };
-
-  return (
-    <TouchableOpacity
-      onPress={handleOpenModal}
-      className='bg-purple-600 px-4 py-2 rounded-lg'
-    >
-      <Text className='text-white font-semibold'>Open Simple Modal</Text>
-    </TouchableOpacity>
-  );
-};
-
-/**
- * Example 2: Modal with Custom Snap Points
- */
-export const CustomSnapPointsExample = () => {
-  const { showModal } = useGlobalModal();
-
-  const handleOpenModal = () => {
-    showModal(
-      <View className='p-6' style={{ minHeight: 400 }}>
-        <Text className='text-2xl font-bold mb-4 text-white'>
-          Custom Snap Points
-        </Text>
-        <Text className='text-white mb-4'>
-          This modal has custom snap points (25%, 50%, 90%).
-        </Text>
-        <View className='bg-neutral-800 p-4 rounded-lg'>
-          <Text className='text-white'>
-            Try dragging the modal to different heights!
-          </Text>
-        </View>
-      </View>,
-      {
-        snapPoints: ["25%", "50%", "90%"],
-        enableDynamicSizing: false,
-      },
-    );
-  };
-
-  return (
-    <TouchableOpacity
-      onPress={handleOpenModal}
-      className='bg-blue-600 px-4 py-2 rounded-lg'
-    >
-      <Text className='text-white font-semibold'>Custom Snap Points</Text>
-    </TouchableOpacity>
-  );
-};
-
-/**
- * Example 3: Complex Component in Modal
- */
-const SettingsModalContent = () => {
-  const { hideModal } = useGlobalModal();
-
-  const settings = [
-    {
-      id: 1,
-      title: "Notifications",
-      icon: "notifications-outline" as const,
-      enabled: true,
-    },
-    { id: 2, title: "Dark Mode", icon: "moon-outline" as const, enabled: true },
-    {
-      id: 3,
-      title: "Auto-play",
-      icon: "play-outline" as const,
-      enabled: false,
-    },
-  ];
-
-  return (
-    <View className='p-6'>
-      <Text className='text-2xl font-bold mb-6 text-white'>Settings</Text>
-
-      {settings.map((setting, index) => (
-        <View
-          key={setting.id}
-          className={`flex-row items-center justify-between py-4 ${
-            index !== settings.length - 1 ? "border-b border-neutral-700" : ""
-          }`}
-        >
-          <View className='flex-row items-center gap-3'>
-            <Ionicons name={setting.icon} size={24} color='white' />
-            <Text className='text-white text-lg'>{setting.title}</Text>
-          </View>
-          <View
-            className={`w-12 h-7 rounded-full ${
-              setting.enabled ? "bg-purple-600" : "bg-neutral-600"
-            }`}
-          >
-            <View
-              className={`w-5 h-5 rounded-full bg-white shadow-md transform ${
-                setting.enabled ? "translate-x-6" : "translate-x-1"
-              }`}
-              style={{ marginTop: 4 }}
-            />
-          </View>
-        </View>
-      ))}
-
-      <TouchableOpacity
-        onPress={hideModal}
-        className='bg-purple-600 px-4 py-3 rounded-lg mt-6'
-      >
-        <Text className='text-white font-semibold text-center'>Close</Text>
-      </TouchableOpacity>
-    </View>
-  );
-};
-
-export const ComplexModalExample = () => {
-  const { showModal } = useGlobalModal();
-
-  const handleOpenModal = () => {
-    showModal(<SettingsModalContent />);
-  };
-
-  return (
-    <TouchableOpacity
-      onPress={handleOpenModal}
-      className='bg-green-600 px-4 py-2 rounded-lg'
-    >
-      <Text className='text-white font-semibold'>Complex Component</Text>
-    </TouchableOpacity>
-  );
-};
-
-/**
- * Example 4: Modal Triggered from Function (e.g., API response)
- */
-export const useShowSuccessModal = () => {
-  const { showModal } = useGlobalModal();
-
-  return (message: string) => {
-    showModal(
-      <View className='p-6 items-center'>
-        <View className='bg-green-500 rounded-full p-4 mb-4'>
-          <Ionicons name='checkmark' size={48} color='white' />
-        </View>
-        <Text className='text-2xl font-bold mb-2 text-white'>Success!</Text>
-        <Text className='text-white text-center'>{message}</Text>
-      </View>,
-    );
-  };
-};
-
-/**
- * Main Demo Component
- */
-export const GlobalModalDemo = () => {
-  const showSuccess = useShowSuccessModal();
-
-  return (
-    <View className='p-6 gap-4'>
-      <Text className='text-2xl font-bold mb-4 text-white'>
-        Global Modal Examples
-      </Text>
-
-      <SimpleModalExample />
-      <CustomSnapPointsExample />
-      <ComplexModalExample />
-
-      <TouchableOpacity
-        onPress={() => showSuccess("Operation completed successfully!")}
-        className='bg-orange-600 px-4 py-2 rounded-lg'
-      >
-        <Text className='text-white font-semibold'>Show Success Modal</Text>
-      </TouchableOpacity>
-    </View>
-  );
-};

components/TrackSheet.tsx

@@ -26,7 +26,7 @@ export const TrackSheet: React.FC<Props> = ({
 
   const streams = useMemo(
     () => source?.MediaStreams?.filter((x) => x.Type === streamType),
-    [source],
+    [source, streamType],
   );
 
   const selectedSteam = useMemo(

components/common/LargePoster.tsx

@@ -1,20 +0,0 @@
-import { Image } from "expo-image";
-import { View } from "react-native";
-
-export const LargePoster: React.FC<{ url?: string | null }> = ({ url }) => {
-  if (!url)
-    return (
-      <View className='p-4 rounded-xl overflow-hidden '>
-        <View className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800' />
-      </View>
-    );
-
-  return (
-    <View className='p-4 rounded-xl overflow-hidden '>
-      <Image
-        source={{ uri: url }}
-        className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800'
-      />
-    </View>
-  );
-};

components/common/VerticalSkeleton.tsx

@@ -1,28 +0,0 @@
-import { View, type ViewProps } from "react-native";
-
-interface Props extends ViewProps {
-  index: number;
-}
-
-export const VerticalSkeleton: React.FC<Props> = ({ index, ...props }) => {
-  return (
-    <View
-      key={index}
-      style={{
-        width: "32%",
-      }}
-      className='flex flex-col'
-      {...props}
-    >
-      <View
-        style={{
-          aspectRatio: "10/15",
-        }}
-        className='w-full bg-neutral-800 mb-2 rounded-lg'
-      />
-      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
-      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
-      <View className='h-2 bg-neutral-800 rounded-full mb-2 w-1/2' />
-    </View>
-  );
-};

components/home/Home.tv.tsx

@@ -140,9 +140,11 @@ export const Home = () => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Prefetch the image before starting the crossfade
+      // Prefetch to disk only - the full-size 1920x1080 backdrop (~8MB
+      // decoded ARGB) is too large to pin in the memory cache on every
+      // focus change. Disk cache is fast enough for a 500ms crossfade.
       try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
       } catch {
         // Continue even if prefetch fails
       }

components/home/InfiniteScrollingCollectionList.tv.tsx

@@ -201,12 +201,18 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
 
   const handleSeeAllPress = useCallback(() => {
     if (!parentId) return;
+    // Navigate into the library detail (lives in the libraries tab) sorted by most
+    // recently added. The `fromSeeAll` flag tells the detail page to (a) collapse
+    // the libraries stack so the native tab can't auto-pop it back to the list, and
+    // (b) intercept Back to route to the library list so the user can switch
+    // libraries. See app/(auth)/(tabs)/(libraries)/[libraryId].tsx.
     router.push({
-      pathname: "/(auth)/(tabs)/(libraries)/[libraryId]",
+      pathname: "/[libraryId]",
       params: {
         libraryId: parentId,
         sortBy: SortByOption.DateCreated,
         sortOrder: SortOrderOption.Descending,
+        fromSeeAll: "true",
       },
     } as any);
   }, [router, parentId]);
@@ -326,9 +332,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           showsHorizontalScrollIndicator={false}
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.5}
-          initialNumToRender={5}
-          maxToRenderPerBatch={3}
-          windowSize={5}
+          initialNumToRender={4}
+          maxToRenderPerBatch={2}
+          windowSize={3}
           removeClippedSubviews={false}
           maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
           style={{ overflow: "visible" }}
@@ -348,11 +354,14 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           // contentOffset={{ x: -sizes.padding.horizontal, y: 0 }}
           // contentContainerStyle={{ paddingVertical: SCALE_PADDING }}
           ListFooterComponent={
+            // No fixed width: the footer must size to the "See All" card so the
+            // FlatList's scrollable content extends to fully reveal it. A fixed
+            // (narrow) width clipped the card at the right edge. Trailing space is
+            // provided by contentContainerStyle.paddingRight.
             <View
               style={{
                 flexDirection: "row",
                 alignItems: "center",
-                width: sizes.padding.horizontal,
               }}
             >
               {isFetchingNextPage && (

components/home/TVHeroCarousel.tsx

@@ -256,8 +256,11 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
     let isCancelled = false;
 
     const performCrossfade = async () => {
+      // Disk-only prefetch: backdrops are ~8MB decoded ARGB; keeping them
+      // out of the memory cache avoids bloat when the user cycles through
+      // hero items quickly.
       try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
       } catch {
         // Continue even if prefetch fails
       }
@@ -379,7 +382,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
   if (items.length === 0) return null;
 
   // Extra top padding for tvOS to clear the menu bar
-  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
+  const tvosTopPadding = scaleSize(145);
   const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;
 
   return (

components/library/LibraryItemCard.tsx

@@ -51,7 +51,7 @@ export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
         api,
         item: library,
       }),
-    [library],
+    [api, library],
   );
 
   const itemType = useMemo(() => {

components/navigation/TabBarIcon.tsx

@@ -1,12 +0,0 @@
-// You can explore the built-in icon families and icons on the web at https://icons.expo.fyi/
-
-import type { IconProps } from "@expo/vector-icons/build/createIconSet";
-import Ionicons from "@expo/vector-icons/Ionicons";
-import type { ComponentProps } from "react";
-
-export function TabBarIcon({
-  style,
-  ...rest
-}: IconProps<ComponentProps<typeof Ionicons>["name"]>) {
-  return <Ionicons size={26} style={[{ marginBottom: -3 }, style]} {...rest} />;
-}

components/persons/TVActorPage.tsx

@@ -156,9 +156,9 @@ export const TVActorPage: React.FC<TVActorPageProps> = ({ personId }) => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Prefetch the image before starting the crossfade
+      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
       try {
-        await Image.prefetch(backdropUrl);
+        await Image.prefetch(backdropUrl, "disk");
       } catch {
         // Continue even if prefetch fails
       }

components/posters/EpisodePoster.tsx

@@ -1,63 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo, useState } from "react";
-import { View } from "react-native";
-import { WatchedIndicator } from "@/components/WatchedIndicator";
-import { apiAtom } from "@/providers/JellyfinProvider";
-
-type MoviePosterProps = {
-  item: BaseItemDto;
-  showProgress?: boolean;
-};
-
-export const EpisodePoster: React.FC<MoviePosterProps> = ({
-  item,
-  showProgress = false,
-}) => {
-  const [api] = useAtom(apiAtom);
-
-  const url = useMemo(() => {
-    if (item.Type === "Episode") {
-      return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
-    }
-  }, [item]);
-
-  const [progress, _setProgress] = useState(
-    item.UserData?.PlayedPercentage || 0,
-  );
-
-  const blurhash = useMemo(() => {
-    const key = item.ImageTags?.Primary as string;
-    return item.ImageBlurHashes?.Primary?.[key];
-  }, [item]);
-
-  return (
-    <View className='relative rounded-lg overflow-hidden border border-neutral-900'>
-      <Image
-        placeholder={{
-          blurhash,
-        }}
-        key={item.Id}
-        id={item.Id}
-        source={
-          url
-            ? {
-                uri: url,
-              }
-            : null
-        }
-        cachePolicy={"memory-disk"}
-        contentFit='cover'
-        style={{
-          aspectRatio: "10/15",
-          width: "100%",
-        }}
-      />
-      <WatchedIndicator item={item} />
-      {showProgress && progress > 0 && (
-        <View className='h-1 bg-red-600 w-full' />
-      )}
-    </View>
-  );
-};

components/posters/ParentPoster.tsx

@@ -1,48 +0,0 @@
-import { Image } from "expo-image";
-import { useAtom } from "jotai";
-import { useMemo } from "react";
-import { View } from "react-native";
-import { apiAtom } from "@/providers/JellyfinProvider";
-
-type PosterProps = {
-  id?: string;
-  showProgress?: boolean;
-};
-
-const ParentPoster: React.FC<PosterProps> = ({ id }) => {
-  const [api] = useAtom(apiAtom);
-
-  const url = useMemo(
-    () => `${api?.basePath}/Items/${id}/Images/Primary`,
-    [id],
-  );
-
-  if (!url || !id)
-    return (
-      <View
-        className='border border-neutral-900'
-        style={{
-          aspectRatio: "10/15",
-        }}
-      />
-    );
-
-  return (
-    <View className='rounded-lg overflow-hidden border border-neutral-900'>
-      <Image
-        key={id}
-        id={id}
-        source={{
-          uri: url,
-        }}
-        cachePolicy={"memory-disk"}
-        contentFit='cover'
-        style={{
-          aspectRatio: "10/15",
-        }}
-      />
-    </View>
-  );
-};
-
-export default ParentPoster;

components/search/TVSearchPage.tsx

@@ -2,7 +2,7 @@ import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { useAtom } from "jotai";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { ScrollView, View } from "react-native";
+import { Platform, ScrollView, TextInput, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TVDiscover } from "@/components/jellyseerr/discover/TVDiscover";
@@ -231,26 +231,48 @@ export const TVSearchPage: React.FC<TVSearchPageProps> = ({
           paddingTop: insets.top + TOP_PADDING,
         }}
       >
-        {/* Native tvOS search field (SwiftUI `.searchable`, our `tv-search`
-            module). It renders the native search bar + grid keyboard and
-            forwards typed text into the existing query pipeline via setSearch;
-            our own results grid renders below. */}
-        {/* No horizontal margin here: the native tvOS search bar centers itself
-            and renders a trailing "Hold to Dictate in <Language>" hint. Extra
-            margins squeeze the bar's width and clip that trailing hint, so let
-            the native view span the full width and own its own insets. */}
-        <View
-          style={{
-            marginBottom: 24,
-            height: SEARCH_AREA_HEIGHT,
-          }}
-        >
-          <TvSearchView
-            style={{ width: "100%", height: "100%" }}
-            placeholder={t("search.search")}
-            onChangeText={(e) => setSearch(e.nativeEvent.text)}
-          />
-        </View>
+        {/* Search bar: native tvOS SwiftUI `.searchable` on Apple TV, standard
+            TextInput fallback on Android TV (the native module is Apple-only). */}
+        {Platform.OS === "ios" ? (
+          <View
+            style={{
+              marginBottom: 24,
+              height: SEARCH_AREA_HEIGHT,
+            }}
+          >
+            {/* No horizontal margin here: the native tvOS search bar centers
+                itself and renders a trailing "Hold to Dictate" hint. */}
+            <TvSearchView
+              style={{ width: "100%", height: "100%" }}
+              placeholder={t("search.search")}
+              onChangeText={(e) => setSearch(e.nativeEvent.text)}
+            />
+          </View>
+        ) : (
+          <View
+            style={{
+              marginHorizontal: HORIZONTAL_PADDING,
+              marginBottom: 24,
+            }}
+          >
+            <TextInput
+              style={{
+                height: 56,
+                width: "100%",
+                backgroundColor: "#262626",
+                borderRadius: 12,
+                paddingHorizontal: 20,
+                fontSize: 28,
+                color: "#fff",
+              }}
+              placeholder={t("search.search")}
+              placeholderTextColor='rgba(255,255,255,0.4)'
+              onChangeText={setSearch}
+              defaultValue=''
+              autoFocus={false}
+            />
+          </View>
+        )}
       </View>
 
       <ScrollView

components/settings/Dashboard.tsx

@@ -1,29 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import useRouter from "@/hooks/useAppRouter";
-import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
-import { useSettings } from "@/utils/atoms/settings";
-import { ListGroup } from "../list/ListGroup";
-import { ListItem } from "../list/ListItem";
-
-export const Dashboard = () => {
-  const { settings } = useSettings();
-  const { sessions = [] } = useSessions({} as useSessionsProps);
-  const router = useRouter();
-
-  const { t } = useTranslation();
-
-  if (!settings) return null;
-  return (
-    <View>
-      <ListGroup title={t("home.settings.dashboard.title")} className='mt-4'>
-        <ListItem
-          className={sessions.length !== 0 ? "bg-purple-900" : ""}
-          onPress={() => router.push("/settings/dashboard/sessions")}
-          title={t("home.settings.dashboard.sessions_title")}
-          showArrow
-        />
-      </ListGroup>
-    </View>
-  );
-};

components/settings/DownloadSettings.tsx

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

components/settings/DownloadSettings.tv.tsx

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

components/settings/Jellyseerr.tsx

@@ -115,9 +115,6 @@ export const JellyseerrSettings = () => {
           </>
         ) : (
           <View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'>
-            <Text className='text-xs text-red-600 mb-2'>
-              {t("home.settings.plugins.jellyseerr.jellyseerr_warning")}
-            </Text>
             <Text className='font-bold mb-1'>
               {t("home.settings.plugins.jellyseerr.server_url")}
             </Text>

components/settings/UserInfo.tsx

@@ -1,8 +1,8 @@
-import * as Application from "expo-application";
 import { useAtom } from "jotai";
 import { useTranslation } from "react-i18next";
 import { View, type ViewProps } from "react-native";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
+import { getVersionInfo } from "@/utils/version";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
@@ -13,10 +13,9 @@ export const UserInfo: React.FC<Props> = ({ ...props }) => {
   const [user] = useAtom(userAtom);
   const { t } = useTranslation();
 
-  const version =
-    Application?.nativeApplicationVersion ||
-    Application?.nativeBuildVersion ||
-    "N/A";
+  // Graduated build identifier — see utils/version.ts:
+  // dev → "0.54.1 · branch · commit", develop/CI → "0.54.1 · commit · #run", production → "0.54.1".
+  const { display: version } = getVersionInfo();
 
   return (
     <View {...props}>

components/tv/TVNavBar.tsx

@@ -0,0 +1,155 @@
+import React from "react";
+import {
+  Animated,
+  Pressable,
+  ScrollView,
+  StyleProp,
+  View,
+  ViewStyle,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
+import { TVPadding } from "@/constants/TVSizes";
+import { useScaledTVTypography } from "@/constants/TVTypography";
+import { scaleSize } from "@/utils/scaleSize";
+
+export interface TVNavBarTab {
+  key: string;
+  label: string;
+}
+
+export interface TVNavBarProps {
+  tabs: TVNavBarTab[];
+  activeTabKey: string;
+  onTabChange: (key: string) => void;
+  style?: StyleProp<ViewStyle>;
+}
+
+const TVNavBarTabItem: React.FC<{
+  label: string;
+  isActive: boolean;
+  onSelect: () => void;
+  onLayout: (e: {
+    nativeEvent: { layout: { x: number; width: number } };
+  }) => void;
+  hasTVPreferredFocus: boolean;
+}> = ({ label, isActive, onSelect, onLayout, hasTVPreferredFocus }) => {
+  const typography = useScaledTVTypography();
+  const { focused, handleFocus, handleBlur, animatedStyle } =
+    useTVFocusAnimation({
+      scaleAmount: 1.05,
+      duration: 120,
+    });
+
+  const bg = focused
+    ? "rgba(255, 255, 255, 0.95)"
+    : isActive
+      ? "rgba(255, 255, 255, 0.15)"
+      : "transparent";
+
+  const textColor = focused
+    ? "#000"
+    : isActive
+      ? "#fff"
+      : "rgba(255, 255, 255, 0.7)";
+
+  return (
+    <Pressable
+      onPress={onSelect}
+      onFocus={handleFocus}
+      onBlur={handleBlur}
+      hasTVPreferredFocus={hasTVPreferredFocus}
+      onLayout={onLayout}
+    >
+      <Animated.View
+        style={[
+          animatedStyle,
+          {
+            backgroundColor: bg,
+            borderRadius: scaleSize(24),
+            borderWidth: isActive && !focused ? 1 : 0,
+            borderColor: "rgba(255, 255, 255, 0.3)",
+            paddingHorizontal: scaleSize(28),
+            paddingVertical: scaleSize(14),
+          },
+        ]}
+      >
+        <Text
+          style={{
+            fontSize: typography.heading,
+            color: textColor,
+            fontWeight: isActive || focused ? "600" : "400",
+          }}
+        >
+          {label}
+        </Text>
+      </Animated.View>
+    </Pressable>
+  );
+};
+
+export const TVNavBar: React.FC<TVNavBarProps> = ({
+  tabs,
+  activeTabKey,
+  onTabChange,
+  style,
+}) => {
+  const scrollRef = React.useRef<ScrollView>(null);
+  const tabLayouts = React.useRef<Record<string, { x: number; width: number }>>(
+    {},
+  );
+  const insets = useSafeAreaInsets();
+
+  const handleTabLayout = React.useCallback(
+    (key: string) =>
+      (e: { nativeEvent: { layout: { x: number; width: number } } }) => {
+        tabLayouts.current[key] = e.nativeEvent.layout;
+      },
+    [],
+  );
+
+  const handleTabChange = React.useCallback(
+    (key: string) => {
+      onTabChange(key);
+
+      const layout = tabLayouts.current[key];
+      if (layout && scrollRef.current) {
+        scrollRef.current.scrollTo({
+          x: Math.max(0, layout.x - TVPadding.horizontal / 2),
+          animated: true,
+        });
+      }
+    },
+    [onTabChange],
+  );
+
+  if (tabs.length === 0) return null;
+
+  return (
+    <View style={[{ paddingTop: insets.top + 16, paddingBottom: 8 }, style]}>
+      <ScrollView
+        ref={scrollRef}
+        horizontal
+        showsHorizontalScrollIndicator={false}
+        keyboardShouldPersistTaps='handled'
+        contentContainerStyle={{
+          flexGrow: 1,
+          justifyContent: "center",
+          gap: scaleSize(12),
+        }}
+      >
+        {tabs.map((tab) => (
+          <TVNavBarTabItem
+            key={tab.key}
+            label={tab.label}
+            isActive={tab.key === activeTabKey}
+            onSelect={() => handleTabChange(tab.key)}
+            onLayout={handleTabLayout(tab.key)}
+            hasTVPreferredFocus={tab.key === activeTabKey}
+          />
+        ))}
+      </ScrollView>
+    </View>
+  );
+};

components/tv/TVNextEpisodeCountdown.tsx

@@ -44,8 +44,10 @@ export interface TVNextEpisodeCountdownProps {
   playButtonRef?: RNView | null;
 }
 
-// Position constants
-const BOTTOM_WITH_CONTROLS = scaleSize(300);
+// Position constants — kept in sync with TVSkipSegmentCard (the two are
+// mutually exclusive). See TVSkipSegmentCard for the BOTTOM_WITH_CONTROLS
+// rationale (220 sits just above the controls bar; 300 floated too high).
+const BOTTOM_WITH_CONTROLS = scaleSize(220);
 const BOTTOM_WITHOUT_CONTROLS = scaleSize(120);
 
 export const TVNextEpisodeCountdown: FC<TVNextEpisodeCountdownProps> = ({

components/tv/TVPosterCard.tsx

@@ -448,8 +448,8 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
         <Image
           placeholder={{ blurhash }}
           key={item.Id}
-          id={item.Id}
           source={{ uri: imageUrl }}
+          recyclingKey={item.Id}
           cachePolicy='memory-disk'
           contentFit='cover'
           style={{

components/tv/TVSkipSegmentCard.tsx

@@ -33,9 +33,15 @@ export interface TVSkipSegmentCardProps {
   playButtonRef?: View | null;
 }
 
-// Position constants - same as TVNextEpisodeCountdown (they're mutually exclusive)
-const BOTTOM_WITH_CONTROLS = 300;
-const BOTTOM_WITHOUT_CONTROLS = 120;
+// Position constants — kept in sync with TVNextEpisodeCountdown (the two
+// are mutually exclusive). Scaled to the screen so 4K TVs don't get a
+// card that floats far above the controls.
+//
+// BOTTOM_WITH_CONTROLS is tuned to sit just above the bottom controls bar
+// (metadata + seekbar + buttons ≈ 200px on 1080p). Previously 300, which
+// left the card hovering ~100px above the controls.
+const BOTTOM_WITH_CONTROLS = scaleSize(220);
+const BOTTOM_WITHOUT_CONTROLS = scaleSize(120);
 
 export const TVSkipSegmentCard: FC<TVSkipSegmentCardProps> = ({
   show,

components/tv/index.ts

@@ -35,6 +35,8 @@ export type { TVLanguageCardProps } from "./TVLanguageCard";
 export { TVLanguageCard } from "./TVLanguageCard";
 export type { TVMetadataBadgesProps } from "./TVMetadataBadges";
 export { TVMetadataBadges } from "./TVMetadataBadges";
+export type { TVNavBarProps, TVNavBarTab } from "./TVNavBar";
+export { TVNavBar } from "./TVNavBar";
 export type { TVNextEpisodeCountdownProps } from "./TVNextEpisodeCountdown";
 export { TVNextEpisodeCountdown } from "./TVNextEpisodeCountdown";
 export type { TVOptionButtonProps } from "./TVOptionButton";

components/video-player/VideoPlayerView.tsx

@@ -0,0 +1,35 @@
+import * as React from "react";
+import { Platform } from "react-native";
+import type { MpvPlayerViewProps, MpvPlayerViewRef } from "@/modules";
+import { MpvPlayerView } from "@/modules";
+import { ExoPlayerView } from "@/modules/exoplayer-player";
+import {
+  getActiveVideoPlayer,
+  useSettings,
+  VideoPlayer,
+} from "@/utils/atoms/settings";
+
+/**
+ * Unified video player view. MPV is the default on every platform; users
+ * can opt into ExoPlayer on Android TV via settings.videoPlayer. Both
+ * children conform to the same `MpvPlayerViewRef` interface, so the ref
+ * is forwarded transparently regardless of which player is rendered.
+ */
+export const VideoPlayerView = React.forwardRef<
+  MpvPlayerViewRef,
+  MpvPlayerViewProps
+>(function VideoPlayerView(props, ref) {
+  const { settings } = useSettings();
+
+  // ExoPlayer's native module only ships for Android TV. Even if a user
+  // somehow ends up with `videoPlayer: ExoPlayer` set on another platform
+  // (shouldn't happen — the selector is hidden outside Android TV — but
+  // MMKV-persisted settings can roam), fall back to MPV rather than
+  // crash on requireNativeView().
+  const isExoSupported = Platform.OS === "android" && Platform.isTV;
+  const useExo =
+    isExoSupported && getActiveVideoPlayer(settings) === VideoPlayer.ExoPlayer;
+
+  const Player = useExo ? ExoPlayerView : MpvPlayerView;
+  return <Player ref={ref} {...props} />;
+});

components/video-player/controls/Controls.tv.tsx

@@ -1129,7 +1129,16 @@ export const Controls: FC<Props> = ({
       {/* Skip intro card */}
       <TVSkipSegmentCard
         show={showSkipButton && !isCountdownActive}
-        onPress={skipIntro}
+        onPress={() => {
+          // After the seek lands, showSkipButton flips false and this card
+          // unmounts. With controls visible the focus-stealing overlay is
+          // disabled, so without an explicit handoff the focus engine is
+          // stranded. Prime the play button to receive focus on the next
+          // render — when controls are hidden the focus overlay takes over
+          // naturally and this is a harmless no-op.
+          if (showControls) setFocusPlayButton(true);
+          skipIntro();
+        }}
         type='intro'
         controlsVisible={showControls}
         refSetter={setSkipSegmentRef}
@@ -1144,7 +1153,11 @@ export const Controls: FC<Props> = ({
           (hasContentAfterCredits || !nextItem) &&
           !isCountdownActive
         }
-        onPress={skipCredit}
+        onPress={() => {
+          // See the intro card above for the focus-handoff rationale.
+          if (showControls) setFocusPlayButton(true);
+          skipCredit();
+        }}
         type='credits'
         controlsVisible={showControls}
         refSetter={setSkipSegmentRef}

components/video-player/controls/TechnicalInfoOverlay.tsx

@@ -213,13 +213,10 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
       );
 
       return {
-        container: mediaSource.Container,
         videoRange: videoStream?.VideoRangeType,
         bitDepth: videoStream?.BitDepth,
         audioChannels: audioStream?.Channels,
-        audioCodecFromSource: audioStream?.Codec,
         subtitleCodec: subtitleStream?.Codec,
-        subtitleTitle: subtitleStream?.DisplayTitle,
       };
     }, [mediaSource, currentAudioIndex, currentSubtitleIndex]);
 
@@ -305,9 +302,13 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
             <Text style={textStyle}>
               {info.videoWidth}x{info.videoHeight}
               {streamInfo?.bitDepth ? ` ${streamInfo.bitDepth}bit` : ""}
-              {formatVideoRange(streamInfo?.videoRange)
-                ? ` ${formatVideoRange(streamInfo?.videoRange)}`
-                : ""}
+              {/* Prefer the player-reported HDR format (authoritative —
+                  what's actually being decoded) over Jellyfin metadata. */}
+              {info?.hdrFormat
+                ? ` ${info.hdrFormat}`
+                : formatVideoRange(streamInfo?.videoRange)
+                  ? ` ${formatVideoRange(streamInfo?.videoRange)}`
+                  : ""}
             </Text>
           )}
           {info?.videoCodec && (
@@ -319,8 +320,15 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
           {info?.audioCodec && (
             <Text style={textStyle}>
               Audio: {formatCodec(info.audioCodec)}
-              {streamInfo?.audioChannels
-                ? ` ${formatAudioChannels(streamInfo.audioChannels)}`
+              {/* Prefer player-reported channel count; fall back to
+                  Jellyfin metadata for MPV which doesn't populate it. */}
+              {(info.audioChannels ?? streamInfo?.audioChannels)
+                ? ` ${formatAudioChannels(
+                    info.audioChannels ?? streamInfo!.audioChannels!,
+                  )}`
+                : ""}
+              {info.audioSampleRate
+                ? ` @ ${(info.audioSampleRate / 1000).toFixed(1)}kHz`
                 : ""}
             </Text>
           )}
@@ -339,9 +347,26 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
                   : "N/A"}
             </Text>
           )}
+          {(info?.colorSpace || info?.colorRange || info?.colorTransfer) && (
+            <Text style={textStyle}>
+              Color:
+              {[info.colorSpace, info.colorRange, info.colorTransfer]
+                .filter(Boolean)
+                .join(" / ")}
+            </Text>
+          )}
+          {info?.videoCodecs && (
+            <Text style={textStyle}>Codec tag: {info.videoCodecs}</Text>
+          )}
           {info?.cacheSeconds !== undefined && (
             <Text style={textStyle}>
               Buffer: {info.cacheSeconds.toFixed(1)}s
+              {info?.demuxerMaxBytes !== undefined
+                ? ` (cap ${info.demuxerMaxBytes}MB` +
+                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
+                  `${info?.cacheSecsLimit !== undefined && info.cacheSecsLimit < 3600 ? ` · ${info.cacheSecsLimit.toFixed(0)}s` : ""}` +
+                  ")"
+                : ""}
             </Text>
           )}
           {info?.voDriver && (
@@ -350,6 +375,18 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
               {info.hwdec ? ` / ${info.hwdec}` : ""}
             </Text>
           )}
+          {info?.decoderName && (
+            <Text style={textStyle}>
+              Decoder: {info.decoderName}
+              {info.decoderType ? ` (${info.decoderType})` : ""}
+            </Text>
+          )}
+          {info?.estimatedVfFps !== undefined && (
+            <Text style={textStyle}>
+              Output FPS: {info.estimatedVfFps.toFixed(2)}
+              {info?.fps ? ` (container ${formatFps(info.fps)})` : ""}
+            </Text>
+          )}
           {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
             <Text style={[textStyle, styles.warningText]}>
               Dropped: {info.droppedFrames} frames

constants/Languages.ts

@@ -1,39 +0,0 @@
-import type { DefaultLanguageOption } from "@/utils/atoms/settings";
-
-export const LANGUAGES: DefaultLanguageOption[] = [
-  { label: "English", value: "eng" },
-  { label: "Spanish", value: "spa" },
-  { label: "Chinese (Mandarin)", value: "cmn" },
-  { label: "Hindi", value: "hin" },
-  { label: "Arabic", value: "ara" },
-  { label: "French", value: "fra" },
-  { label: "Russian", value: "rus" },
-  { label: "Portuguese", value: "por" },
-  { label: "Japanese", value: "jpn" },
-  { label: "German", value: "deu" },
-  { label: "Italian", value: "ita" },
-  { label: "Korean", value: "kor" },
-  { label: "Turkish", value: "tur" },
-  { label: "Dutch", value: "nld" },
-  { label: "Polish", value: "pol" },
-  { label: "Vietnamese", value: "vie" },
-  { label: "Thai", value: "tha" },
-  { label: "Indonesian", value: "ind" },
-  { label: "Greek", value: "ell" },
-  { label: "Swedish", value: "swe" },
-  { label: "Danish", value: "dan" },
-  { label: "Norwegian", value: "nor" },
-  { label: "Finnish", value: "fin" },
-  { label: "Czech", value: "ces" },
-  { label: "Hungarian", value: "hun" },
-  { label: "Romanian", value: "ron" },
-  { label: "Ukrainian", value: "ukr" },
-  { label: "Hebrew", value: "heb" },
-  { label: "Bengali", value: "ben" },
-  { label: "Punjabi", value: "pan" },
-  { label: "Tagalog", value: "tgl" },
-  { label: "Swahili", value: "swa" },
-  { label: "Malay", value: "msa" },
-  { label: "Persian", value: "fas" },
-  { label: "Urdu", value: "urd" },
-];

constants/MediaTypes.ts

@@ -3,9 +3,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-export default {
+const MediaTypes = {
   Audio: "Audio",
   Video: "Video",
   Photo: "Photo",
   Book: "Book",
-};
+} as const;
+
+export type MediaType = (typeof MediaTypes)[keyof typeof MediaTypes];
+
+export default MediaTypes;

docs/tv-discovery.md

@@ -28,7 +28,7 @@ Apple TV uses a Top Shelf extension target, not the main app process.
 
 Relevant files:
 
-- [plugins/withTVOSTopShelf.js](../plugins/withTVOSTopShelf.js)
+- [plugins/withTVOSTopShelf.ts](../plugins/withTVOSTopShelf.ts)
 - [targets/StreamyfinTopShelf/TopShelfProvider.swift](../targets/StreamyfinTopShelf/TopShelfProvider.swift)
 - [modules/top-shelf-cache/ios/TopShelfCacheModule.swift](../modules/top-shelf-cache/ios/TopShelfCacheModule.swift)
 - [utils/topshelf/cache.ts](../utils/topshelf/cache.ts)

eas.json

@@ -52,7 +52,7 @@
       }
     },
     "production": {
-      "bun": "1.3.5",
+      "bun": "1.3.14",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -64,7 +64,7 @@
       }
     },
     "production-apk": {
-      "bun": "1.3.5",
+      "bun": "1.3.14",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -74,7 +74,7 @@
       }
     },
     "production-apk-tv": {
-      "bun": "1.3.5",
+      "bun": "1.3.14",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -87,7 +87,7 @@
       }
     },
     "production_tv": {
-      "bun": "1.3.5",
+      "bun": "1.3.14",
       "environment": "production",
       "autoIncrement": true,
       "env": {
@@ -97,6 +97,14 @@
         "credentialsSource": "local",
         "config": "ios-production.yml"
       }
+    },
+    "ci": {
+      "extends": "production",
+      "autoIncrement": false
+    },
+    "ci_tv": {
+      "extends": "production_tv",
+      "autoIncrement": false
     }
   },
   "submit": {

hooks/useControlsVisibility.ts

@@ -1,37 +0,0 @@
-import { useCallback, useEffect, useRef } from "react";
-import { useSharedValue } from "react-native-reanimated";
-
-export const useControlsVisibility = (timeout = 3000) => {
-  const opacity = useSharedValue(1);
-
-  const hideControlsTimerRef = useRef<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
-
-  const showControls = useCallback(() => {
-    opacity.value = 1;
-    if (hideControlsTimerRef.current) {
-      clearTimeout(hideControlsTimerRef.current);
-    }
-    hideControlsTimerRef.current = setTimeout(() => {
-      opacity.value = 0;
-    }, timeout);
-  }, [timeout]);
-
-  const hideControls = useCallback(() => {
-    opacity.value = 0;
-    if (hideControlsTimerRef.current) {
-      clearTimeout(hideControlsTimerRef.current);
-    }
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      if (hideControlsTimerRef.current) {
-        clearTimeout(hideControlsTimerRef.current);
-      }
-    };
-  }, []);
-
-  return { opacity, showControls, hideControls };
-};

hooks/useDownloadedFileOpener.ts

@@ -1,35 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { useCallback } from "react";
-import useRouter from "@/hooks/useAppRouter";
-import { usePlaySettings } from "@/providers/PlaySettingsProvider";
-import { writeToLog } from "@/utils/log";
-
-export const useDownloadedFileOpener = () => {
-  const router = useRouter();
-  const { setPlayUrl, setOfflineSettings } = usePlaySettings();
-
-  const openFile = useCallback(
-    async (item: BaseItemDto) => {
-      if (!item.Id) {
-        writeToLog("ERROR", "Attempted to open a file without an ID.");
-        console.error("Attempted to open a file without an ID.");
-        return;
-      }
-      const queryParams = new URLSearchParams({
-        itemId: item.Id,
-        offline: "true",
-        playbackPosition:
-          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-      });
-      try {
-        router.push(`/player/direct-player?${queryParams.toString()}`);
-      } catch (error) {
-        writeToLog("ERROR", "Error opening file", error);
-        console.error("Error opening file:", error);
-      }
-    },
-    [setOfflineSettings, setPlayUrl, router],
-  );
-
-  return { openFile };
-};

hooks/useImageColors.ts

@@ -1,120 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { useAtom, useAtomValue } from "jotai";
-import { useEffect, useMemo } from "react";
-import { Platform } from "react-native";
-import type * as ImageColorsType from "react-native-image-colors";
-import { apiAtom } from "@/providers/JellyfinProvider";
-
-// Conditionally import react-native-image-colors only on non-TV platforms
-const ImageColors = Platform.isTV
-  ? null
-  : (require("react-native-image-colors") as typeof ImageColorsType);
-
-import {
-  adjustToNearBlack,
-  calculateTextColor,
-  isCloseToBlack,
-  itemThemeColorAtom,
-} from "@/utils/atoms/primaryColor";
-import { getItemImage } from "@/utils/getItemImage";
-import { storage } from "@/utils/mmkv";
-
-/**
- * Custom hook to extract and manage image colors for a given item.
- *
- * @param item - The BaseItemDto object representing the item.
- * @param disabled - A boolean flag to disable color extraction.
- *
- */
-export const useImageColors = ({
-  item,
-  url,
-  disabled,
-}: {
-  item?: BaseItemDto | null;
-  url?: string | null;
-  disabled?: boolean;
-}) => {
-  const api = useAtomValue(apiAtom);
-  const [, setPrimaryColor] = useAtom(itemThemeColorAtom);
-
-  const isTv = Platform.isTV;
-
-  const source = useMemo(() => {
-    if (!api) return;
-    if (url) return { uri: url };
-    if (item)
-      return getItemImage({
-        item,
-        api,
-        variant: "Primary",
-        quality: 80,
-        width: 300,
-      });
-    return null;
-  }, [api, item, url]);
-
-  useEffect(() => {
-    if (isTv) return;
-    if (disabled) return;
-    if (source?.uri) {
-      const _primary = storage.getString(`${source.uri}-primary`);
-      const _text = storage.getString(`${source.uri}-text`);
-
-      if (_primary && _text) {
-        setPrimaryColor({
-          primary: _primary,
-          text: _text,
-        });
-        return;
-      }
-
-      // Extract colors from the image
-      if (!ImageColors?.getColors) return;
-
-      ImageColors.getColors(source.uri, {
-        fallback: "#fff",
-        cache: false,
-      })
-        .then((colors: ImageColorsType.ImageColorsResult) => {
-          let primary = "#fff";
-          let text = "#000";
-          let backup = "#fff";
-
-          // Select the appropriate color based on the platform
-          if (colors.platform === "android") {
-            primary = colors.dominant;
-            backup = colors.vibrant;
-          } else if (colors.platform === "ios") {
-            primary = colors.detail;
-            backup = colors.primary;
-          }
-
-          // Adjust the primary color if it's too close to black
-          if (primary && isCloseToBlack(primary)) {
-            if (backup && !isCloseToBlack(backup)) primary = backup;
-            primary = adjustToNearBlack(primary);
-          }
-
-          // Calculate the text color based on the primary color
-          if (primary) text = calculateTextColor(primary);
-
-          setPrimaryColor({
-            primary,
-            text,
-          });
-
-          // Cache the colors in storage
-          if (source.uri && primary) {
-            storage.set(`${source.uri}-primary`, primary);
-            storage.set(`${source.uri}-text`, text);
-          }
-        })
-        .catch((error: any) => {
-          console.error("Error getting colors", error);
-        });
-    }
-  }, [isTv, source?.uri, setPrimaryColor, disabled]);
-
-  if (isTv) return;
-};

hooks/useTVBackHandler.ts

@@ -4,41 +4,42 @@ import { Platform } from "react-native";
 import {
   disableTVMenuKeyInterception,
   enableTVMenuKeyInterception,
+  useTVBackPress,
 } from "./useTVBackPress";
 
 export { enableTVMenuKeyInterception } from "./useTVBackPress";
 
+/** All tab route names used in the bottom tab navigator. */
+export const TAB_ROUTES = [
+  "(home)",
+  "(search)",
+  "(favorites)",
+  "(libraries)",
+  "(watchlists)",
+  "(custom-links)",
+  "(settings)",
+] as const;
+
+export type TabRoute = (typeof TAB_ROUTES)[number];
+
+/** Check if a segment string is a tab route. */
+export function isTabRoute(s: string): s is TabRoute {
+  return (TAB_ROUTES as readonly string[]).includes(s);
+}
+
 /**
  * Check if we're at the root of a tab
  */
 function isAtTabRoot(segments: string[]): boolean {
   const lastSegment = segments[segments.length - 1];
-  const tabNames = [
-    "(home)",
-    "(search)",
-    "(favorites)",
-    "(libraries)",
-    "(watchlists)",
-    "(settings)",
-    "(custom-links)",
-  ];
-  return tabNames.includes(lastSegment) || lastSegment === "index";
+  return isTabRoute(lastSegment) || lastSegment === "index";
 }
 
 /**
  * Get the current tab name from segments
  */
-function getCurrentTab(segments: string[]): string | undefined {
-  return segments.find(
-    (s) =>
-      s === "(home)" ||
-      s === "(search)" ||
-      s === "(favorites)" ||
-      s === "(libraries)" ||
-      s === "(watchlists)" ||
-      s === "(settings)" ||
-      s === "(custom-links)",
-  );
+function getCurrentTab(segments: string[]): TabRoute | undefined {
+  return segments.find(isTabRoute);
 }
 
 /**
@@ -49,7 +50,6 @@ function getCurrentTab(segments: string[]): string | undefined {
 export function useTVHomeBackHandler() {
   const segments = useSegments();
 
-  // Get current state
   const currentTab = getCurrentTab(segments);
   const atTabRoot = isAtTabRoot(segments);
   const isOnHomeRoot = atTabRoot && currentTab === "(home)";
@@ -65,3 +65,24 @@ export function useTVHomeBackHandler() {
     enableTVMenuKeyInterception();
   }, [isOnHomeRoot]);
 }
+
+/**
+ * Handles back press at a non-Home tab root on Android TV by navigating to Home.
+ *
+ * Without NativeTabs, the Stack navigator used for the Android TV nav bar has no
+ * built-in tab-level back handling — pressing back at a tab root would pop the
+ * Stack entirely and exit the tab navigator. This hook intercepts that and routes
+ * to Home instead.
+ */
+export function useTVTabRootBackHandler(
+  onNavigateHome: () => void,
+  isAtTabRoot: boolean,
+  currentTab: string | undefined,
+) {
+  useTVBackPress(() => {
+    if (!Platform.isTV || Platform.OS !== "android") return false;
+    if (!isAtTabRoot || currentTab === "(home)") return false;
+    onNavigateHome();
+    return true;
+  }, [isAtTabRoot, currentTab, onNavigateHome]);
+}

hooks/useWifiSSID.ts

@@ -53,7 +53,6 @@ export function useWifiSSID(): UseWifiSSIDReturn {
   const fetchSSID = useCallback(async () => {
     if (Platform.isTV) return;
     const result = await getSSID();
-    console.log("[WiFi Debug] Native module SSID:", result);
     setSSID(result);
   }, []);
 

modules/background-downloader/android/src/main/AndroidManifest.xml

@@ -2,7 +2,8 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+
   <application>
     <service
       android:name=".DownloadService"

modules/background-downloader/android/src/main/java/expo/modules/backgrounddownloader/DownloadService.kt

@@ -9,6 +9,7 @@ import android.content.pm.ServiceInfo
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
+import android.os.PowerManager
 import android.os.SystemClock
 import android.util.Log
 import androidx.core.app.NotificationCompat
@@ -27,6 +28,7 @@ class DownloadService : Service() {
   private var currentDownloadTitle = "Preparing download..."
   private var currentProgress = 0
   private var isForegroundStarted = false
+  private var wakeLock: PowerManager.WakeLock? = null
 
   inner class DownloadServiceBinder : Binder() {
     fun getService(): DownloadService = this@DownloadService
@@ -36,6 +38,12 @@ class DownloadService : Service() {
     super.onCreate()
     Log.d(TAG, "DownloadService created")
     createNotificationChannel()
+
+    val pm = getSystemService(PowerManager::class.java)
+    wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Streamyfin::DownloadWakeLock")
+    wakeLock?.acquire()
+
+    Log.d(TAG, "Wake lock acquired")
   }
 
   override fun onBind(intent: Intent?): IBinder {
@@ -93,6 +101,8 @@ class DownloadService : Service() {
   }
   
   override fun onDestroy() {
+    wakeLock?.let { if (it.isHeld) it.release() }
+    Log.d(TAG, "Wake lock released")
     Log.d(TAG, "DownloadService destroyed")
     super.onDestroy()
   }

modules/exoplayer-player/android/build.gradle

@@ -0,0 +1,68 @@
+apply plugin: 'com.android.library'
+
+group = 'expo.modules.exoplayerplayer'
+version = '0.1.0'
+
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useExpoPublishing()
+
+def useManagedAndroidSdkVersions = false
+if (useManagedAndroidSdkVersions) {
+  useDefaultAndroidSdkVersions()
+} else {
+  buildscript {
+    ext.safeExtGet = { prop, fallback ->
+      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    }
+  }
+  project.android {
+    compileSdkVersion safeExtGet("compileSdkVersion", 36)
+    defaultConfig {
+      minSdkVersion safeExtGet("minSdkVersion", 26)
+      targetSdkVersion safeExtGet("targetSdkVersion", 36)
+    }
+  }
+}
+
+android {
+  namespace "expo.modules.exoplayerplayer"
+  defaultConfig {
+    versionCode 1
+    versionName "0.1.0"
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
+
+dependencies {
+  // Media3 (ExoPlayer). The default tracks react-native-track-player's
+  // pinned version (currently 1.10.1) so we don't end up with two media3
+  // versions on the classpath and duplicate-class errors. The
+  // DASH/SmoothStreaming/RTSP artifacts that RNTP pulls in are excluded
+  // globally via plugins/withExcludeMedia3Dash.js.
+  def media3Version = safeExtGet('media3Version', '1.10.1')
+  implementation "androidx.media3:media3-exoplayer:${media3Version}"
+  implementation "androidx.media3:media3-exoplayer-hls:${media3Version}"
+  implementation "androidx.media3:media3-ui:${media3Version}"
+  implementation "androidx.media3:media3-common:${media3Version}"
+
+  // FFmpeg software decoders — DTS / TrueHD / AC-4 / WMA / older video
+  // codecs that MediaCodec doesn't ship with on most Android TVs.
+  //
+  // This is the Jellyfin-published distribution of media3-decoder-ffmpeg
+  // with prebuilt native libraries (the upstream androidx artifact is a
+  // stub that requires building FFmpeg yourself). RNTP already pulls
+  // 1.9.0+1 in transitively, so declaring it here is mostly defensive —
+  // it guarantees we still get it if RNTP ever drops the dep.
+  //
+  // Version skew: this is built against media3 1.9.0 but RNTP (and we)
+  // resolve media3 core to 1.10.1. RNTP ships the same combination in
+  // production, and Media3 maintains binary compat for Renderer /
+  // RenderersFactory APIs across minor versions, so this works in
+  // practice. Re-evaluate when Jellyfin publishes a 1.10.x build.
+  implementation "org.jellyfin.media3:media3-ffmpeg-decoder:1.9.0+1"
+}

modules/exoplayer-player/android/src/main/java/expo/modules/exoplayerplayer/ExoPlayerModule.kt

@@ -0,0 +1,193 @@
+package expo.modules.exoplayerplayer
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ExoPlayerModule : Module() {
+    override fun definition() = ModuleDefinition {
+        Name("ExoPlayer")
+
+        // Enables the module to be used as a native view.
+        View(ExoPlayerView::class) {
+            // All video load options are passed via a single "source" prop,
+            // mirroring MpvPlayerView. MPV-only fields (voDriver, extra
+            // cacheConfig fields) are silently ignored.
+            Prop("source") { view: ExoPlayerView, source: Map<String, Any?>? ->
+                if (source == null) return@Prop
+
+                val urlString = source["url"] as? String ?: return@Prop
+
+                @Suppress("UNCHECKED_CAST")
+                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
+
+                val config = VideoLoadConfig(
+                    url = urlString,
+                    headers = source["headers"] as? Map<String, String>,
+                    externalSubtitles = source["externalSubtitles"] as? List<String>,
+                    startPosition = (source["startPosition"] as? Number)?.toDouble(),
+                    autoplay = (source["autoplay"] as? Boolean) ?: true,
+                    initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
+                    initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
+                    cacheEnabled = cacheConfig?.get("enabled") as? String,
+                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
+                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
+                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
+                )
+
+                view.loadVideo(config)
+            }
+
+            // Now Playing metadata is iOS-only on MPV; no-op here (TV has
+            // no Control Center equivalent — Android handles media sessions
+            // via MediaSessionCompat which we don't wire up for TV).
+            Prop("nowPlayingMetadata") { _: ExoPlayerView, _: Map<String, String>? ->
+                // No-op
+            }
+
+            AsyncFunction("play") { view: ExoPlayerView ->
+                view.play()
+            }
+
+            AsyncFunction("pause") { view: ExoPlayerView ->
+                view.pause()
+            }
+
+            AsyncFunction("destroy") { view: ExoPlayerView ->
+                view.destroy()
+            }
+
+            AsyncFunction("seekTo") { view: ExoPlayerView, position: Double ->
+                view.seekTo(position)
+            }
+
+            AsyncFunction("seekBy") { view: ExoPlayerView, offset: Double ->
+                view.seekBy(offset)
+            }
+
+            AsyncFunction("setSpeed") { view: ExoPlayerView, speed: Double ->
+                view.setSpeed(speed)
+            }
+
+            AsyncFunction("getSpeed") { view: ExoPlayerView ->
+                view.getSpeed()
+            }
+
+            AsyncFunction("isPaused") { view: ExoPlayerView ->
+                view.isPaused()
+            }
+
+            AsyncFunction("getCurrentPosition") { view: ExoPlayerView ->
+                view.getCurrentPosition()
+            }
+
+            AsyncFunction("getDuration") { view: ExoPlayerView ->
+                view.getDuration()
+            }
+
+            // Picture in Picture — TV does not use PiP; safe no-ops.
+            AsyncFunction("startPictureInPicture") { _: ExoPlayerView ->
+                // No-op
+            }
+
+            AsyncFunction("stopPictureInPicture") { _: ExoPlayerView ->
+                // No-op
+            }
+
+            AsyncFunction("isPictureInPictureSupported") { _: ExoPlayerView ->
+                false
+            }
+
+            AsyncFunction("isPictureInPictureActive") { _: ExoPlayerView ->
+                false
+            }
+
+            // Subtitle functions
+            AsyncFunction("getSubtitleTracks") { view: ExoPlayerView ->
+                view.getSubtitleTracks()
+            }
+
+            AsyncFunction("setSubtitleTrack") { view: ExoPlayerView, trackId: Int ->
+                view.setSubtitleTrack(trackId)
+            }
+
+            AsyncFunction("disableSubtitles") { view: ExoPlayerView ->
+                view.disableSubtitles()
+            }
+
+            AsyncFunction("getCurrentSubtitleTrack") { view: ExoPlayerView ->
+                view.getCurrentSubtitleTrack()
+            }
+
+            AsyncFunction("addSubtitleFile") { view: ExoPlayerView, url: String, select: Boolean ->
+                view.addSubtitleFile(url, select)
+            }
+
+            // Subtitle positioning / styling
+            AsyncFunction("setSubtitlePosition") { view: ExoPlayerView, position: Int ->
+                view.setSubtitlePosition(position)
+            }
+
+            AsyncFunction("setSubtitleScale") { view: ExoPlayerView, scale: Double ->
+                view.setSubtitleScale(scale)
+            }
+
+            AsyncFunction("setSubtitleMarginY") { view: ExoPlayerView, margin: Int ->
+                view.setSubtitleMarginY(margin)
+            }
+
+            AsyncFunction("setSubtitleAlignX") { _: ExoPlayerView, _: String ->
+                // No-op — SubtitleView follows authored cue alignment.
+            }
+
+            AsyncFunction("setSubtitleAlignY") { view: ExoPlayerView, alignment: String ->
+                view.setSubtitleAlignY(alignment)
+            }
+
+            AsyncFunction("setSubtitleFontSize") { view: ExoPlayerView, size: Int ->
+                view.setSubtitleFontSize(size)
+            }
+
+            AsyncFunction("setSubtitleBorderStyle") { view: ExoPlayerView, style: String ->
+                view.setSubtitleBorderStyle(style)
+            }
+
+            AsyncFunction("setSubtitleBackgroundColor") { view: ExoPlayerView, color: String ->
+                view.setSubtitleBackgroundColor(color)
+            }
+
+            AsyncFunction("setSubtitleAssOverride") { _: ExoPlayerView, _: String ->
+                // No-op — libass-specific, no Media3 equivalent.
+            }
+
+            // Audio track functions
+            AsyncFunction("getAudioTracks") { view: ExoPlayerView ->
+                view.getAudioTracks()
+            }
+
+            AsyncFunction("setAudioTrack") { view: ExoPlayerView, trackId: Int ->
+                view.setAudioTrack(trackId)
+            }
+
+            AsyncFunction("getCurrentAudioTrack") { view: ExoPlayerView ->
+                view.getCurrentAudioTrack()
+            }
+
+            // Video scaling
+            AsyncFunction("setZoomedToFill") { view: ExoPlayerView, zoomed: Boolean ->
+                view.setZoomedToFill(zoomed)
+            }
+
+            AsyncFunction("isZoomedToFill") { view: ExoPlayerView ->
+                view.isZoomedToFill()
+            }
+
+            // Technical info
+            AsyncFunction("getTechnicalInfo") { view: ExoPlayerView ->
+                view.getTechnicalInfo()
+            }
+
+            // Events that the view can send to JavaScript — same set as MPV.
+            Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady", "onPictureInPictureChange")
+        }
+    }
+}

modules/exoplayer-player/android/src/main/java/expo/modules/exoplayerplayer/ExoPlayerView.kt

@@ -0,0 +1,905 @@
+@file:OptIn(androidx.media3.common.util.UnstableApi::class)
+
+package expo.modules.exoplayerplayer
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.ViewGroup
+import androidx.media3.common.AudioAttributes
+import androidx.media3.common.C
+import androidx.media3.common.ColorInfo
+import androidx.media3.common.Format
+import androidx.media3.common.MediaItem
+import androidx.media3.common.PlaybackParameters
+import androidx.media3.common.Player
+import androidx.media3.common.TrackSelectionOverride
+import androidx.media3.common.Tracks
+import androidx.media3.exoplayer.DefaultLoadControl
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.analytics.AnalyticsListener
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
+import androidx.media3.datasource.DefaultDataSource
+import androidx.media3.ui.CaptionStyleCompat
+import androidx.media3.ui.PlayerView
+import androidx.media3.ui.SubtitleView
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.viewevent.EventDispatcher
+import expo.modules.kotlin.views.ExpoView
+
+/**
+ * Configuration for loading a video. Mirrors MpvPlayerView.VideoLoadConfig —
+ * MPV-only fields are accepted and ignored.
+ */
+data class VideoLoadConfig(
+    val url: String,
+    val headers: Map<String, String>? = null,
+    val externalSubtitles: List<String>? = null,
+    val startPosition: Double? = null,
+    val autoplay: Boolean = true,
+    val initialSubtitleId: Int? = null,
+    val initialAudioId: Int? = null,
+    val cacheEnabled: String? = null,
+    val cacheSeconds: Int? = null,
+    val demuxerMaxBytes: Int? = null,
+    val demuxerMaxBackBytes: Int? = null,
+)
+
+/**
+ * ExoPlayerView — ExpoView that hosts a Media3 ExoPlayer instance.
+ *
+ * Implements the same JS contract (events, ref methods, 1-based track IDs)
+ * as MpvPlayerView so the React layer can swap between the two without
+ * changes. Subtitle styling is mapped to androidx.media3.ui.SubtitleView +
+ * CaptionStyleCompat. PiP methods are no-ops (TV doesn't use PiP).
+ */
+class ExoPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
+
+    companion object {
+        private const val TAG = "ExoPlayerView"
+        private const val PROGRESS_INTERVAL_MS = 1000L
+    }
+
+    // Event dispatchers — names must match the Events() declaration in the module.
+    val onLoad by EventDispatcher()
+    val onPlaybackStateChange by EventDispatcher()
+    val onProgress by EventDispatcher()
+    val onError by EventDispatcher()
+    val onTracksReady by EventDispatcher()
+    val onPictureInPictureChange by EventDispatcher()
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    private var player: ExoPlayer? = null
+    private val playerView: PlayerView
+    private val subtitleView: SubtitleView?
+
+    private var currentUrl: String? = null
+    private var pendingConfig: VideoLoadConfig? = null
+    private var tracksReadyFired: Boolean = false
+
+    // 1-based track ID mappings (matching MPV's contract).
+    // Each list is rebuilt on Tracks changed.
+    private var subtitleTrackList: List<TrackEntry> = emptyList()
+    private var audioTrackList: List<TrackEntry> = emptyList()
+    private var currentSubtitleId: Int = 0
+    private var currentAudioId: Int = 0
+
+    // Subtitle styling state — applied to the embedded SubtitleView.
+    private var subtitleScale: Float = 1f
+    private var subtitleFontSizePct: Int? = null // 0-100
+    // Last-write-wins override of the vertical position fraction
+    // (null = fall back to subtitleAlignY). Both setSubtitlePosition
+    // (0-100, MPV convention where 100 = bottom) and setSubtitleMarginY
+    // (px) funnel into this single SubtitleView API.
+    private var subtitleBottomFraction: Float? = null
+    private var subtitleAlignY: String = "bottom"
+    // Background color carries its own alpha (parsed from #RRGGBBAA in
+    // setSubtitleBackgroundColor) so no separate enabled/opacity flags.
+    private var subtitleBackgroundColor: Int = Color.argb(0, 0, 0, 0)
+    private var subtitleBorderStyle: String = "outline-and-shadow"
+
+    private var isZoomedToFill: Boolean = false
+
+    // Captured by analyticsListener; surfaced via getTechnicalInfo().
+    // Reset on destroy() and (for decoder names) on track changes.
+    private var videoDecoderName: String? = null
+    private var audioDecoderName: String? = null
+    private var cumulativeDroppedFrames: Int = 0
+
+    private val analyticsListener = object : AnalyticsListener {
+        override fun onVideoDecoderInitialized(
+            eventTime: AnalyticsListener.EventTime,
+            decoderName: String,
+            initializedTimestampMs: Long,
+        ) {
+            videoDecoderName = decoderName
+        }
+
+        override fun onAudioDecoderInitialized(
+            eventTime: AnalyticsListener.EventTime,
+            decoderName: String,
+            initializedTimestampMs: Long,
+        ) {
+            audioDecoderName = decoderName
+        }
+
+        override fun onDroppedVideoFrames(
+            eventTime: AnalyticsListener.EventTime,
+            droppedFrames: Int,
+            elapsedMs: Long,
+        ) {
+            // Incremental count since last call; accumulate for a cumulative
+            // total that matches MPV's droppedFrames semantics.
+            cumulativeDroppedFrames += droppedFrames
+        }
+    }
+
+    private val playerListener = object : Player.Listener {
+        override fun onPlaybackStateChanged(playbackState: Int) {
+            when (playbackState) {
+                Player.STATE_BUFFERING -> {
+                    onPlaybackStateChange(mapOf("isLoading" to true))
+                }
+                Player.STATE_READY -> {
+                    onPlaybackStateChange(mapOf(
+                        "isLoading" to false,
+                        "isReadyToSeek" to true
+                    ))
+                    if (!tracksReadyFired) {
+                        tracksReadyFired = true
+                        rebuildTrackMaps(player?.currentTracks)
+                        onTracksReady(emptyMap<String, Any>())
+                    }
+                }
+                Player.STATE_ENDED -> {
+                    onPlaybackStateChange(mapOf(
+                        "isPlaying" to false,
+                        "isPaused" to true
+                    ))
+                }
+                Player.STATE_IDLE -> {
+                    // no-op
+                }
+            }
+        }
+
+        override fun onIsPlayingChanged(isPlaying: Boolean) {
+            onPlaybackStateChange(mapOf(
+                "isPlaying" to isPlaying,
+                "isPaused" to !isPlaying
+            ))
+        }
+
+        override fun onPlayerErrorChanged(error: androidx.media3.common.PlaybackException?) {
+            val message = error?.message ?: "Unknown playback error"
+            Log.e(TAG, "Player error: $message", error)
+            onError(mapOf("error" to message))
+        }
+
+        override fun onTracksChanged(tracks: Tracks) {
+            rebuildTrackMaps(tracks)
+            applyInitialTrackSelections()
+            // A track change can re-initialize the codec under a different
+            // name (e.g. adaptive switch from HEVC to AV1). Clear stale
+            // decoder names so getTechnicalInfo() doesn't report the
+            // previous codec until the next onVideoDecoderInitialized fires.
+            videoDecoderName = null
+            audioDecoderName = null
+        }
+    }
+
+    private val progressRunnable = object : Runnable {
+        override fun run() {
+            val p = player ?: return
+            val positionMs = p.currentPosition
+            val durationMs = p.duration
+            val bufferedMs = p.bufferedPosition
+
+            val positionSec = positionMs / 1000.0
+            val durationSec = if (durationMs > 0) durationMs / 1000.0 else 0.0
+            val cacheSec = if (bufferedMs > positionMs) (bufferedMs - positionMs) / 1000.0 else 0.0
+
+            onProgress(mapOf(
+                "position" to positionSec,
+                "duration" to durationSec,
+                "progress" to if (durationSec > 0) positionSec / durationSec else 0.0,
+                "cacheSeconds" to cacheSec
+            ))
+
+            mainHandler.postDelayed(this, PROGRESS_INTERVAL_MS)
+        }
+    }
+
+    init {
+        setBackgroundColor(Color.BLACK)
+
+        playerView = PlayerView(context).apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+            )
+            // SurfaceView-backed for parity with MPV (direct surface to
+            // SurfaceFlinger). PlayerView defaults to a SurfaceView, so no
+            // explicit setSurfaceType() call is needed; the int constants
+            // backing it are @IntDef private in Media3.
+            setUseController(false)
+            setResizeMode(androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT)
+        }
+        subtitleView = playerView.subtitleView
+        addView(playerView)
+    }
+
+    // MARK: - Video Loading
+
+    fun loadVideo(config: VideoLoadConfig) {
+        if (currentUrl == config.url) return
+        currentUrl = config.url
+        pendingConfig = config
+        ensurePlayer(config)
+        loadInternal(config)
+    }
+
+    private fun ensurePlayer(config: VideoLoadConfig) {
+        if (player != null) return
+
+        val loadControl = buildLoadControl(config)
+
+        // PREFER extension renderers so the FFmpeg decoder (DTS / TrueHD /
+        // AC-4 / WMA / etc.) takes over when MediaCodec doesn't ship a
+        // hardware decoder for the format. MediaCodec remains the fallback.
+        val renderersFactory = androidx.media3.exoplayer.DefaultRenderersFactory(context)
+            .setExtensionRendererMode(
+                androidx.media3.exoplayer.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
+            )
+            .setEnableDecoderFallback(true)
+
+        val exo = ExoPlayer.Builder(context, renderersFactory)
+            .setLoadControl(loadControl)
+            .setAudioAttributes(
+                AudioAttributes.Builder()
+                    .setUsage(C.USAGE_MEDIA)
+                    .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+                    .build(),
+                /* handleAudioFocus = */ true
+            )
+            .build()
+
+        exo.addListener(playerListener)
+        exo.addAnalyticsListener(analyticsListener)
+        exo.repeatMode = Player.REPEAT_MODE_OFF
+        player = exo
+        playerView.player = exo
+
+        applySubtitleStyle()
+    }
+
+    private fun buildLoadControl(config: VideoLoadConfig): DefaultLoadControl {
+        // Map MPV-style cache config to ExoPlayer's LoadControl.
+        val cacheEnabled = when (config.cacheEnabled) {
+            "no" -> false
+            "yes" -> true
+            else -> true // "auto"
+        }
+
+        // Buffer thresholds used as fallbacks when the user's cache config
+        // doesn't override them. Media3's own defaults changed in 1.6.0
+        // (bufferForPlaybackMs 2500→1000, afterRebuffer 5000→2000) for a
+        // faster start; we intentionally keep the older 2500/5000 here
+        // because low-RAM Android TVs with slow tuners benefit from the
+        // extra headroom before playback kicks in. Media3's DEFAULT_*
+        // IntDef fields are private, hence the literals.
+        val defaultMinBufferMs = 15000
+        val defaultBufferForPlaybackMs = 2500
+        val defaultBufferForPlaybackAfterRebufferMs = 5000
+
+        val targetBufferMs = if (!cacheEnabled) {
+            50000
+        } else {
+            val seconds = config.cacheSeconds?.coerceIn(5, 120) ?: 10
+            seconds * 1000
+        }
+
+        val backBufferMs = if (!cacheEnabled) {
+            0
+        } else {
+            val mb = config.demuxerMaxBackBytes ?: 50
+            // Heuristic: 1 MB ≈ 1s of typical 1080p bitrate.
+            (mb * 1000).coerceAtLeast(1000)
+        }
+
+        val builder = DefaultLoadControl.Builder()
+            .setTargetBufferBytes(if (!cacheEnabled) 0 else ((config.demuxerMaxBytes ?: 150) * 1024 * 1024))
+            .setBufferDurationsMs(
+                /* minBufferMs = */ defaultMinBufferMs,
+                /* maxBufferMs = */ targetBufferMs,
+                /* bufferForPlaybackMs = */ defaultBufferForPlaybackMs,
+                /* bufferForPlaybackAfterRebufferMs = */ defaultBufferForPlaybackAfterRebufferMs
+            )
+        if (cacheEnabled) {
+            builder.setBackBuffer(backBufferMs, /* retainBackBufferFromKeyframe = */ true)
+        }
+        return builder.build()
+    }
+
+    private fun loadInternal(config: VideoLoadConfig) {
+        val p = player ?: return
+
+        val httpFactory = androidx.media3.datasource.DefaultHttpDataSource.Factory()
+            .setDefaultRequestProperties(config.headers ?: emptyMap())
+        val dataSourceFactory = DefaultDataSource.Factory(context, httpFactory)
+
+        val mediaItem = buildMediaItem(config)
+
+        val mediaSource = DefaultMediaSourceFactory(dataSourceFactory)
+            .createMediaSource(mediaItem)
+
+        p.setMediaSource(mediaSource)
+        p.prepare()
+
+        // Apply initial playback position
+        config.startPosition?.let { startPosSec ->
+            if (startPosSec > 0) {
+                p.seekTo((startPosSec * 1000).toLong())
+            }
+        }
+
+        if (config.autoplay) {
+            p.play()
+        }
+
+        onLoad(mapOf("url" to config.url))
+        startProgressLoop()
+    }
+
+    private fun buildMediaItem(config: VideoLoadConfig): MediaItem {
+        val builder = MediaItem.Builder().setUri(config.url)
+
+        // External subtitles: add as side-loaded SubtitleConfigurations.
+        // MIME-type sniffed from the file extension.
+        val subs = config.externalSubtitles
+        if (!subs.isNullOrEmpty()) {
+            val subtitleConfigs = subs.mapNotNull { subUrl ->
+                val mime = mimeTypeForSubtitleUrl(subUrl) ?: return@mapNotNull null
+                MediaItem.SubtitleConfiguration.Builder(Uri.parse(subUrl))
+                    .setMimeType(mime)
+                    .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
+                    .build()
+            }
+            if (subtitleConfigs.isNotEmpty()) {
+                builder.setSubtitleConfigurations(subtitleConfigs)
+            }
+        }
+
+        return builder.build()
+    }
+
+    private fun mimeTypeForSubtitleUrl(url: String): String? {
+        val lower = url.substringBeforeLast('?').lowercase()
+        return when {
+            lower.endsWith(".vtt") || lower.endsWith(".webvtt") -> "text/vtt"
+            lower.endsWith(".srt") -> "application/x-subrip"
+            lower.endsWith(".ssa") || lower.endsWith(".ass") -> "text/x-ssa"
+            lower.endsWith(".ttml") || lower.endsWith(".xml") -> "application/ttml+xml"
+            else -> null
+        }
+    }
+
+    // MARK: - Playback Controls
+
+    fun play() {
+        player?.play()
+    }
+
+    fun pause() {
+        player?.pause()
+    }
+
+    fun destroy() {
+        stopProgressLoop()
+        player?.release()
+        player = null
+        playerView.player = null
+        tracksReadyFired = false
+        currentUrl = null
+        subtitleTrackList = emptyList()
+        audioTrackList = emptyList()
+        currentSubtitleId = 0
+        currentAudioId = 0
+        videoDecoderName = null
+        audioDecoderName = null
+        cumulativeDroppedFrames = 0
+    }
+
+    fun seekTo(positionSec: Double) {
+        player?.seekTo((positionSec * 1000).toLong())
+    }
+
+    fun seekBy(offsetSec: Double) {
+        val p = player ?: return
+        val target = (p.currentPosition + offsetSec * 1000).coerceAtLeast(0.0)
+        p.seekTo(target.toLong())
+    }
+
+    fun setSpeed(speed: Double) {
+        player?.playbackParameters = PlaybackParameters(speed.toFloat())
+    }
+
+    fun getSpeed(): Float {
+        return player?.playbackParameters?.speed ?: 1f
+    }
+
+    fun isPaused(): Boolean {
+        return player?.isPlaying == false
+    }
+
+    fun getCurrentPosition(): Double {
+        return (player?.currentPosition ?: 0L) / 1000.0
+    }
+
+    fun getDuration(): Double {
+        val d = player?.duration ?: 0L
+        return if (d > 0) d / 1000.0 else 0.0
+    }
+
+    // MARK: - Track Mapping (1-based IDs to match MPV's contract)
+
+    data class TrackEntry(
+        val id: Int,          // 1-based JS-facing ID
+        val trackGroupIndex: Int,
+        val trackIndex: Int,
+        val format: Format,
+    )
+
+    private fun rebuildTrackMaps(tracks: Tracks?) {
+        if (tracks == null) return
+
+        val subtitles = mutableListOf<TrackEntry>()
+        val audios = mutableListOf<TrackEntry>()
+
+        tracks.groups.forEachIndexed { groupIndex, group ->
+            val rendererType = group.type
+            // Skip groups that have no tracks the player supports
+            for (trackIdx in 0 until group.length) {
+                if (!group.isTrackSupported(trackIdx)) continue
+                val format = group.getTrackFormat(trackIdx)
+                val entry = TrackEntry(
+                    id = 0, // assigned per-list below
+                    trackGroupIndex = groupIndex,
+                    trackIndex = trackIdx,
+                    format = format
+                )
+                when (rendererType) {
+                    C.TRACK_TYPE_TEXT -> subtitles.add(entry)
+                    C.TRACK_TYPE_AUDIO -> audios.add(entry)
+                    else -> { /* video / metadata ignored */ }
+                }
+            }
+        }
+
+        // Assign 1-based IDs per track kind.
+        subtitles.forEachIndexed { i, e -> subtitles[i] = e.copy(id = i + 1) }
+        audios.forEachIndexed { i, e -> audios[i] = e.copy(id = i + 1) }
+
+        subtitleTrackList = subtitles
+        audioTrackList = audios
+    }
+
+    private fun applyInitialTrackSelections() {
+        val p = player ?: return
+        val cfg = pendingConfig ?: return
+
+        // Initial subtitle/audio selection by 1-based ID.
+        if (cfg.initialAudioId != null && cfg.initialAudioId > 0) {
+            setAudioTrack(cfg.initialAudioId)
+        }
+        if (cfg.initialSubtitleId == null || cfg.initialSubtitleId <= 0) {
+            disableSubtitles()
+        } else {
+            setSubtitleTrack(cfg.initialSubtitleId)
+        }
+
+        // Only apply once per source load.
+        pendingConfig = null
+    }
+
+    // MARK: - Subtitle Controls
+
+    fun getSubtitleTracks(): List<Map<String, Any>> {
+        return subtitleTrackList.map { entry ->
+            mapOf(
+                "id" to entry.id,
+                "title" to (entry.format.label ?: ""),
+                "lang" to (entry.format.language ?: "")
+            )
+        }
+    }
+
+    fun setSubtitleTrack(trackId: Int) {
+        val p = player ?: return
+        val entry = subtitleTrackList.firstOrNull { it.id == trackId } ?: return
+        val matchedGroup = p.currentTracks.groups[entry.trackGroupIndex].mediaTrackGroup
+
+        // setOverrideForType replaces any existing override of the same
+        // track type — exactly what we want for single-track subtitle pickers.
+        val params = p.trackSelectionParameters.buildUpon()
+            .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, false)
+            .setOverrideForType(TrackSelectionOverride(matchedGroup, entry.trackIndex))
+            .build()
+        p.trackSelectionParameters = params
+        currentSubtitleId = trackId
+    }
+
+    fun disableSubtitles() {
+        val p = player ?: return
+        val params = p.trackSelectionParameters.buildUpon()
+            .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, true)
+            .build()
+        p.trackSelectionParameters = params
+        currentSubtitleId = 0
+    }
+
+    fun getCurrentSubtitleTrack(): Int = currentSubtitleId
+
+    fun addSubtitleFile(url: String, select: Boolean) {
+        val p = player ?: return
+        // Media3 does not expose the current MediaItem's existing
+        // SubtitleConfigurations, so we cannot append a side-loaded
+        // subtitle to a running item without losing the originals.
+        // For TV, external subs are bundled at load time via
+        // VideoLoadConfig.externalSubtitles (see buildMediaItem). This
+        // method rebuilds the current MediaItem with just the new
+        // subtitle config — acceptable when no other external subs are
+        // in play, which is the typical TV case.
+        val mime = mimeTypeForSubtitleUrl(url) ?: return
+        val currentMediaItem = p.currentMediaItem ?: return
+        val newSubConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(url))
+            .setMimeType(mime)
+            .setSelectionFlags(if (select) C.SELECTION_FLAG_DEFAULT else 0)
+            .build()
+
+        val rebuilt = currentMediaItem.buildUpon()
+            .setSubtitleConfigurations(listOf(newSubConfig))
+            .build()
+
+        val wasPlaying = p.isPlaying
+        val pos = p.currentPosition
+        p.setMediaItem(rebuilt, pos)
+        p.prepare()
+        if (wasPlaying) p.play()
+    }
+
+    // MARK: - Subtitle Positioning / Styling
+
+    fun setSubtitlePosition(position: Int) {
+        // position is 0-100 (MPV convention: 100 = bottom, 0 = top).
+        // Map to SubtitleView's bottom-padding fraction. Reserve a small
+        // margin so 100 doesn't hug the very bottom edge.
+        val clamped = position.coerceIn(0, 100)
+        subtitleBottomFraction = 0.95f - (clamped / 100f) * 0.87f
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleScale(scale: Double) {
+        subtitleScale = scale.toFloat()
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleMarginY(margin: Int) {
+        // Margin in px (approximate). SubtitleView only accepts a single
+        // bottom-padding fraction, so convert via a heuristic (1px ≈ 0.1%
+        // of view height, capped). Last-write-wins vs. setSubtitlePosition.
+        val fraction = (margin / 1000f).coerceIn(0.02f, 0.95f)
+        subtitleBottomFraction = fraction
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleAlignY(alignment: String) {
+        subtitleAlignY = alignment
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleFontSize(size: Int) {
+        subtitleFontSizePct = size
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleBackgroundColor(colorHex: String) {
+        subtitleBackgroundColor = parseColor(colorHex, subtitleBackgroundColor)
+        applySubtitleStyle()
+    }
+
+    fun setSubtitleBorderStyle(style: String) {
+        subtitleBorderStyle = style
+        applySubtitleStyle()
+    }
+
+    private fun parseColor(hex: String, fallback: Int): Int {
+        return try {
+            when {
+                hex.startsWith("#") && hex.length == 9 -> {
+                    // #RRGGBBAA
+                    val r = hex.substring(1, 3).toInt(16)
+                    val g = hex.substring(3, 5).toInt(16)
+                    val b = hex.substring(5, 7).toInt(16)
+                    val a = hex.substring(7, 9).toInt(16)
+                    Color.argb(a, r, g, b)
+                }
+                hex.startsWith("#") && hex.length == 7 -> Color.parseColor(hex)
+                else -> fallback
+            }
+        } catch (_: Throwable) {
+            fallback
+        }
+    }
+
+    private fun applySubtitleStyle() {
+        val sv = subtitleView ?: return
+
+        // Text size: explicit % wins; otherwise scale the default.
+        val textSizeFraction = if (subtitleFontSizePct != null) {
+            (subtitleFontSizePct!! / 100f) * SubtitleView.DEFAULT_TEXT_SIZE_FRACTION
+        } else {
+            SubtitleView.DEFAULT_TEXT_SIZE_FRACTION * subtitleScale
+        }
+        sv.setFractionalTextSize(textSizeFraction)
+
+        // Vertical position: explicit fraction (from setSubtitlePosition /
+        // setSubtitleMarginY) wins; otherwise fall back to alignY mapping.
+        val alignYFraction = when (subtitleAlignY) {
+            "top" -> 0.9f
+            "center" -> 0.5f
+            else -> 0.08f // bottom
+        }
+        val bottomFraction = subtitleBottomFraction ?: alignYFraction
+        sv.setBottomPaddingFraction(bottomFraction.coerceIn(0.02f, 0.95f))
+
+        // Edge / background style.
+        val foreground = Color.WHITE
+        val edgeType: Int
+        val backgroundColor: Int
+        when (subtitleBorderStyle) {
+            "background-box" -> {
+                edgeType = CaptionStyleCompat.EDGE_TYPE_NONE
+                // subtitleBackgroundColor already carries its own alpha
+                // (parsed from #RRGGBBAA by setSubtitleBackgroundColor).
+                // Alpha 0 → transparent, matching user intent.
+                backgroundColor = subtitleBackgroundColor
+            }
+            else -> {
+                // "outline-and-shadow"
+                edgeType = if (subtitleAlignY == "center")
+                    CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW
+                else
+                    CaptionStyleCompat.EDGE_TYPE_OUTLINE
+                backgroundColor = Color.TRANSPARENT
+            }
+        }
+
+        val style = CaptionStyleCompat(
+            foreground,
+            backgroundColor,
+            Color.TRANSPARENT,
+            edgeType,
+            Color.BLACK,
+            Typeface.SANS_SERIF
+        )
+        sv.setApplyEmbeddedStyles(false)
+        sv.setApplyEmbeddedFontSizes(false)
+        sv.setStyle(style)
+    }
+
+    // MARK: - Audio Track Controls
+
+    fun getAudioTracks(): List<Map<String, Any>> {
+        return audioTrackList.map { entry ->
+            // channelCount is Format.NO_VALUE (-1) when unknown — report 0.
+            val channels = if (entry.format.channelCount == Format.NO_VALUE) 0
+                else entry.format.channelCount
+            mapOf(
+                "id" to entry.id,
+                "title" to (entry.format.label ?: ""),
+                "lang" to (entry.format.language ?: ""),
+                "codec" to (entry.format.sampleMimeType ?: ""),
+                "channels" to channels
+            )
+        }
+    }
+
+    fun setAudioTrack(trackId: Int) {
+        val p = player ?: return
+        val entry = audioTrackList.firstOrNull { it.id == trackId } ?: return
+        val matchedGroup = p.currentTracks.groups[entry.trackGroupIndex].mediaTrackGroup
+
+        val params = p.trackSelectionParameters.buildUpon()
+            .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
+            .setOverrideForType(TrackSelectionOverride(matchedGroup, entry.trackIndex))
+            .build()
+        p.trackSelectionParameters = params
+        currentAudioId = trackId
+    }
+
+    fun getCurrentAudioTrack(): Int = currentAudioId
+
+    // MARK: - Video Scaling
+
+    fun setZoomedToFill(zoomed: Boolean) {
+        isZoomedToFill = zoomed
+        val resizeMode = if (zoomed) {
+            androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        } else {
+            androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT
+        }
+        playerView.resizeMode = resizeMode
+    }
+
+    fun isZoomedToFill(): Boolean = isZoomedToFill
+
+    // MARK: - Technical Info
+
+    fun getTechnicalInfo(): Map<String, Any> {
+        val p = player ?: return emptyMap()
+        val tracks = p.currentTracks
+
+        // Prefer the currently-selected track within each renderer group;
+        // fall back to the first supported track if none is selected yet.
+        val videoFormat = pickFormat(tracks, C.TRACK_TYPE_VIDEO)
+        val audioFormat = pickFormat(tracks, C.TRACK_TYPE_AUDIO)
+
+        val cacheSec = if (p.bufferedPosition > p.currentPosition) {
+            (p.bufferedPosition - p.currentPosition) / 1000.0
+        } else 0.0
+
+        val info = LinkedHashMap<String, Any>()
+        info["cacheSeconds"] = cacheSec
+
+        // Dropped frames — populated by analyticsListener.onDroppedVideoFrames.
+        if (cumulativeDroppedFrames > 0) {
+            info["droppedFrames"] = cumulativeDroppedFrames
+        }
+
+        // Decoder info — populated by analyticsListener.onVideo/AudioDecoderInitialized.
+        // For ExoPlayer this replaces MPV's voDriver/hwdec pairing. The
+        // FFmpeg extension reports names beginning with "FFmpeg", which we
+        // classify as software; everything else is MediaCodec (hardware).
+        videoDecoderName?.let { name ->
+            info["decoderName"] = name
+            info["decoderType"] = if (name.lowercase().startsWith("ffmpeg")) {
+                "software"
+            } else {
+                "hardware"
+            }
+        }
+
+        videoFormat?.let { f ->
+            if (f.width != Format.NO_VALUE) info["videoWidth"] = f.width
+            if (f.height != Format.NO_VALUE) info["videoHeight"] = f.height
+            f.sampleMimeType?.let { info["videoCodec"] = it }
+            // FPS: Format.NO_VALUE (-1f) means unknown — omit so the
+            // overlay skips the row instead of showing "-1".
+            if (f.frameRate > 0f) {
+                info["fps"] = f.frameRate.toDouble()
+            }
+            // Bitrate: prefer average, fall back to peak. Both can be
+            // NO_VALUE for adaptive HLS renditions — omit when unknown
+            // rather than reporting 0 Kbps.
+            val vBitrate = if (f.averageBitrate != Format.NO_VALUE) {
+                f.averageBitrate
+            } else {
+                f.peakBitrate
+            }
+            if (vBitrate != Format.NO_VALUE && vBitrate > 0) {
+                info["videoBitrate"] = vBitrate.toDouble()
+            }
+
+            // Raw codec tag from the container (e.g. "hev1.2.4.L153.B0").
+            // Carries profile / tier / level / constraint bytes — power
+            // users can decode it manually to see why a stream hit our
+            // HEVC level cap.
+            f.codecs?.let { info["videoCodecs"] = it }
+
+            // HDR / color metadata. Format.colorInfo is the authoritative
+            // source — the file/Jellyfin may claim HDR but the player is
+            // what decides whether the decoder+surface path is HDR-capable.
+            f.colorInfo?.let { ci ->
+                val hdr = deriveHdrFormat(ci)
+                if (hdr != null) info["hdrFormat"] = hdr
+                colorSpaceName(ci.colorSpace)?.let { info["colorSpace"] = it }
+                colorRangeName(ci.colorRange)?.let { info["colorRange"] = it }
+                colorTransferName(ci.colorTransfer)?.let { info["colorTransfer"] = it }
+            }
+        }
+
+        audioFormat?.let { f ->
+            f.sampleMimeType?.let { info["audioCodec"] = it }
+            val aBitrate = if (f.averageBitrate != Format.NO_VALUE) {
+                f.averageBitrate
+            } else {
+                f.peakBitrate
+            }
+            if (aBitrate != Format.NO_VALUE && aBitrate > 0) {
+                info["audioBitrate"] = aBitrate.toDouble()
+            }
+            if (f.channelCount > 0) info["audioChannels"] = f.channelCount
+            if (f.sampleRate > 0) info["audioSampleRate"] = f.sampleRate
+        }
+
+        return info
+    }
+
+    /**
+     * Map the active color transfer to a human-readable HDR format string.
+     * Returns null for SDR / unknown so the overlay can skip the row.
+     *
+     * HDR10 vs HDR10+ distinction isn't possible from Format alone in
+     * Media3 — HDR10+ is signaled via ST2094-40 SEI metadata which isn't
+     * exposed on Format. Both report as "HDR10" here; that matches what
+     * Media3 actually decodes (no HDR10+ tone-mapping).
+     */
+    private fun deriveHdrFormat(ci: ColorInfo): String? {
+        return when (ci.colorTransfer) {
+            C.COLOR_TRANSFER_HLG -> "HLG"
+            C.COLOR_TRANSFER_ST2084 -> "HDR10"
+            else -> null
+        }
+    }
+
+    private fun colorSpaceName(value: Int): String? = when (value) {
+        Format.NO_VALUE -> null
+        C.COLOR_SPACE_BT709 -> "BT.709"
+        C.COLOR_SPACE_BT601 -> "BT.601"
+        C.COLOR_SPACE_BT2020 -> "BT.2020"
+        else -> "Unknown"
+    }
+
+    private fun colorRangeName(value: Int): String? = when (value) {
+        Format.NO_VALUE -> null
+        C.COLOR_RANGE_LIMITED -> "Limited"
+        C.COLOR_RANGE_FULL -> "Full"
+        else -> "Unknown"
+    }
+
+    private fun colorTransferName(value: Int): String? = when (value) {
+        Format.NO_VALUE -> null
+        C.COLOR_TRANSFER_SDR -> "SDR"
+        C.COLOR_TRANSFER_ST2084 -> "ST2084 (PQ)"
+        C.COLOR_TRANSFER_HLG -> "HLG"
+        C.COLOR_TRANSFER_GAMMA_2_2 -> "Gamma 2.2"
+        else -> "Unknown"
+    }
+
+    private fun pickFormat(tracks: Tracks, type: Int): Format? {
+        val group = tracks.groups.firstOrNull { it.type == type } ?: return null
+        // Selected track wins.
+        for (i in 0 until group.length) {
+            if (group.isTrackSelected(i)) return group.getTrackFormat(i)
+        }
+        // Otherwise the first supported track.
+        for (i in 0 until group.length) {
+            if (group.isTrackSupported(i)) return group.getTrackFormat(i)
+        }
+        return null
+    }
+
+    // MARK: - Progress Loop
+
+    private fun startProgressLoop() {
+        stopProgressLoop()
+        mainHandler.postDelayed(progressRunnable, PROGRESS_INTERVAL_MS)
+    }
+
+    private fun stopProgressLoop() {
+        mainHandler.removeCallbacks(progressRunnable)
+    }
+
+    // MARK: - Cleanup
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        destroy()
+    }
+}

modules/exoplayer-player/expo-module.config.json

@@ -0,0 +1,6 @@
+{
+  "platforms": ["android"],
+  "android": {
+    "modules": ["expo.modules.exoplayerplayer.ExoPlayerModule"]
+  }
+}

modules/exoplayer-player/index.ts

@@ -0,0 +1,19 @@
+// Re-export the shared player contract from mpv-player so ExoPlayer
+// and MPV present identical surfaces to React. The MPV-prefixed setting
+// keys keep their names to avoid migrating existing installs.
+export type {
+  AudioTrack,
+  MpvPlayerViewProps,
+  MpvPlayerViewRef,
+  NowPlayingMetadata,
+  OnErrorEventPayload,
+  OnLoadEventPayload,
+  OnPictureInPictureChangePayload,
+  OnPlaybackStateChangePayload,
+  OnProgressEventPayload,
+  OnTracksReadyEventPayload,
+  SubtitleTrack,
+  TechnicalInfo,
+  VideoSource,
+} from "../mpv-player/src/MpvPlayer.types";
+export { default as ExoPlayerView } from "./src/ExoPlayerView";

modules/exoplayer-player/src/ExoPlayerView.tsx

@@ -0,0 +1,132 @@
+import { requireNativeView } from "expo";
+import * as React from "react";
+import { useImperativeHandle, useRef } from "react";
+
+import type {
+  MpvPlayerViewProps,
+  MpvPlayerViewRef,
+} from "../mpv-player/src/MpvPlayer.types";
+
+const NativeView: React.ComponentType<MpvPlayerViewProps & { ref?: any }> =
+  requireNativeView("ExoPlayer");
+
+/**
+ * ExoPlayer view wrapper. Exposes the same `MpvPlayerViewRef` interface as
+ * `MpvPlayerView` so callers can swap between the two players without
+ * changing code. PiP / ASS-override methods are forwarded to the native
+ * module which implements them as no-ops.
+ */
+export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
+  function ExoPlayerView(props, ref) {
+    const nativeRef = useRef<any>(null);
+
+    useImperativeHandle(ref, () => ({
+      play: async () => {
+        await nativeRef.current?.play();
+      },
+      pause: async () => {
+        await nativeRef.current?.pause();
+      },
+      destroy: async () => {
+        await nativeRef.current?.destroy();
+      },
+      seekTo: async (position: number) => {
+        await nativeRef.current?.seekTo(position);
+      },
+      seekBy: async (offset: number) => {
+        await nativeRef.current?.seekBy(offset);
+      },
+      setSpeed: async (speed: number) => {
+        await nativeRef.current?.setSpeed(speed);
+      },
+      getSpeed: async () => {
+        return await nativeRef.current?.getSpeed();
+      },
+      isPaused: async () => {
+        return await nativeRef.current?.isPaused();
+      },
+      getCurrentPosition: async () => {
+        return await nativeRef.current?.getCurrentPosition();
+      },
+      getDuration: async () => {
+        return await nativeRef.current?.getDuration();
+      },
+      startPictureInPicture: async () => {
+        await nativeRef.current?.startPictureInPicture();
+      },
+      stopPictureInPicture: async () => {
+        await nativeRef.current?.stopPictureInPicture();
+      },
+      isPictureInPictureSupported: async () => {
+        return await nativeRef.current?.isPictureInPictureSupported();
+      },
+      isPictureInPictureActive: async () => {
+        return await nativeRef.current?.isPictureInPictureActive();
+      },
+      getSubtitleTracks: async () => {
+        return await nativeRef.current?.getSubtitleTracks();
+      },
+      setSubtitleTrack: async (trackId: number) => {
+        await nativeRef.current?.setSubtitleTrack(trackId);
+      },
+      disableSubtitles: async () => {
+        await nativeRef.current?.disableSubtitles();
+      },
+      getCurrentSubtitleTrack: async () => {
+        return await nativeRef.current?.getCurrentSubtitleTrack();
+      },
+      addSubtitleFile: async (url: string, select = true) => {
+        await nativeRef.current?.addSubtitleFile(url, select);
+      },
+      setSubtitlePosition: async (position: number) => {
+        await nativeRef.current?.setSubtitlePosition(position);
+      },
+      setSubtitleScale: async (scale: number) => {
+        await nativeRef.current?.setSubtitleScale(scale);
+      },
+      setSubtitleMarginY: async (margin: number) => {
+        await nativeRef.current?.setSubtitleMarginY(margin);
+      },
+      setSubtitleAlignX: async (alignment: "left" | "center" | "right") => {
+        await nativeRef.current?.setSubtitleAlignX(alignment);
+      },
+      setSubtitleAlignY: async (alignment: "top" | "center" | "bottom") => {
+        await nativeRef.current?.setSubtitleAlignY(alignment);
+      },
+      setSubtitleFontSize: async (size: number) => {
+        await nativeRef.current?.setSubtitleFontSize(size);
+      },
+      setSubtitleBackgroundColor: async (color: string) => {
+        await nativeRef.current?.setSubtitleBackgroundColor(color);
+      },
+      setSubtitleBorderStyle: async (
+        style: "outline-and-shadow" | "background-box",
+      ) => {
+        await nativeRef.current?.setSubtitleBorderStyle(style);
+      },
+      setSubtitleAssOverride: async (mode: "no" | "force") => {
+        await nativeRef.current?.setSubtitleAssOverride(mode);
+      },
+      getAudioTracks: async () => {
+        return await nativeRef.current?.getAudioTracks();
+      },
+      setAudioTrack: async (trackId: number) => {
+        await nativeRef.current?.setAudioTrack(trackId);
+      },
+      getCurrentAudioTrack: async () => {
+        return await nativeRef.current?.getCurrentAudioTrack();
+      },
+      setZoomedToFill: async (zoomed: boolean) => {
+        await nativeRef.current?.setZoomedToFill(zoomed);
+      },
+      isZoomedToFill: async () => {
+        return await nativeRef.current?.isZoomedToFill();
+      },
+      getTechnicalInfo: async () => {
+        return await nativeRef.current?.getTechnicalInfo();
+      },
+    }));
+
+    return <NativeView ref={nativeRef} {...props} />;
+  },
+);

modules/index.ts

@@ -7,6 +7,8 @@ export type {
   DownloadStartedEvent,
 } from "./background-downloader";
 export { default as BackgroundDownloader } from "./background-downloader";
+// ExoPlayer (Android TV)
+export { ExoPlayerView } from "./exoplayer-player";
 // Glass Poster (tvOS 26+)
 export type { GlassPosterViewProps } from "./glass-poster";
 export { GlassPosterView, isGlassEffectAvailable } from "./glass-poster";

modules/mpv-player/android/build.gradle

@@ -53,5 +53,5 @@ android {
 
 dependencies {
   // libmpv from Maven Central
-  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
+  implementation 'dev.jdtech.mpv:libmpv:1.0.0'
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt

@@ -3,13 +3,14 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
-import android.content.res.AssetManager
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.system.Os
 import android.util.Log
 import android.view.Surface
 import java.io.File
-import java.io.FileOutputStream
+import java.util.Locale
 
 /**
  * MPV renderer that wraps libmpv for video playback.
@@ -35,6 +36,30 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         return uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
     }
 
+    /**
+     * True only on the Android emulator. Its goldfish/ranchu MediaCodec can't bind a
+     * decode output surface (decode opens with surface 0x0): HEVC then fails cleanly and
+     * mpv auto-falls-back to software, but H.264 "opens" deceptively and wedges the core
+     * (no fallback) — black video, then any command (seek/pause) deadlocks the UI thread
+     * → ANR. We force software decoding here.
+     *
+     * Only QEMU/SDK-exclusive signals are checked so a real device can never match — a
+     * false positive would needlessly drop shipping hardware to software decoding. The
+     * emulator reports ro.hardware=goldfish|ranchu, an sdk_* product, or a generic/
+     * emulator build fingerprint, none of which appear on real devices.
+     */
+    private fun isEmulator(): Boolean {
+        val hardware = Build.HARDWARE.lowercase()
+        if (hardware == "goldfish" || hardware == "ranchu") return true
+
+        val product = Build.PRODUCT
+        if (product == "sdk" || product.startsWith("sdk_")) return true
+
+        val fingerprint = Build.FINGERPRINT
+        return fingerprint.startsWith("generic") ||
+            fingerprint.contains("emulator", ignoreCase = true)
+    }
+
     interface Delegate {
         fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double)
         fun onPauseChanged(isPaused: Boolean)
@@ -51,8 +76,15 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     private var surface: Surface? = null
     private var isRunning = false
-    private var isStopping = false
-    
+
+    // This renderer's own mpv handle. Per-instance (not singleton) — each
+    // player screen gets a fresh mpv handle and drops the reference on stop.
+    // We intentionally do NOT call a destroy() equivalent: libmpv 1.0's
+    // nativeDestroy has an internal use-after-free we can't fix from Kotlin,
+    // so we mirror Findroid and let the JVM GC + native finalization path
+    // reclaim resources. Only one player is alive at a time in this app.
+    private var mpv: MPVLib? = null
+
     // Cached state
     private var cachedPosition: Double = 0.0
     private var cachedDuration: Double = 0.0
@@ -112,100 +144,108 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
 
     fun start(voDriver: String = "gpu-next") {
         if (isRunning) return
-        
+
         try {
-            MPVLib.create(context)
-            MPVLib.addObserver(this)
-            
-            /**
-             * Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
-             *
-             * Technical Background:
-             * ====================
-             * On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
-             * format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
-             * even when subtitle tracks are properly detected and loaded.
-             *
-             * Why This Is Necessary:
-             * =====================
-             * 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
-             *    mpv cannot access them directly due to sandboxing and library isolation.
-             *
-             * 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
-             *    configured directory, mpv either:
-             *    - Fails silently (subtitles don't appear)
-             *    - Falls back to a default font that may not support the required character set
-             *    - Crashes or produces rendering errors
-             *
-             * 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
-             *    MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
-             *
-             * Reference:
-             * =========
-             * This workaround is documented in the mpv-android project:
-             * https://github.com/mpv-android/mpv-android/issues/96
-             *
-             * The issue discusses that without a font in the config directory, SubRip subtitles fail to load
-             * properly on Android, and the solution is to copy a font file to a known location that mpv can access.
-             */
-            // Create mpv config directory and copy font files
+            // Per-instance handle — see class-level comment. Each player gets
+            // its own mpv; we drop the reference in stop().
+            val mpv = MPVLib.create(context)
+            this.mpv = mpv
+            mpv.addObserver(this)
+
+            // Resolved once — TV gets the memory-pressure customizations
+            // (SCUDO_OPTIONS, hwdec/profile, demuxer-seekable-cache, larger
+            // audio-buffer) that would be counterproductive on higher-RAM
+            // mobile devices. Demuxer cache sizes are NOT included here —
+            // those come from user settings via load().
+            val isTV = isTvDevice()
+
+            // mpv config directory — used by the config-dir option below and
+            // as XDG_CONFIG_HOME for fontconfig.
             val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
-            //Log.i(TAG, "mpv config dir: $mpvDir")
             if (!mpvDir.exists()) mpvDir.mkdirs()
-            // This needs to be named `subfont.ttf` else it won't work
-            arrayOf("subfont.ttf").forEach { fileName ->
-                val file = File(mpvDir, fileName)
-                if (file.exists()) return@forEach
-                context.assets
-                    .open(fileName, AssetManager.ACCESS_STREAMING)
-                    .copyTo(FileOutputStream(file))
+
+            // Point fontconfig (new in libmpv 1.0) at writable app dirs so it
+            // persists its font index across runs instead of re-walking
+            // /system/fonts on every subtitle/seek event. Each rebuild costs
+            // ~1-2 s and ~10-30 MB of scudo:primary memory that scudo then
+            // holds onto. Without this we see "No usable fontconfig
+            // configuration file found, using fallback" on every re-init.
+            try {
+                val cacheDir = context.cacheDir.absolutePath
+                val configDir = (context.getExternalFilesDir(null) ?: context.filesDir).absolutePath
+                Os.setenv("XDG_CACHE_HOME", cacheDir, true)
+                Os.setenv("XDG_CONFIG_HOME", configDir, true)
+                Os.setenv("HOME", configDir, true)
+            } catch (e: Exception) {
+                Log.w(TAG, "Could not set XDG/HOME env for fontconfig: ${e.message}")
             }
-            MPVLib.setOptionString("config", "yes")
-            MPVLib.setOptionString("config-dir", mpvDir.path)
+
+            mpv?.setOptionString("config", "yes")
+            mpv?.setOptionString("config-dir", mpvDir.path)
             
             // Configure mpv options before initialization (based on Findroid)
             this.voDriver = voDriver
-            MPVLib.setOptionString("vo", voDriver)
-            MPVLib.setOptionString("gpu-context", "android")
-            MPVLib.setOptionString("opengl-es", "yes")
+            mpv?.setOptionString("vo", voDriver)
+            mpv?.setOptionString("gpu-context", "android")
+            mpv?.setOptionString("opengl-es", "yes")
             
-            // Hardware video decoding
-            // TV: zero-copy (mediacodec) for better performance on low-power devices
-            // Mobile: copy mode (mediacodec-copy) for better compatibility
-            val isTV = isTvDevice()
-            if (isTV) {
-                MPVLib.setOptionString("hwdec", "mediacodec")
-                MPVLib.setOptionString("profile", "fast")
-            } else {
-                MPVLib.setOptionString("hwdec", "mediacodec-copy")
+            // Hardware decoder codecs (shared)
+            mpv?.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+
+            // Pause on initial cache fill (shared default). The actual
+            // cache mode, cache-secs, and demuxer cache sizes come from
+            // user preferences and are applied per-load in load().
+            mpv?.setOptionString("cache-pause-initial", "yes")
+
+            // Hardware decode path + TV-only memory options. Demuxer cache
+            // sizes and cache-secs are NOT set here — they come from user
+            // preferences via load().
+            //  - Emulator: software decode. Its MediaCodec can't bind an
+            //    output surface (surface 0x0); HEVC then fails cleanly and
+            //    mpv auto-falls-back to software, but H.264 "opens"
+            //    deceptively and wedges the core with no fallback (black
+            //    video, then any command — seek/pause — deadlocks the UI
+            //    thread → ANR). hwdec=no makes every codec render via the
+            //    gpu-next VO. Real devices unaffected.
+            //  - Real TV hardware: zero-copy `mediacodec` (fastest on
+            //    low-power devices) + fast profile.
+            //  - Real phone: `mediacodec-copy` (broadest compatibility).
+            when {
+                isEmulator() -> mpv?.setOptionString("hwdec", "no")
+                isTV -> {
+                    mpv?.setOptionString("hwdec", "mediacodec")
+                    mpv?.setOptionString("profile", "fast")
+                    // Don't retain already-played content for backward
+                    // seeking over a network source — Jellyfin can re-fetch
+                    // on demand. Saves up to ~30 MiB on long seeks and
+                    // reduces swap pressure.
+                    mpv?.setOptionString("demuxer-seekable-cache", "no")
+                    // Larger audio buffer to absorb page-fault stalls
+                    // (default ~0.2s). Cheap insurance against the audio
+                    // underruns that happen when the kernel is swap-thrashing.
+                    mpv?.setOptionString("audio-buffer", "0.5")
+                }
+                else -> mpv?.setOptionString("hwdec", "mediacodec-copy")
             }
-            MPVLib.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
-            
-            // Cache settings for better network streaming
-            MPVLib.setOptionString("cache", "yes")
-            MPVLib.setOptionString("cache-pause-initial", "yes")
-            MPVLib.setOptionString("demuxer-max-bytes", "150MiB")
-            MPVLib.setOptionString("demuxer-max-back-bytes", "75MiB")
-            MPVLib.setOptionString("demuxer-readahead-secs", "20")
             
             // Seeking optimization - faster seeking at the cost of less precision
             // Use keyframe seeking by default (much faster for network streams)
-            MPVLib.setOptionString("hr-seek", "no")
+            mpv?.setOptionString("hr-seek", "no")
             // Drop frames during seeking for faster response
-            MPVLib.setOptionString("hr-seek-framedrop", "yes")
+            mpv?.setOptionString("hr-seek-framedrop", "yes")
             
             // Subtitle settings
-            MPVLib.setOptionString("sub-scale-with-window", "no")
-            MPVLib.setOptionString("sub-use-margins", "no")
-            MPVLib.setOptionString("subs-match-os-language", "yes")
-            MPVLib.setOptionString("subs-fallback", "yes")
+            mpv?.setOptionString("sub-scale-with-window", "no")
+            mpv?.setOptionString("sub-use-margins", "no")
+            mpv?.setOptionString("subs-match-os-language", "yes")
+            mpv?.setOptionString("subs-fallback", "yes")
             
             // Important: Start with force-window=no, will be set to yes when surface is attached
-            MPVLib.setOptionString("force-window", "no")
-            MPVLib.setOptionString("keep-open", "always")
-            
-            MPVLib.initialize()
-            
+            mpv?.setOptionString("force-window", "no")
+            mpv?.setOptionString("keep-open", "always")
+
+            mpv.initialize()
+
             // Observe properties
             observeProperties()
             
@@ -218,21 +258,68 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     }
     
     fun stop() {
-        if (isStopping) return
         if (!isRunning) return
-        
-        isStopping = true
         isRunning = false
-        
-        try {
-            MPVLib.removeObserver(this)
-            MPVLib.detachSurface()
-            MPVLib.destroy()
-        } catch (e: Exception) {
-            Log.e(TAG, "Error stopping MPV: ${e.message}")
-        }
-        
-        isStopping = false
+
+        val m = mpv
+        mpv = null
+
+        // Clear cached media state on the main thread so the next player
+        // screen doesn't observe stale position/duration values during the
+        // (async) teardown below.
+        currentUrl = null
+        currentHeaders = null
+        pendingExternalSubtitles = emptyList()
+        initialSubtitleId = null
+        initialAudioId = null
+        cachedPosition = 0.0
+        cachedDuration = 0.0
+        cachedCacheSeconds = 0.0
+
+        if (m == null) return
+
+        // Teardown runs on a background daemon thread. mpv's "stop" command
+        // flushes the demuxer queue and releases the MediaCodec hardware
+        // decoder — synchronous JNI work that can block for hundreds of ms
+        // on TV hardware. Running it on the main thread produced a visible
+        // delay/stutter between pressing "exit" and the confirm alert
+        // appearing. The local `m` keeps the MPVLib instance alive for the
+        // lifetime of this thread even though we've already nulled `mpv`.
+        Thread {
+            // Drop force-window BEFORE issuing stop. With keep-open=always +
+            // force-window=yes, mpv tears down the decoder at stop time but
+            // tries to keep the VO alive — which fires an internal
+            // video-reconfig. On libmpv 1.0's gpu-next/android backend that
+            // reconfig path crashes with "Missing surface pointer" because we
+            // detach the Surface below before mpv's worker reaches the
+            // reconfig step (command() is async). Setting force-window=no
+            // first makes mpv tear VO down cleanly instead of attempting a
+            // doomed re-init, eliminating the fatal VO error and the
+            // "playback won't restart" aftermath.
+            try {
+                m.setOptionString("force-window", "no")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error clearing force-window: ${e.message}")
+            }
+            try {
+                // Stop playback — flushes demuxer queue and signals MediaCodec
+                // to release its hardware decoders. This is the bulk of what
+                // we can reclaim without calling destroy().
+                m.command(arrayOf("stop"))
+            } catch (e: Exception) {
+                Log.e(TAG, "Error stopping mpv playback: ${e.message}")
+            }
+            try {
+                m.removeObserver(this)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error removing mpv observer: ${e.message}")
+            }
+            try {
+                m.detachSurface()
+            } catch (e: Exception) {
+                Log.e(TAG, "Error detaching mpv surface: ${e.message}")
+            }
+        }.also { it.isDaemon = true }.start()
     }
     
     /**
@@ -247,10 +334,10 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = surface
         Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
         if (isRunning) {
-            MPVLib.attachSurface(surface)
-            MPVLib.setOptionString("force-window", "yes")
+            mpv?.attachSurface(surface)
+            mpv?.setOptionString("force-window", "yes")
             // Read back vo to confirm it's still active
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
         }
     }
@@ -270,8 +357,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = null
         Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
         if (isRunning) {
-            MPVLib.detachSurface()
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
+            mpv?.detachSurface()
+            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
         }
     }
@@ -282,7 +369,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
      */
     fun updateSurfaceSize(width: Int, height: Int) {
         if (isRunning) {
-            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
+            mpv?.setPropertyString("android-surface-size", "${width}x$height")
             Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
         } else {
             Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
@@ -298,9 +385,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         if (!isRunning) return
         val pos = cachedPosition
         Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        MPVLib.command(arrayOf("frame-step"))
+        mpv?.command(arrayOf("frame-step"))
         if (pos > 0) {
-            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
+            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
         }
     }
     
@@ -310,29 +397,43 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         startPosition: Double? = null,
         externalSubtitles: List<String>? = null,
         initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null
+        initialAudioId: Int? = null,
+        cacheEnabled: String? = null,
+        cacheSeconds: Int? = null,
+        demuxerMaxBytes: Int? = null,
+        demuxerMaxBackBytes: Int? = null
     ) {
         currentUrl = url
         currentHeaders = headers
         pendingExternalSubtitles = externalSubtitles ?: emptyList()
         this.initialSubtitleId = initialSubtitleId
         this.initialAudioId = initialAudioId
-        
+
         _isLoading = true
         isReadyToSeek = false
         mainHandler.post { delegate?.onLoadingChanged(true) }
-        
+
         // Stop previous playback
-        MPVLib.command(arrayOf("stop"))
-        
+        mpv?.command(arrayOf("stop"))
+
         // Set HTTP headers if provided
         updateHttpHeaders(headers)
+
+        // Apply cache/buffer settings from user preferences (mirrors iOS).
+        // These override the conservative defaults applied in start() so the
+        // TV/mobile settings screen actually takes effect on Android.
+        cacheEnabled?.let { mpv?.setOptionString("cache", it) }
+        cacheSeconds?.let { mpv?.setOptionString("cache-secs", it.toString()) }
+        demuxerMaxBytes?.let { mpv?.setOptionString("demuxer-max-bytes", "${it}MiB") }
+        demuxerMaxBackBytes?.let { mpv?.setOptionString("demuxer-max-back-bytes", "${it}MiB") }
         
-        // Set start position
+        // Set start position. mpv's time parser requires '.' as the decimal
+        // separator; use Locale.US so devices with other default locales
+        // (e.g. ',' as decimal separator) don't break resume-from-position.
         if (startPosition != null && startPosition > 0) {
-            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
+            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
         } else {
-            MPVLib.setPropertyString("start", "0")
+            mpv?.setPropertyString("start", "0")
         }
         
         // Set initial audio track if specified
@@ -352,7 +453,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         // Load the file
-        MPVLib.command(arrayOf("loadfile", url, "replace"))
+        mpv?.command(arrayOf("loadfile", url, "replace"))
     }
     
     fun reloadCurrentItem() {
@@ -368,29 +469,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        MPVLib.setPropertyString("http-header-fields", headerString)
+        mpv?.setPropertyString("http-header-fields", headerString)
     }
     
     private fun observeProperties() {
-        MPVLib.observeProperty("duration", MPV_FORMAT_DOUBLE)
-        MPVLib.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
-        MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
-        MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
-        MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
-        MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("duration", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
+        mpv?.observeProperty("pause", MPV_FORMAT_FLAG)
+        mpv?.observeProperty("track-list/count", MPV_FORMAT_INT64)
+        mpv?.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
+        mpv?.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
         // Video dimensions for PiP aspect ratio
-        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
     }
-    
+
     // MARK: - Playback Controls
     
     fun play() {
-        MPVLib.setPropertyBoolean("pause", false)
+        mpv?.setPropertyBoolean("pause", false)
     }
     
     fun pause() {
-        MPVLib.setPropertyBoolean("pause", true)
+        mpv?.setPropertyBoolean("pause", true)
     }
     
     fun togglePause() {
@@ -400,22 +501,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun seekTo(seconds: Double) {
         val clamped = maxOf(0.0, seconds)
         cachedPosition = clamped
-        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
+        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
     }
     
     fun seekBy(seconds: Double) {
         val newPosition = maxOf(0.0, cachedPosition + seconds)
         cachedPosition = newPosition
-        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
+        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
     }
     
     fun setSpeed(speed: Double) {
         _playbackSpeed = speed
-        MPVLib.setPropertyDouble("speed", speed)
+        mpv?.setPropertyDouble("speed", speed)
     }
     
     fun getSpeed(): Double {
-        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
+        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
     }
     
     // MARK: - Subtitle Controls
@@ -423,19 +524,19 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getSubtitleTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
+        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "sub") continue
             
-            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
             
-            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -447,61 +548,61 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun setSubtitleTrack(trackId: Int) {
         Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
         if (trackId < 0) {
-            MPVLib.setPropertyString("sid", "no")
+            mpv?.setPropertyString("sid", "no")
         } else {
-            MPVLib.setPropertyInt("sid", trackId)
+            mpv?.setPropertyInt("sid", trackId)
         }
     }
     
     fun disableSubtitles() {
-        MPVLib.setPropertyString("sid", "no")
+        mpv?.setPropertyString("sid", "no")
     }
     
     fun getCurrentSubtitleTrack(): Int {
-        return MPVLib.getPropertyInt("sid") ?: 0
+        return mpv?.getPropertyInt("sid") ?: 0
     }
     
     fun addSubtitleFile(url: String, select: Boolean = true) {
         val flag = if (select) "select" else "cached"
-        MPVLib.command(arrayOf("sub-add", url, flag))
+        mpv?.command(arrayOf("sub-add", url, flag))
     }
     
     // MARK: - Subtitle Positioning
     
     fun setSubtitlePosition(position: Int) {
-        MPVLib.setPropertyInt("sub-pos", position)
+        mpv?.setPropertyInt("sub-pos", position)
     }
     
     fun setSubtitleScale(scale: Double) {
-        MPVLib.setPropertyDouble("sub-scale", scale)
+        mpv?.setPropertyDouble("sub-scale", scale)
     }
     
     fun setSubtitleMarginY(margin: Int) {
-        MPVLib.setPropertyInt("sub-margin-y", margin)
+        mpv?.setPropertyInt("sub-margin-y", margin)
     }
     
     fun setSubtitleAlignX(alignment: String) {
-        MPVLib.setPropertyString("sub-align-x", alignment)
+        mpv?.setPropertyString("sub-align-x", alignment)
     }
     
     fun setSubtitleAlignY(alignment: String) {
-        MPVLib.setPropertyString("sub-align-y", alignment)
+        mpv?.setPropertyString("sub-align-y", alignment)
     }
     
     fun setSubtitleFontSize(size: Int) {
-        MPVLib.setPropertyInt("sub-font-size", size)
+        mpv?.setPropertyInt("sub-font-size", size)
     }
 
     fun setSubtitleBorderStyle(style: String) {
-        MPVLib.setPropertyString("sub-border-style", style)
+        mpv?.setPropertyString("sub-border-style", style)
     }
 
     fun setSubtitleBackgroundColor(color: String) {
-        MPVLib.setPropertyString("sub-back-color", color)
+        mpv?.setPropertyString("sub-back-color", color)
     }
 
     fun setSubtitleAssOverride(mode: String) {
-        MPVLib.setPropertyString("sub-ass-override", mode)
+        mpv?.setPropertyString("sub-ass-override", mode)
     }
 
     // MARK: - Audio Track Controls
@@ -509,25 +610,25 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getAudioTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
+        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "audio") continue
             
-            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            MPVLib.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
             
-            val channels = MPVLib.getPropertyInt("track-list/$i/audio-channels")
+            val channels = mpv?.getPropertyInt("track-list/$i/audio-channels")
             if (channels != null && channels > 0) {
                 track["channels"] = channels
             }
             
-            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -538,11 +639,11 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     fun setAudioTrack(trackId: Int) {
         Log.i(TAG, "setAudioTrack: setting aid to $trackId")
-        MPVLib.setPropertyInt("aid", trackId)
+        mpv?.setPropertyInt("aid", trackId)
     }
     
     fun getCurrentAudioTrack(): Int {
-        return MPVLib.getPropertyInt("aid") ?: 0
+        return mpv?.getPropertyInt("aid") ?: 0
     }
 
     // MARK: - Video Scaling
@@ -551,7 +652,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         // panscan: 0.0 = fit (letterbox), 1.0 = fill (crop)
         val panscanValue = if (zoomed) 1.0 else 0.0
         Log.i(TAG, "setZoomedToFill: setting panscan to $panscanValue")
-        MPVLib.setPropertyDouble("panscan", panscanValue)
+        mpv?.setPropertyDouble("panscan", panscanValue)
     }
 
     // MARK: - Technical Info
@@ -560,58 +661,79 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         val info = mutableMapOf<String, Any>()
 
         // Video dimensions
-        MPVLib.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
             info["videoWidth"] = it
         }
-        MPVLib.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
             info["videoHeight"] = it
         }
 
         // Video codec
-        MPVLib.getPropertyString("video-format")?.let {
+        mpv?.getPropertyString("video-format")?.let {
             info["videoCodec"] = it
         }
 
         // Audio codec
-        MPVLib.getPropertyString("audio-codec-name")?.let {
+        mpv?.getPropertyString("audio-codec-name")?.let {
             info["audioCodec"] = it
         }
 
         // FPS (container fps)
-        MPVLib.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
             info["fps"] = it
         }
 
         // Video bitrate (bits per second)
-        MPVLib.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
             info["videoBitrate"] = it
         }
 
         // Audio bitrate (bits per second)
-        MPVLib.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
+        mpv?.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
             info["audioBitrate"] = it
         }
 
         // Demuxer cache duration (seconds of video buffered)
-        MPVLib.getPropertyDouble("demuxer-cache-duration")?.let {
+        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
             info["cacheSeconds"] = it
         }
 
+        // Configured cache limits — read back from mpv to confirm user
+        // settings actually took effect. mpv stores byte sizes as int64
+        // (bytes); convert to MiB for display.
+        mpv?.getPropertyInt("demuxer-max-bytes")?.let { bytes ->
+            info["demuxerMaxBytes"] = bytes / (1024 * 1024)
+        }
+        mpv?.getPropertyInt("demuxer-max-back-bytes")?.let { bytes ->
+            info["demuxerMaxBackBytes"] = bytes / (1024 * 1024)
+        }
+        mpv?.getPropertyDouble("cache-secs")?.let { secs ->
+            info["cacheSecsLimit"] = secs
+        }
+
         // Dropped frames
-        MPVLib.getPropertyInt("frame-drop-count")?.let {
+        mpv?.getPropertyInt("frame-drop-count")?.let {
             info["droppedFrames"] = it
         }
 
         // Active video output driver (read from MPV to confirm what's actually applied)
-        MPVLib.getPropertyString("vo")?.let {
+        mpv?.getPropertyString("vo")?.let {
             info["voDriver"] = it
         }
 
-        // Active hardware decoder
-        MPVLib.getPropertyString("hwdec-active")?.let {
+        // Active hardware decoder.
+        // hwdec-current yields e.g. "mediacodec",
+        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
+        mpv?.getPropertyString("hwdec-current")?.let {
             info["hwdec"] = it
         }
 
+        // Estimated video output fps (renderer-side, after filtering).
+        // Useful for diagnosing display/pipeline drops vs container fps.
+        mpv?.getPropertyDouble("estimated-vf-fps")?.takeIf { it > 0 }?.let {
+            info["estimatedVfFps"] = it
+        }
+
         return info
     }
 
@@ -704,7 +826,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                     pendingExternalSubtitles.forEachIndexed { index, subUrl ->
                         android.util.Log.d("MPVRenderer", "Adding external subtitle [$index]: $subUrl")
                         // "auto" flag = add without auto-selecting (order preserved, MPVLib.command is sync)
-                        MPVLib.command(arrayOf("sub-add", subUrl, "auto"))
+                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
                     }
                     pendingExternalSubtitles = emptyList()
                 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt

@@ -1,20 +1,29 @@
 package expo.modules.mpvplayer
 
 import android.content.Context
-import android.util.Log
-import android.view.Surface
 import dev.jdtech.mpv.MPVLib as LibMPV
 
 /**
- * Wrapper around the dev.jdtech.mpv.MPVLib class.
- * This provides a consistent interface for the rest of the app.
+ * Per-instance wrapper around the dev.jdtech.mpv.MPVLib class.
+ *
+ * libmpv 1.0 exposes an instance-based API: each `LibMPV.create(ctx)` returns
+ * a fresh, independent handle. Each player creates its own MPVLib instance
+ * (Findroid pattern) and on teardown we simply drop the reference. We do NOT
+ * call `LibMPV.destroy()` — its native implementation has an internal
+ * use-after-free on libmpv 1.0 that we cannot fix from Kotlin. Letting the
+ * GC reach the JVM-level finalizer (or never reaching it, since the native
+ * handle lives in process-global state until exit) is strictly safer than
+ * crashing.
+ *
+ * Trade-off: mpv's native footprint (decoder + demuxer cache) for one player
+ * stays allocated until the next player's allocation displaces it in scudo's
+ * arena. On a TV app where the player is the dominant memory consumer and
+ * only one player is alive at a time, this is acceptable.
  */
-object MPVLib {
-    private const val TAG = "MPVLib"
-    
-    private var initialized = false
-    
-    // Event observer interface
+class MPVLib private constructor(private val instance: LibMPV) {
+
+    // Event observer interface — mirrors dev.jdtech.mpv.MPVLib.EventObserver
+    // so MPVLayerRenderer implements a stable, wrapper-owned signature.
     interface EventObserver {
         fun eventProperty(property: String)
         fun eventProperty(property: String, value: Long)
@@ -23,198 +32,144 @@ object MPVLib {
         fun eventProperty(property: String, value: Double)
         fun event(eventId: Int)
     }
-    
+
     private val observers = mutableListOf<EventObserver>()
-    
-    // Library event observer that forwards to our observers
+
+    // Library event observer that forwards LibMPV callbacks to our observers.
     private val libObserver = object : LibMPV.EventObserver {
-        override fun eventProperty(property: String) {
+        override fun eventProperty(property: String) =
+            dispatch { it.eventProperty(property) }
+
+        override fun eventProperty(property: String, value: Long) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: Boolean) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: String) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun eventProperty(property: String, value: Double) =
+            dispatch { it.eventProperty(property, value) }
+
+        override fun event(eventId: Int) =
+            dispatch { it.event(eventId) }
+
+        private inline fun dispatch(block: (EventObserver) -> Unit) {
             synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Long) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Boolean) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: String) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun eventProperty(property: String, value: Double) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.eventProperty(property, value)
-                }
-            }
-        }
-        
-        override fun event(eventId: Int) {
-            synchronized(observers) {
-                for (observer in observers) {
-                    observer.event(eventId)
-                }
+                observers.forEach(block)
             }
         }
     }
-    
+
     fun addObserver(observer: EventObserver) {
-        synchronized(observers) {
-            observers.add(observer)
-        }
+        synchronized(observers) { observers.add(observer) }
     }
-    
+
     fun removeObserver(observer: EventObserver) {
-        synchronized(observers) {
-            observers.remove(observer)
-        }
+        synchronized(observers) { observers.remove(observer) }
     }
-    
-    // MPV Event IDs
-    const val MPV_EVENT_NONE = 0
-    const val MPV_EVENT_SHUTDOWN = 1
-    const val MPV_EVENT_LOG_MESSAGE = 2
-    const val MPV_EVENT_GET_PROPERTY_REPLY = 3
-    const val MPV_EVENT_SET_PROPERTY_REPLY = 4
-    const val MPV_EVENT_COMMAND_REPLY = 5
-    const val MPV_EVENT_START_FILE = 6
-    const val MPV_EVENT_END_FILE = 7
-    const val MPV_EVENT_FILE_LOADED = 8
-    const val MPV_EVENT_IDLE = 11
-    const val MPV_EVENT_TICK = 14
-    const val MPV_EVENT_CLIENT_MESSAGE = 16
-    const val MPV_EVENT_VIDEO_RECONFIG = 17
-    const val MPV_EVENT_AUDIO_RECONFIG = 18
-    const val MPV_EVENT_SEEK = 20
-    const val MPV_EVENT_PLAYBACK_RESTART = 21
-    const val MPV_EVENT_PROPERTY_CHANGE = 22
-    const val MPV_EVENT_QUEUE_OVERFLOW = 24
-    
-    // End file reason
-    const val MPV_END_FILE_REASON_EOF = 0
-    const val MPV_END_FILE_REASON_STOP = 2
-    const val MPV_END_FILE_REASON_QUIT = 3
-    const val MPV_END_FILE_REASON_ERROR = 4
-    const val MPV_END_FILE_REASON_REDIRECT = 5
-    
-    /**
-     * Create and initialize the MPV library
-     */
-    fun create(context: Context, configDir: String? = null) {
-        if (initialized) return
-        
-        try {
-            LibMPV.create(context)
-            LibMPV.addObserver(libObserver)
-            initialized = true
-            Log.i(TAG, "libmpv created successfully")
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to create libmpv: ${e.message}")
-            throw e
-        }
-    }
-    
+
     fun initialize() {
-        LibMPV.init()
+        instance.init()
     }
-    
-    fun destroy() {
-        if (!initialized) return
-        try {
-            LibMPV.removeObserver(libObserver)
-            LibMPV.destroy()
-        } catch (e: Exception) {
-            Log.e(TAG, "Error destroying mpv: ${e.message}")
-        }
-        initialized = false
+
+    fun attachSurface(surface: android.view.Surface) {
+        instance.attachSurface(surface)
     }
-    
-    fun isInitialized(): Boolean = initialized
-    
-    fun attachSurface(surface: Surface) {
-        LibMPV.attachSurface(surface)
-    }
-    
+
     fun detachSurface() {
-        LibMPV.detachSurface()
+        instance.detachSurface()
     }
-    
-    fun command(cmd: Array<String?>) {
-        LibMPV.command(cmd)
+
+    fun command(cmd: Array<String>) {
+        instance.command(cmd)
     }
-    
+
     fun setOptionString(name: String, value: String): Int {
-        return LibMPV.setOptionString(name, value)
+        return instance.setOptionString(name, value)
     }
-    
-    fun getPropertyInt(name: String): Int? {
-        return try {
-            LibMPV.getPropertyInt(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyDouble(name: String): Double? {
-        return try {
-            LibMPV.getPropertyDouble(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyBoolean(name: String): Boolean? {
-        return try {
-            LibMPV.getPropertyBoolean(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
-    fun getPropertyString(name: String): String? {
-        return try {
-            LibMPV.getPropertyString(name)
-        } catch (e: Exception) {
-            null
-        }
-    }
-    
+
+    fun getPropertyInt(name: String): Int? = try {
+        instance.getPropertyInt(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyDouble(name: String): Double? = try {
+        instance.getPropertyDouble(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyBoolean(name: String): Boolean? = try {
+        instance.getPropertyBoolean(name)
+    } catch (e: Exception) { null }
+
+    fun getPropertyString(name: String): String? = try {
+        instance.getPropertyString(name)
+    } catch (e: Exception) { null }
+
     fun setPropertyInt(name: String, value: Int) {
-        LibMPV.setPropertyInt(name, value)
+        instance.setPropertyInt(name, value)
     }
-    
+
     fun setPropertyDouble(name: String, value: Double) {
-        LibMPV.setPropertyDouble(name, value)
+        instance.setPropertyDouble(name, value)
     }
-    
+
     fun setPropertyBoolean(name: String, value: Boolean) {
-        LibMPV.setPropertyBoolean(name, value)
+        instance.setPropertyBoolean(name, value)
     }
-    
+
     fun setPropertyString(name: String, value: String) {
-        LibMPV.setPropertyString(name, value)
+        instance.setPropertyString(name, value)
     }
-    
+
     fun observeProperty(name: String, format: Int) {
-        LibMPV.observeProperty(name, format)
+        instance.observeProperty(name, format)
+    }
+
+    companion object {
+        /**
+         * Create a fresh mpv handle. Each call returns an independent instance —
+         * do not share across players. Attach exactly one [EventObserver] per
+         * player via [addObserver].
+         */
+        fun create(context: Context): MPVLib {
+            val lib = LibMPV.create(context)
+                ?: throw IllegalStateException("LibMPV.create returned null")
+            val wrapper = MPVLib(lib)
+            // The libObserver is attached for the lifetime of this MPVLib
+            // instance and forwards every LibMPV callback to our observers
+            // list. Player-specific observers are added/removed via
+            // addObserver/removeObserver.
+            lib.addObserver(wrapper.libObserver)
+            return wrapper
+        }
+
+        // MPV Event IDs (kept here so observers can reference them without
+        // holding a reference to an instance).
+        const val MPV_EVENT_NONE = 0
+        const val MPV_EVENT_SHUTDOWN = 1
+        const val MPV_EVENT_LOG_MESSAGE = 2
+        const val MPV_EVENT_GET_PROPERTY_REPLY = 3
+        const val MPV_EVENT_SET_PROPERTY_REPLY = 4
+        const val MPV_EVENT_COMMAND_REPLY = 5
+        const val MPV_EVENT_START_FILE = 6
+        const val MPV_EVENT_END_FILE = 7
+        const val MPV_EVENT_FILE_LOADED = 8
+        const val MPV_EVENT_IDLE = 11
+        const val MPV_EVENT_TICK = 14
+        const val MPV_EVENT_CLIENT_MESSAGE = 16
+        const val MPV_EVENT_VIDEO_RECONFIG = 17
+        const val MPV_EVENT_AUDIO_RECONFIG = 18
+        const val MPV_EVENT_SEEK = 20
+        const val MPV_EVENT_PLAYBACK_RESTART = 21
+        const val MPV_EVENT_PROPERTY_CHANGE = 22
+        const val MPV_EVENT_QUEUE_OVERFLOW = 24
+
+        // End file reason
+        const val MPV_END_FILE_REASON_EOF = 0
+        const val MPV_END_FILE_REASON_STOP = 2
+        const val MPV_END_FILE_REASON_QUIT = 3
+        const val MPV_END_FILE_REASON_ERROR = 4
+        const val MPV_END_FILE_REASON_REDIRECT = 5
     }
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -28,7 +28,11 @@ class MpvPlayerModule : Module() {
                 if (source == null) return@Prop
                 
                 val urlString = source["url"] as? String ?: return@Prop
-                
+
+                // Parse cache config if provided (mirrors iOS)
+                @Suppress("UNCHECKED_CAST")
+                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
+
                 @Suppress("UNCHECKED_CAST")
                 val config = VideoLoadConfig(
                     url = urlString,
@@ -38,7 +42,11 @@ class MpvPlayerModule : Module() {
                     autoplay = (source["autoplay"] as? Boolean) ?: true,
                     initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
                     initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    voDriver = source["voDriver"] as? String
+                    voDriver = source["voDriver"] as? String,
+                    cacheEnabled = cacheConfig?.get("enabled") as? String,
+                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
+                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
+                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
                 )
                 
                 view.loadVideo(config)
@@ -60,6 +68,15 @@ class MpvPlayerModule : Module() {
                 view.pause()
             }
 
+            // Stop playback and release the MediaCodec decoder + demuxer.
+            // Does not synchronously tear down the native mpv handle (see
+            // MPVLib / MpvPlayerView.destroy docs). Call before navigating
+            // away from the player screen to avoid OOM during screen
+            // transitions on low-RAM devices.
+            AsyncFunction("destroy") { view: MpvPlayerView ->
+                view.destroy()
+            }
+
             // Async function to seek to position
             AsyncFunction("seekTo") { view: MpvPlayerView, position: Double ->
                 view.seekTo(position)

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -2,14 +2,12 @@ package expo.modules.mpvplayer
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.Rect
-import android.graphics.SurfaceTexture
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.Surface
-import android.view.TextureView
-import android.view.View
+import android.view.SurfaceHolder
+import android.view.SurfaceView
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -26,15 +24,30 @@ data class VideoLoadConfig(
     val autoplay: Boolean = true,
     val initialSubtitleId: Int? = null,
     val initialAudioId: Int? = null,
-    val voDriver: String? = null
+    val voDriver: String? = null,
+    val cacheEnabled: String? = null,
+    val cacheSeconds: Int? = null,
+    val demuxerMaxBytes: Int? = null,
+    val demuxerMaxBackBytes: Int? = null,
 )
 
 /**
  * MpvPlayerView - ExpoView that hosts the MPV player.
- * Uses TextureView for reliable Picture-in-Picture support.
+ *
+ * Uses SurfaceView (not TextureView) so the surface routes directly to
+ * SurfaceFlinger (the OS compositor) rather than compositing into the
+ * app's window surface. This matches mpv-android's architecture and
+ * gives mpv a standalone surface.
+ *
+ * PiP black-screen mitigation: SurfaceView's surface is destroyed and
+ * recreated on PiP entry/exit, and the new surface's initial dimensions
+ * can be stale until the next layout pass. We push dimension updates to
+ * mpv via both SurfaceHolder.Callback.surfaceChanged AND an
+ * OnLayoutChangeListener, so the PiP transition (which fires layout
+ * passes on the view itself) reaches mpv promptly.
  */
 class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext),
-    MPVLayerRenderer.Delegate, TextureView.SurfaceTextureListener {
+    MPVLayerRenderer.Delegate, SurfaceHolder.Callback {
 
     companion object {
         private const val TAG = "MpvPlayerView"
@@ -48,7 +61,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     val onTracksReady by EventDispatcher()
     val onPictureInPictureChange by EventDispatcher()
 
-    private var textureView: TextureView
+    private var surfaceView: SurfaceView
     private var renderer: MPVLayerRenderer? = null
     private var pipController: PiPController? = null
 
@@ -59,30 +72,45 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var surfaceReady: Boolean = false
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
-    private var pendingSurface: Surface? = null
-    private var surfaceTexture: SurfaceTexture? = null
+    private var activeSurface: Surface? = null
 
     // PiP state tracking
-    private var isWaitingForPiPTransition: Boolean = false
-    private var isPiPSurfaceForced: Boolean = false
     private val pipHandler = Handler(Looper.getMainLooper())
 
     init {
         setBackgroundColor(Color.BLACK)
 
-        // Create TextureView for video rendering (composites into app window for PiP support)
-        textureView = TextureView(context).apply {
+        // SurfaceView for video rendering. Routes the surface directly to
+        // SurfaceFlinger (the OS compositor), giving mpv a standalone
+        // surface. TextureView composites into the app's window surface
+        // which is less efficient and breaks PiP transitions.
+        surfaceView = SurfaceView(context).apply {
             layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
-            surfaceTextureListener = this@MpvPlayerView
         }
-        addView(textureView)
+        surfaceView.holder.addCallback(this@MpvPlayerView)
+        addView(surfaceView)
+
+        // Push dimension updates to mpv on every view bounds change. This
+        // is the primary PiP black-screen fix: entering PiP fires a layout
+        // pass on the SurfaceView itself, and we proactively tell mpv the
+        // new size so it resizes its EGL swapchain before rendering.
+        surfaceView.addOnLayoutChangeListener { _, left, top, right, bottom,
+                                                  oldLeft, oldTop, oldRight, oldBottom ->
+            val w = right - left
+            val h = bottom - top
+            val oldW = oldRight - oldLeft
+            val oldH = oldBottom - oldTop
+            if (w > 0 && h > 0 && (w != oldW || h != oldH)) {
+                renderer?.updateSurfaceSize(w, h)
+            }
+        }
 
         // Initialize PiP controller with Expo's AppContext for proper activity access
         pipController = PiPController(context, appContext)
-        pipController?.setPlayerView(textureView)
+        pipController?.setPlayerView(surfaceView)
         pipController?.delegate = object : PiPController.Delegate {
             override fun onPlay() {
                 play()
@@ -98,17 +126,17 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
             override fun onPictureInPictureModeChanged(isInPiP: Boolean) {
                 if (isInPiP) {
-                    if (!isWaitingForPiPTransition) {
-                        isWaitingForPiPTransition = true
-                        pipHandler.removeCallbacksAndMessages(null)
-                        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-                            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-                        }
-                    }
-                } else {
-                    isWaitingForPiPTransition = false
+                    // Post size syncs after the PiP layout settles. Two passes
+                    // catch both the immediate surface re-attach and the
+                    // post-animation layout pass. Replaces the old TextureView
+                    // measure/layout polling hack (forcePiPBufferSize).
                     pipHandler.removeCallbacksAndMessages(null)
-                    restoreFromPiP()
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 500)
+                } else {
+                    // Restore from PiP: surface resized back to fullscreen.
+                    pipHandler.removeCallbacksAndMessages(null)
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
                 }
                 onPictureInPictureChange(mapOf("isActive" to isInPiP))
             }
@@ -121,7 +149,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     /**
      * Start the renderer with the given VO driver.
-     * Called lazily on first loadVideo so the voDriver setting is available.
+     * Called lazily on first loadVideo so user settings are available.
      */
     private fun ensureRendererStarted(voDriver: String?) {
         if (rendererStarted) return
@@ -130,9 +158,14 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             renderer?.start(voDriver ?: "gpu-next")
             rendererStarted = true
 
-            pendingSurface?.let { surface ->
+            // If the surface is already alive (surfaceCreated fired before
+            // loadVideo), attach it now. With SurfaceView the surface is
+            // owned by the holder, so we read it from there directly rather
+            // than stashing it on the side.
+            surfaceView.holder.surface?.takeIf { it.isValid }?.let { surface ->
+                activeSurface = surface
                 renderer?.attachSurface(surface)
-                pendingSurface = null
+                syncSurfaceSizeToView()
             }
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start renderer: ${e.message}")
@@ -140,18 +173,20 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    // MARK: - TextureView.SurfaceTextureListener
+    // MARK: - SurfaceHolder.Callback
 
-    override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
-        this.surfaceTexture = surfaceTexture
-        val surface = Surface(surfaceTexture)
-        surfaceTexture.setDefaultBufferSize(width, height)
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        val surface = holder.surface
         surfaceReady = true
 
         if (rendererStarted) {
+            // The previous Surface reference is holder-owned; do NOT release
+            // it (SurfaceView manages its lifecycle). Just track the new one.
+            activeSurface = surface
             renderer?.attachSurface(surface)
-        } else {
-            pendingSurface = surface
+            // Push the actual view dimensions immediately so mpv doesn't
+            // render against stale full-screen geometry during PiP transitions.
+            syncSurfaceSizeToView()
         }
 
         // If we have a pending load, execute it now
@@ -162,20 +197,36 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
-        surfaceTexture.setDefaultBufferSize(width, height)
-        renderer?.updateSurfaceSize(width, height)
+    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+        if (width > 0 && height > 0) {
+            renderer?.updateSurfaceSize(width, height)
+        }
     }
 
-    override fun onSurfaceTextureDestroyed(surfaceTexture: SurfaceTexture): Boolean {
-        this.surfaceTexture = null
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
         surfaceReady = false
         renderer?.detachSurface()
-        return false // mpv manages the SurfaceTexture
+        // Do NOT issue mpv "stop" here. Playback continues against the
+        // demuxer; when surfaceCreated fires again (PiP entry/exit, app
+        // background/foreground), we re-attach and frames resume. This
+        // matches the keep-open=always setting in MPVLayerRenderer.
+        //
+        // Do NOT release activeSurface — SurfaceView owns it via the holder.
+        activeSurface = null
     }
 
-    override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
-        // Called every frame — no action needed, mpv drives rendering directly
+    /**
+     * Read the actual SurfaceView width/height and push them to mpv.
+     * The PiP transition can fire surfaceCreated before the view's layout
+     * has settled to PiP dimensions, so we re-sync after layout passes.
+     */
+    private fun syncSurfaceSizeToView() {
+        if (!surfaceReady) return
+        val w = surfaceView.width
+        val h = surfaceView.height
+        if (w > 0 && h > 0) {
+            renderer?.updateSurfaceSize(w, h)
+        }
     }
 
     // MARK: - Video Loading
@@ -207,7 +258,11 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             startPosition = config.startPosition,
             externalSubtitles = config.externalSubtitles,
             initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId
+            initialAudioId = config.initialAudioId,
+            cacheEnabled = config.cacheEnabled,
+            cacheSeconds = config.cacheSeconds,
+            demuxerMaxBytes = config.demuxerMaxBytes,
+            demuxerMaxBackBytes = config.demuxerMaxBackBytes
         )
 
         if (config.autoplay) {
@@ -236,6 +291,50 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         pipController?.setPlaybackRate(0.0)
     }
 
+    /**
+     * Stop playback and release decoder resources.
+     *
+     * Delegates to [MPVLayerRenderer.stop], which issues mpv's "stop" command
+     * on a background thread (flushing the demuxer and releasing the
+     * MediaCodec hardware decoder) and drops the per-instance mpv handle.
+     *
+     * NOTE: this does NOT call `LibMPV.destroy()`. libmpv 1.0's
+     * nativeDestroy has an internal use-after-free on the JNI global ref
+     * path, so the native mpv handle is intentionally left for the JVM GC
+     * / native finalizer rather than torn down synchronously. See
+     * [MPVLib] class doc for the full rationale.
+     *
+     * Call this BEFORE navigating away from the player screen so the
+     * decoder is reclaimed before the next screen (or the next episode's
+     * player) mounts. Otherwise Expo Router renders the new screen first
+     * and you briefly have two mpv instances + two 4K decoders alive —
+     * instant OOM on a 2 GB device.
+     */
+    fun destroy() {
+        renderer?.stop()
+
+        // Reset view-level state so a subsequent loadVideo() on the SAME view
+        // instance re-creates the mpv handle and re-attaches the still-live
+        // SurfaceView surface. Without this, rendererStarted stays true and
+        // ensureRendererStarted() early-returns, so renderer.start() is never
+        // called again — but stop() already nulled the renderer's mpv handle.
+        // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
+        // against mpv == null, where every mpv?.command() (including the
+        // "stop" and load commands) silently no-ops, leaving a black frame.
+        //
+        // This path is hit by direct-player.tsx's goToNextItem()/stop(),
+        // which call destroy() immediately before router.replace() to the
+        // same route — Expo Router reuses the same MpvPlayerView instance,
+        // so the next source load happens on this view without a remount.
+        //
+        // SurfaceView note: the surface is owned by the holder and survives
+        // across destroy()/loadVideo() on the same view instance. The next
+        // ensureRendererStarted() reads it from surfaceView.holder.surface.
+        rendererStarted = false
+        currentUrl = null
+        activeSurface = null
+    }
+
     fun seekTo(position: Double) {
         renderer?.seekTo(position)
     }
@@ -267,59 +366,10 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     // MARK: - Picture in Picture
 
     fun startPictureInPicture() {
-        isWaitingForPiPTransition = true
         pipController?.startPictureInPicture()
-
-        // Resize buffer to match PiP window after animation settles
-        pipHandler.removeCallbacksAndMessages(null)
-        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-        }
-    }
-
-    /**
-     * Resize the SurfaceTexture buffer AND TextureView layout to match the PiP
-     * visible rect so mpv renders at the PiP window's actual dimensions.
-     */
-    private fun forcePiPBufferSize() {
-        if (!isWaitingForPiPTransition || !surfaceReady) return
-
-        val rect = Rect()
-        textureView.getGlobalVisibleRect(rect)
-        val visW = rect.width()
-        val visH = rect.height()
-        val vw = textureView.width
-        val vh = textureView.height
-
-        if (visW <= 0 || visH <= 0 || (vw == visW && vh == visH)) return
-
-        surfaceTexture?.setDefaultBufferSize(visW, visH)
-        renderer?.updateSurfaceSize(visW, visH)
-
-        // Force TextureView layout to match PiP visible area.
-        // layoutParams alone doesn't work during PiP because the parent
-        // never re-lays out its children.
-        textureView.measure(
-            View.MeasureSpec.makeMeasureSpec(visW, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(visH, View.MeasureSpec.EXACTLY)
-        )
-        textureView.layout(0, 0, visW, visH)
-        isPiPSurfaceForced = true
-    }
-
-    private fun restoreFromPiP() {
-        if (!isPiPSurfaceForced) return
-        isPiPSurfaceForced = false
-
-        val lp = textureView.layoutParams
-        lp.width = ViewGroup.LayoutParams.MATCH_PARENT
-        lp.height = ViewGroup.LayoutParams.MATCH_PARENT
-        textureView.layoutParams = lp
-        textureView.requestLayout()
     }
 
     fun stopPictureInPicture() {
-        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
     }
@@ -479,13 +529,24 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     // MARK: - Cleanup
 
+    /**
+     * Proactively tear down the player. Called from onDetachedFromWindow so
+     * the app releases mpv + decoder buffers when the View detaches from the
+     * window. The JS-facing destroy() is intentionally thinner (just
+     * renderer.stop()) — see this thread for why the full teardown was kept
+     * off the JS path.
+     */
     fun cleanup() {
-        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
-        surfaceTexture = null
+        renderer?.delegate = null
+
+        // SurfaceView owns the Surface via its holder — do NOT release it.
+        activeSurface = null
         surfaceReady = false
+        currentUrl = null
+        rendererStarted = false
     }
 
     override fun onDetachedFromWindow() {

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/PiPController.kt

@@ -44,6 +44,11 @@ class PiPController(private val context: Context, private val appContext: AppCon
     private var currentPosition: Double = 0.0
     private var currentDuration: Double = 0.0
     private var playbackRate: Double = 1.0
+    // Independently tracks whether the system should auto-enter PiP on home
+    // press. Decoupled from playbackRate so that disabling auto-enter
+    // (e.g. when the player unmounts) doesn't corrupt the play/pause icon
+    // state that buildPiPActions() derives from playbackRate.
+    private var autoEnterEnabled: Boolean = false
 
     private var videoWidth: Int = 0
     private var videoHeight: Int = 0
@@ -106,15 +111,37 @@ class PiPController(private val context: Context, private val appContext: AppCon
     }
 
     fun stopPictureInPicture() {
+        // Disable auto-enter eligibility without touching playbackRate.
+        // playbackRate drives the play/pause icon in buildPiPActions();
+        // mutating it here would cause a stale icon if PiP is re-entered
+        // before the next playback state callback corrects it.
+        autoEnterEnabled = false
         isInPiPMode = false
         pipEntryNotified = false
         unregisterLifecycleCallbacks()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val activity = getActivity()
-            if (activity?.isInPictureInPictureMode == true) {
-                activity.moveTaskToBack(false)
+
+        val activity = getActivity() ?: return
+
+        // Push minimal params with just auto-enter disabled. Do NOT call
+        // buildPiPParams() — it calls ensurePiPReceiverRegistered() and
+        // setActions(), which would re-register the broadcast receiver
+        // (just unregistered above) and attach play/pause/skip actions to
+        // params being torn down. That leaves a live receiver + stale
+        // actions after the player has unmounted.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            try {
+                activity.setPictureInPictureParams(
+                    PictureInPictureParams.Builder()
+                        .setAutoEnterEnabled(false)
+                        .build()
+                )
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to clear PiP auto-enter params: ${e.message}")
             }
         }
+        if (activity.isInPictureInPictureMode) {
+            activity.moveTaskToBack(false)
+        }
     }
 
     fun isCurrentlyInPiP(): Boolean = isInPiPMode
@@ -126,6 +153,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
 
     fun setPlaybackRate(rate: Double) {
         playbackRate = rate
+        autoEnterEnabled = rate > 0
 
         if (rate > 0) {
             registerLifecycleCallbacks()
@@ -208,7 +236,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
         builder.setActions(buildPiPActions())
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setAutoEnterEnabled(forEntering || playbackRate > 0)
+            builder.setAutoEnterEnabled(forEntering || autoEnterEnabled)
         }
 
         return builder.build()

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -1020,12 +1020,44 @@ final class MPVLayerRenderer {
             info["cacheSeconds"] = cacheSeconds
         }
 
+        // Configured cache limits — read back from mpv to confirm user
+        // settings actually took effect. mpv stores byte sizes as int64
+        // (bytes); convert to MiB for display.
+        var demuxerMaxBytes: Int64 = 0
+        if getProperty(handle: handle, name: "demuxer-max-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBytes) >= 0 {
+            info["demuxerMaxBytes"] = Int(demuxerMaxBytes / (1024 * 1024))
+        }
+        var demuxerMaxBackBytes: Int64 = 0
+        if getProperty(handle: handle, name: "demuxer-max-back-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBackBytes) >= 0 {
+            info["demuxerMaxBackBytes"] = Int(demuxerMaxBackBytes / (1024 * 1024))
+        }
+        var cacheSecsLimit: Double = 0
+        if getProperty(handle: handle, name: "cache-secs", format: MPV_FORMAT_DOUBLE, value: &cacheSecsLimit) >= 0 {
+            info["cacheSecsLimit"] = cacheSecsLimit
+        }
+
         // Dropped frames
         var droppedFrames: Int64 = 0
         if getProperty(handle: handle, name: "frame-drop-count", format: MPV_FORMAT_INT64, value: &droppedFrames) >= 0 {
             info["droppedFrames"] = Int(droppedFrames)
         }
 
+        // Active video output driver
+        if let voDriver = getStringProperty(handle: handle, name: "vo") {
+            info["voDriver"] = voDriver
+        }
+
+        // Active hardware decoder
+        if let hwdec = getStringProperty(handle: handle, name: "hwdec-current") {
+            info["hwdec"] = hwdec
+        }
+
+        // Estimated video output fps (post-filter)
+        var estimatedVfFps: Double = 0
+        if getProperty(handle: handle, name: "estimated-vf-fps", format: MPV_FORMAT_DOUBLE, value: &estimatedVfFps) >= 0 && estimatedVfFps > 0 {
+            info["estimatedVfFps"] = estimatedVfFps
+        }
+
         return info
     }
 }

modules/mpv-player/ios/MpvPlayerModule.swift

@@ -74,7 +74,13 @@ public class MpvPlayerModule: Module {
       AsyncFunction("pause") { (view: MpvPlayerView) in
         view.pause()
       }
-      
+
+      // Synchronously destroy mpv instance + decoder before navigating
+      // away from the player screen (cross-platform; matches Android).
+      AsyncFunction("destroy") { (view: MpvPlayerView) in
+        view.destroy()
+      }
+
       // Async function to seek to position
       AsyncFunction("seekTo") { (view: MpvPlayerView, position: Double) in
         view.seekTo(position: position)

modules/mpv-player/ios/MpvPlayerView.swift

@@ -289,6 +289,49 @@ class MpvPlayerView: ExpoView {
 		pipController?.updatePlaybackState()
 	}
 
+	/**
+	 * Synchronously stop and destroy the mpv instance + decoder so memory is
+	 * freed before the next screen mounts. Safe to call multiple times — the
+	 * underlying renderer.stop() guards against re-entry.
+	 *
+	 * Cross-platform counterpart of MpvPlayerView.destroy() on Android.
+	 */
+	func destroy() {
+		renderer?.stop()
+
+		// Reset view state and re-create the mpv handle so a subsequent
+		// loadVideo() on the SAME view instance can actually load.
+		// Without this, stop() leaves renderer.mpv == nil, and the next
+		// loadVideo(config:) calls renderer.load() which early-returns
+		// at `guard let handle = self.mpv else { return }` — but only
+		// after flipping isLoading = true and dispatching the loading
+		// delegate callback, so the JS layer is stuck in a perpetual
+		// "loading" state with no actual playback.
+		//
+		// This path is hit by direct-player.tsx's goToNextItem()/stop(),
+		// which call destroy() immediately before router.replace() to
+		// the same route — Expo Router reuses the same MpvPlayerView
+		// instance, so the next `source` prop update arrives on this
+		// view without a remount. setupView() is otherwise the only
+		// place start() is called, so without re-starting here the
+		// renderer stays dead until the whole view is unmounted and
+		// recreated.
+		//
+		// start() is idempotent (`guard !isRunning else { return }`)
+		// and stop() has already nulled mpv synchronously before
+		// dispatching the async mpv_terminate_destroy, so creating a
+		// fresh handle here is safe even while the old handle's
+		// teardown is still in flight on a background queue (libmpv
+		// handles are independent).
+		currentURL = nil
+		intendedPlayState = false
+		do {
+			try renderer?.start()
+		} catch {
+			onError(["error": "Failed to restart renderer after destroy: \(error.localizedDescription)"])
+		}
+	}
+
 	func seekTo(position: Double) {
 		// Update cached position and Now Playing immediately for smooth Control Center feedback
 		cachedPosition = position

modules/mpv-player/src/MpvPlayer.types.ts

@@ -89,6 +89,14 @@ export type MpvPlayerViewProps = {
 export interface MpvPlayerViewRef {
   play: () => Promise<void>;
   pause: () => Promise<void>;
+  /**
+   * Synchronously destroy the mpv instance + decoder + surface buffers.
+   * Call before navigating away from the player screen so memory is
+   * freed before the next screen mounts. Safe to call multiple times.
+   */
+  destroy: () => Promise<void>;
+  // Pre-libmpv-1.0 alias (kept for source-history reference):
+  // stop: () => Promise<void>;
   seekTo: (position: number) => Promise<void>;
   seekBy: (offset: number) => Promise<void>;
   setSpeed: (speed: number) => Promise<void>;
@@ -154,9 +162,41 @@ export type TechnicalInfo = {
   videoBitrate?: number;
   audioBitrate?: number;
   cacheSeconds?: number;
+  /** Configured demuxer forward cache cap (MiB), read back from mpv */
+  demuxerMaxBytes?: number;
+  /** Configured demuxer backward cache cap (MiB), read back from mpv */
+  demuxerMaxBackBytes?: number;
+  /** Configured cache-secs floor, read back from mpv */
+  cacheSecsLimit?: number;
   droppedFrames?: number;
   /** Active video output driver (read from MPV at runtime) */
   voDriver?: string;
   /** Active hardware decoder (read from MPV at runtime) */
   hwdec?: string;
+  /** Estimated video output fps (mpv "estimated-vf-fps") */
+  estimatedVfFps?: number;
+  // ---- Extended fields (primarily ExoPlayer-backed; MPV may fill some) ----
+  /** Derived HDR format: "SDR" | "HDR10" | "HDR10+" | "HLG" | null */
+  hdrFormat?: string;
+  /** Color space, e.g. "BT.709" / "BT.2020" */
+  colorSpace?: string;
+  /** Color range: "Limited" / "Full" */
+  colorRange?: string;
+  /** Color transfer: "SDR" / "ST2084 (PQ)" / "HLG" */
+  colorTransfer?: string;
+  /** Decoder path: "hardware" (MediaCodec) or "software" (FFmpeg extension) */
+  decoderType?: string;
+  /** Instantiated decoder name, e.g. "c2.amlogic.hevc.decoder" */
+  decoderName?: string;
+  /** Active audio channel count (2 = stereo, 6 = 5.1, 8 = 7.1) */
+  audioChannels?: number;
+  /** Active audio sample rate in Hz */
+  audioSampleRate?: number;
+  /**
+   * Raw codec tag from the container, e.g. "hev1.2.4.L153.B0". Encodes
+   * profile / tier / level / constraint bytes per ISO/IEC 14496-15. Power
+   * users can decode this manually; it's how Jellyfin's HEVC level cap
+   * (153 = Level 5.1) is checked against the file.
+   */
+  videoCodecs?: string;
 };

modules/mpv-player/src/MpvPlayerView.tsx

@@ -20,6 +20,9 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
       pause: async () => {
         await nativeRef.current?.pause();
       },
+      destroy: async () => {
+        await nativeRef.current?.destroy();
+      },
       seekTo: async (position: number) => {
         await nativeRef.current?.seekTo(position);
       },

modules/tv-recommendations/android/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <application>
-    <receiver
-      android:name=".TvRecommendationsReceiver"
-      android:exported="true">
+    <receiver android:name=".TvRecommendationsReceiver" android:exported="true">
       <intent-filter>
         <action android:name="android.media.tv.action.INITIALIZE_PROGRAMS" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" />
       </intent-filter>
     </receiver>
   </application>

modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsPublisher.kt

@@ -16,12 +16,13 @@ import androidx.tvprovider.media.tv.PreviewProgram
 import androidx.tvprovider.media.tv.TvContractCompat
 import org.json.JSONArray
 import org.json.JSONObject
+import java.security.MessageDigest
 
 internal object TvRecommendationsPublisher {
   private const val TAG = "TvRecommendations"
   private const val PREFS_NAME = "StreamyfinTvRecommendations"
   private const val KEY_PAYLOAD = "payload"
-  private const val KEY_CHANNEL_ID = "channelId"
+  private const val KEY_CHANNEL_ID_PREFIX = "channelId_"
   private const val KEY_PROGRAM_IDS = "programIds"
   private const val DEFAULT_CHANNEL_NAME = "Continue and Next Up"
 
@@ -61,31 +62,61 @@ internal object TvRecommendationsPublisher {
 
   fun clear(context: Context): Boolean {
     val prefs = preferences(context)
-    val channelId = prefs.getLong(KEY_CHANNEL_ID, -1L)
-    val programIds = prefs.getString(KEY_PROGRAM_IDS, null)?.let(::JSONObject)
     val contentResolver = context.contentResolver
 
-    if (programIds != null) {
+    // KEY_PROGRAM_IDS is now { channelId: "{ providerId: programId }" }
+    val allProgramIds = prefs.getString(KEY_PROGRAM_IDS, null)?.let(::JSONObject)
+    if (allProgramIds != null) {
       var deletedPrograms = 0
-      val keys = programIds.keys()
-      while (keys.hasNext()) {
-        val key = keys.next()
-        val programId = programIds.optLong(key, -1L)
-        if (programId > 0L) {
-          contentResolver.delete(
-            TvContractCompat.buildPreviewProgramUri(programId),
-            null,
-            null
-          )
-          deletedPrograms += 1
+      val channelKeys = allProgramIds.keys()
+      while (channelKeys.hasNext()) {
+        val channelIdStr = channelKeys.next()
+        val programIdsJson = allProgramIds.optString(channelIdStr)
+        if (programIdsJson.isBlank()) continue
+
+        try {
+          val programIds = JSONObject(programIdsJson)
+          val keys = programIds.keys()
+          while (keys.hasNext()) {
+            val providerId = keys.next()
+            val programId = programIds.optLong(providerId, -1L)
+            if (programId > 0L) {
+              deletePreviewProgram(contentResolver, programId)
+              deletedPrograms += 1
+            }
+          }
+        } catch (e: Exception) {
+          Log.w(TAG, "clear(): failed to parse programIds for channel $channelIdStr", e)
         }
+
+        // Notify the channel
+        val channelId = channelIdStr.toLongOrNull() ?: -1L
+        if (channelId > 0L) {
+          try {
+            contentResolver.notifyChange(TvContractCompat.buildChannelUri(channelId), null)
+          } catch (e: SecurityException) {
+            Log.w(TAG, "clear(): lost provider permission, cannot notify channel $channelId", e)
+          }
+        }
+
+        // Remove per-channel pref
+        prefs.edit().remove("programIds_$channelIdStr").apply()
       }
       Log.d(TAG, "clear(): deleted $deletedPrograms preview program(s)")
     }
 
-    if (channelId > 0L) {
-      contentResolver.notifyChange(TvContractCompat.buildChannelUri(channelId), null)
-      Log.d(TAG, "clear(): notified channel $channelId")
+    // Also handle legacy format (flat { providerId: programId }) for migration
+    val legacyProgramIds = prefs.getString("legacy_" + KEY_PROGRAM_IDS, null)?.let(::JSONObject)
+    if (legacyProgramIds != null) {
+      val keys = legacyProgramIds.keys()
+      while (keys.hasNext()) {
+        val key = keys.next()
+        val programId = legacyProgramIds.optLong(key, -1L)
+        if (programId > 0L) {
+          deletePreviewProgram(contentResolver, programId)
+        }
+      }
+      prefs.edit().remove("legacy_" + KEY_PROGRAM_IDS).apply()
     }
 
     prefs.edit()
@@ -96,128 +127,274 @@ internal object TvRecommendationsPublisher {
     return true
   }
 
+  /**
+   * Delete a single preview program from the TvProvider.
+   * Called by clear(), synchronize() (stale programs), and TvRecommendationsReceiver (user removed).
+   */
+  fun deletePreviewProgram(context: Context, programId: Long) {
+    try {
+      context.contentResolver.delete(
+        TvContractCompat.buildPreviewProgramUri(programId),
+        null,
+        null
+      )
+      Log.d(TAG, "deletePreviewProgram(): deleted programId=$programId")
+
+      // Also remove from stored programIds prefs
+      removeProgramFromPrefs(context, programId)
+    } catch (e: SecurityException) {
+      Log.w(TAG, "deletePreviewProgram(): lost provider permission for programId=$programId", e)
+    }
+  }
+
+  private fun deletePreviewProgram(contentResolver: android.content.ContentResolver, programId: Long) {
+    try {
+      contentResolver.delete(
+        TvContractCompat.buildPreviewProgramUri(programId),
+        null,
+        null
+      )
+    } catch (e: SecurityException) {
+      Log.w(TAG, "deletePreviewProgram(): lost provider permission for programId=$programId", e)
+    }
+  }
+
+  private fun removeProgramFromPrefs(context: Context, programId: Long) {
+    val prefs = preferences(context)
+    val programIdsJson = prefs.getString(KEY_PROGRAM_IDS, null) ?: return
+    try {
+      val channelMap = JSONObject(programIdsJson)
+      val channelKeys = channelMap.keys()
+      while (channelKeys.hasNext()) {
+        val channelId = channelKeys.next()
+        val inner = channelMap.optJSONObject(channelId) ?: continue
+        val providerKeys = inner.keys()
+        while (providerKeys.hasNext()) {
+          val providerId = providerKeys.next()
+          if (inner.optLong(providerId, -1L) == programId) {
+            inner.remove(providerId)
+            if (inner.length() == 0) {
+              channelMap.remove(channelId)
+            }
+            break
+          }
+        }
+      }
+      prefs.edit().putString(KEY_PROGRAM_IDS, channelMap.toString()).apply()
+    } catch (e: Exception) {
+      Log.w(TAG, "removeProgramFromPrefs(): failed to update prefs for programId=$programId", e)
+    }
+  }
+
   private fun synchronize(context: Context, payload: JSONObject): Boolean {
     val sections = payload.optJSONArray("sections") ?: JSONArray()
-    val firstSection = if (sections.length() > 0) sections.optJSONObject(0) else null
-    val sectionTitle = firstSection?.optString("title")?.takeIf { it.isNotBlank() } ?: DEFAULT_CHANNEL_NAME
-    val items = firstSection?.optJSONArray("items") ?: JSONArray()
-
-    Log.d(
-      TAG,
-      "synchronize(): using section \"$sectionTitle\" with ${items.length()} item(s)"
-    )
-
-    val channelId = getOrCreateChannel(context, sectionTitle)
-    if (channelId <= 0L) {
-      Log.w(TAG, "synchronize(): failed to get or create preview channel")
+    if (sections.length() == 0) {
+      Log.w(TAG, "synchronize(): no sections in payload")
       return false
     }
 
-    Log.d(TAG, "synchronize(): publishing into channelId=$channelId")
+    val prefs = preferences(context)
+    val allNextProgramIds = JSONObject()
+    var totalActive = 0
+    var totalDeleted = 0
 
-    val previousProgramIds = preferences(context)
-      .getString(KEY_PROGRAM_IDS, null)
-      ?.let(::JSONObject)
-      ?: JSONObject()
-    val nextProgramIds = JSONObject()
-    val activeProviderIds = mutableSetOf<String>()
+    for (sectionIndex in 0 until sections.length()) {
+      val section = sections.optJSONObject(sectionIndex) ?: continue
+      val sectionTitle = section.optString("title")?.takeIf { it.isNotBlank() } ?: DEFAULT_CHANNEL_NAME
+      val items = section.optJSONArray("items") ?: JSONArray()
 
-    for (index in 0 until items.length()) {
-      val item = items.optJSONObject(index) ?: continue
-      val providerId = item.optString("id")
-      if (providerId.isBlank()) continue
-
-      val programId = upsertPreviewProgram(
-        context = context,
-        channelId = channelId,
-        item = item,
-        previousProgramId = previousProgramIds.optLong(providerId, -1L),
-        weight = index
+      Log.d(
+        TAG,
+        "synchronize(): section \"$sectionTitle\" ($sectionIndex/${sections.length()}) with ${items.length()} item(s)"
       )
 
-      if (programId > 0L) {
-        activeProviderIds += providerId
-        nextProgramIds.put(providerId, programId)
-        Log.d(TAG, "synchronize(): upserted program for item=$providerId programId=$programId")
+      val channelId = getOrCreateChannel(context, sectionTitle)
+      if (channelId <= 0L) {
+        Log.w(TAG, "synchronize(): failed to get or create channel for \"$sectionTitle\"")
+        continue
       }
-    }
 
-    var deletedPrograms = 0
-    val previousKeys = previousProgramIds.keys()
-    while (previousKeys.hasNext()) {
-      val providerId = previousKeys.next()
-      if (activeProviderIds.contains(providerId)) continue
+      // Per Android docs: check channel.isBrowsable() and request if needed.
+      if (!isChannelBrowsable(context, channelId)) {
+        Log.d(TAG, "synchronize(): channel $channelId not browsable, requesting browsable")
+        TvContractCompat.requestChannelBrowsable(context, channelId)
+      }
 
-      val programId = previousProgramIds.optLong(providerId, -1L)
-      if (programId > 0L) {
-        context.contentResolver.delete(
-          TvContractCompat.buildPreviewProgramUri(programId),
-          null,
-          null
+      val prefKey = "programIds_$channelId"
+      val previousProgramIds = prefs.getString(prefKey, null)
+        ?.let(::JSONObject)
+        ?: JSONObject()
+      val nextProgramIds = JSONObject()
+      val activeProviderIds = mutableSetOf<String>()
+
+      for (index in 0 until items.length()) {
+        val item = items.optJSONObject(index) ?: continue
+        val providerId = item.optString("id")
+        if (providerId.isBlank()) continue
+
+        val programId = upsertPreviewProgram(
+          context = context,
+          channelId = channelId,
+          item = item,
+          previousProgramId = previousProgramIds.optLong(providerId, -1L),
+          weight = index
         )
-        deletedPrograms += 1
-        Log.d(TAG, "synchronize(): deleted stale programId=$programId for item=$providerId")
+
+        if (programId > 0L) {
+          activeProviderIds += providerId
+          nextProgramIds.put(providerId, programId)
+          Log.d(TAG, "synchronize(): upserted program for item=$providerId programId=$programId")
+        }
       }
+
+      var deletedPrograms = 0
+      val previousKeys = previousProgramIds.keys()
+      while (previousKeys.hasNext()) {
+        val providerId = previousKeys.next()
+        if (activeProviderIds.contains(providerId)) continue
+
+        val programId = previousProgramIds.optLong(providerId, -1L)
+        if (programId > 0L) {
+          deletePreviewProgram(context, programId)
+          deletedPrograms += 1
+          Log.d(TAG, "synchronize(): deleted stale programId=$programId for item=$providerId")
+        }
+      }
+
+      allNextProgramIds.put(channelId.toString(), nextProgramIds.toString())
+      prefs.edit().putString(prefKey, nextProgramIds.toString()).apply()
+      totalActive += activeProviderIds.size
+      totalDeleted += deletedPrograms
+
+      logProviderState(context, channelId)
     }
 
-    preferences(context)
-      .edit()
-      .putLong(KEY_CHANNEL_ID, channelId)
-      .putString(KEY_PROGRAM_IDS, nextProgramIds.toString())
-      .apply()
-
-    logProviderState(context, channelId)
+    // Store all channel program IDs for clear() to use
+    prefs.edit().putString(KEY_PROGRAM_IDS, allNextProgramIds.toString()).apply()
 
     Log.d(
       TAG,
-      "synchronize(): completed with ${activeProviderIds.size} active program(s), deleted $deletedPrograms stale program(s)"
+      "synchronize(): completed across ${sections.length()} section(s), $totalActive active program(s), deleted $totalDeleted stale program(s)"
     )
 
     return true
   }
 
+  /**
+   * Query provider to check if a channel is browsable.
+   * Per Android docs: "check channel.isBrowsable() before updating programs."
+   */
+  private fun isChannelBrowsable(context: Context, channelId: Long): Boolean {
+    return try {
+      context.contentResolver.query(
+        TvContractCompat.buildChannelUri(channelId),
+        null,
+        null,
+        null,
+        null
+      )?.use { cursor ->
+        if (cursor.moveToFirst()) {
+          val browsableIndex = cursor.getColumnIndex(TvContractCompat.Channels.COLUMN_BROWSABLE)
+          if (browsableIndex >= 0) cursor.getInt(browsableIndex) == 1 else true
+        } else {
+          false
+        }
+      } ?: false
+    } catch (e: SecurityException) {
+      Log.w(TAG, "isChannelBrowsable(): lost provider permission for channelId=$channelId", e)
+      true // Assume browsable if we can't check, to avoid blocking updates
+    }
+  }
+
+  /**
+   * Query provider to verify a channel actually exists.
+   * Prevents the channel-delete-recreate bug: if update() returns 0 rows
+   * we must first check whether the channel was deleted by the system
+   * or if the update simply failed for another reason.
+   */
+  private fun channelExistsInProvider(context: Context, channelId: Long): Boolean {
+    return try {
+      context.contentResolver.query(
+        TvContractCompat.buildChannelUri(channelId),
+        null,
+        null,
+        null,
+        null
+      )?.use { cursor ->
+        cursor.moveToFirst()
+      } ?: false
+    } catch (e: SecurityException) {
+      Log.w(TAG, "channelExistsInProvider(): lost provider permission for channelId=$channelId", e)
+      false
+    }
+  }
+
   private fun getOrCreateChannel(context: Context, displayName: String): Long {
     val prefs = preferences(context)
-    val existingChannelId = prefs.getLong(KEY_CHANNEL_ID, -1L)
+    val channelKey = getChannelKey(displayName)
+    val existingChannelId = prefs.getLong(channelKey, -1L)
     val contentResolver = context.contentResolver
 
     if (existingChannelId > 0L) {
-      val updated = Channel.Builder()
-        .setType(TvContractCompat.Channels.TYPE_PREVIEW)
-        .setDisplayName(displayName)
-        .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
-        .build()
+      // Query provider first to verify channel actually exists (prevents recreate bug)
+      val exists = channelExistsInProvider(context, existingChannelId)
 
-      val updatedRows = contentResolver.update(
-        TvContractCompat.buildChannelUri(existingChannelId),
-        updated.toContentValues(),
-        null,
-        null
-      )
+      if (exists) {
+        // Channel exists — update it in place, never recreate
+        val updated = Channel.Builder()
+          .setType(TvContractCompat.Channels.TYPE_PREVIEW)
+          .setDisplayName(displayName)
+          .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
+          .build()
 
-      if (updatedRows > 0) {
-        TvContractCompat.requestChannelBrowsable(context, existingChannelId)
-        storeChannelLogo(context, existingChannelId)
-        Log.d(TAG, "getOrCreateChannel(): updated existing channelId=$existingChannelId and requested browsable")
-        return existingChannelId
+        try {
+          val updatedRows = contentResolver.update(
+            TvContractCompat.buildChannelUri(existingChannelId),
+            updated.toContentValues(),
+            null,
+            null
+          )
+
+          if (updatedRows > 0) {
+            TvContractCompat.requestChannelBrowsable(context, existingChannelId)
+            storeChannelLogo(context, existingChannelId)
+            Log.d(TAG, "getOrCreateChannel(): updated existing channelId=$existingChannelId and requested browsable")
+            return existingChannelId
+          }
+
+          // Update returned 0 rows but channel exists — log and return existing ID, don't recreate
+          Log.e(TAG, "getOrCreateChannel(): update returned 0 for existing channelId=$existingChannelId but channel exists — not recreating")
+          return existingChannelId
+        } catch (e: SecurityException) {
+          Log.w(TAG, "getOrCreateChannel(): lost provider permission updating channelId=$existingChannelId", e)
+          return existingChannelId
+        }
       }
 
-      Log.w(TAG, "getOrCreateChannel(): stored channelId=$existingChannelId was stale, recreating")
-      prefs.edit().remove(KEY_CHANNEL_ID).apply()
+      // Channel truly doesn't exist in provider — recreate
+      Log.w(TAG, "getOrCreateChannel(): channelId=$existingChannelId not in provider, recreating")
+      prefs.edit().remove(channelKey).apply()
     }
 
+    // Create a new channel
     val channel = Channel.Builder()
       .setType(TvContractCompat.Channels.TYPE_PREVIEW)
       .setDisplayName(displayName)
       .setAppLinkIntentUri(buildIntentUri(context, "streamyfin://"))
       .build()
 
-    val channelUri = contentResolver.insert(
-      TvContractCompat.Channels.CONTENT_URI,
-      channel.toContentValues()
-    ) ?: return -1L
+    val channelUri = try {
+      contentResolver.insert(
+        TvContractCompat.Channels.CONTENT_URI,
+        channel.toContentValues()
+      )
+    } catch (e: SecurityException) {
+      Log.e(TAG, "getOrCreateChannel(): lost provider permission, cannot create channel", e)
+      null
+    } ?: return -1L
 
     val channelId = ContentUris.parseId(channelUri)
+    prefs.edit().putLong(channelKey, channelId).apply()
     TvContractCompat.requestChannelBrowsable(context, channelId)
     storeChannelLogo(context, channelId)
     Log.d(TAG, "getOrCreateChannel(): created new channelId=$channelId displayName=\"$displayName\"")
@@ -225,6 +402,10 @@ internal object TvRecommendationsPublisher {
     return channelId
   }
 
+  private fun getChannelKey(displayName: String): String {
+    return KEY_CHANNEL_ID_PREFIX + displayName.hashCode()
+  }
+
   private fun upsertPreviewProgram(
     context: Context,
     channelId: Long,
@@ -249,42 +430,67 @@ internal object TvRecommendationsPublisher {
       builder.setDescription(it)
     }
 
+    // Per Android docs: use unique URIs for all images to avoid stale cache
     imageUrl.takeIf { it.isNotBlank() }?.let {
-      val imageUri = Uri.parse(it)
+      val uniqueImageUrl = appendCacheBuster(it)
+      val imageUri = Uri.parse(uniqueImageUrl)
       builder.setPosterArtUri(imageUri)
       builder.setThumbnailUri(imageUri)
     }
 
-
     val contentValues = builder.build().toContentValues()
     val contentResolver = context.contentResolver
 
     if (previousProgramId > 0L) {
-      val updatedRows = contentResolver.update(
-        TvContractCompat.buildPreviewProgramUri(previousProgramId),
-        contentValues,
-        null,
-        null
-      )
+      try {
+        val updatedRows = contentResolver.update(
+          TvContractCompat.buildPreviewProgramUri(previousProgramId),
+          contentValues,
+          null,
+          null
+        )
 
-      if (updatedRows > 0) {
-        Log.d(TAG, "upsertPreviewProgram(): updated existing programId=$previousProgramId")
-        return previousProgramId
+        if (updatedRows > 0) {
+          Log.d(TAG, "upsertPreviewProgram(): updated existing programId=$previousProgramId")
+          return previousProgramId
+        }
+
+        Log.w(TAG, "upsertPreviewProgram(): existing programId=$previousProgramId was stale, inserting new row")
+      } catch (e: SecurityException) {
+        Log.w(TAG, "upsertPreviewProgram(): lost provider permission for programId=$previousProgramId", e)
       }
-
-      Log.w(TAG, "upsertPreviewProgram(): existing programId=$previousProgramId was stale, inserting new row")
     }
 
-    val insertedUri = contentResolver.insert(
-      TvContractCompat.PreviewPrograms.CONTENT_URI,
-      contentValues
-    ) ?: return -1L
+    val insertedUri = try {
+      contentResolver.insert(
+        TvContractCompat.PreviewPrograms.CONTENT_URI,
+        contentValues
+      )
+    } catch (e: SecurityException) {
+      Log.w(TAG, "upsertPreviewProgram(): lost provider permission, cannot insert program", e)
+      null
+    } ?: return -1L
 
     val programId = ContentUris.parseId(insertedUri)
     Log.d(TAG, "upsertPreviewProgram(): inserted new programId=$programId")
     return programId
   }
 
+  /**
+   * Append a stable cache key derived from the image URL.
+   * The Jellyfin image URLs already include a `tag=` query param (etag)
+   * that changes whenever the image content changes, so a deterministic
+   * hash of the URL is sufficient — the param only changes when the URL
+   * (and therefore the image) actually changes, avoiding unnecessary
+   * re-downloads on every sync.
+   */
+  private fun appendCacheBuster(imageUrl: String): String {
+    val digest = MessageDigest.getInstance("MD5").digest(imageUrl.toByteArray())
+    val hash = digest.joinToString("") { "%02x".format(it) }.substring(0, 16)
+    val separator = if (imageUrl.contains("?")) "&" else "?"
+    return "$imageUrl${separator}_v=$hash"
+  }
+
   private fun buildIntentUri(context: Context, deepLink: String): Uri {
     val intent = Intent(Intent.ACTION_VIEW).apply {
       data = Uri.parse(deepLink)
@@ -306,13 +512,17 @@ internal object TvRecommendationsPublisher {
 
   private fun storeChannelLogo(context: Context, channelId: Long) {
     val bitmap = applicationIconBitmap(context) ?: return
-    val outputStream = context.contentResolver.openOutputStream(
-      TvContractCompat.buildChannelLogoUri(channelId)
-    ) ?: return
+    try {
+      val outputStream = context.contentResolver.openOutputStream(
+        TvContractCompat.buildChannelLogoUri(channelId)
+      ) ?: return
 
-    outputStream.use { stream ->
-      bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
-      stream.flush()
+      outputStream.use { stream ->
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
+        stream.flush()
+      }
+    } catch (e: SecurityException) {
+      Log.w(TAG, "storeChannelLogo(): lost provider permission for channelId=$channelId", e)
     }
   }
 
@@ -341,9 +551,14 @@ internal object TvRecommendationsPublisher {
     return bitmap
   }
 
+  fun getChannelId(context: Context, displayName: String = DEFAULT_CHANNEL_NAME): Long {
+    return preferences(context).getLong(getChannelKey(displayName), -1L)
+  }
+
   private fun preferences(context: Context): SharedPreferences {
     return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
   }
+
   private fun logProviderState(context: Context, channelId: Long) {
     val contentResolver = context.contentResolver
 
@@ -372,8 +587,10 @@ internal object TvRecommendationsPublisher {
           Log.w(TAG, "logProviderState(): channelId=$channelId exists=false")
         }
       } ?: Log.w(TAG, "logProviderState(): channel query returned null for channelId=$channelId")
-    } catch (error: Exception) {
-      Log.w(TAG, "logProviderState(): failed to query channelId=$channelId", error)
-    }
+} catch (error: SecurityException) {
+  Log.w(TAG, "logProviderState(): lost provider permission for channelId=$channelId", error)
+} catch (error: Exception) {
+  Log.w(TAG, "logProviderState(): failed to query channelId=$channelId", error)
+}
   }
 }

modules/tv-recommendations/android/src/main/java/expo/modules/tvrecommendations/TvRecommendationsReceiver.kt

@@ -3,16 +3,24 @@ package expo.modules.tvrecommendations
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.ContentUris
 import android.util.Log
 import androidx.tvprovider.media.tv.TvContractCompat
 
 class TvRecommendationsReceiver : BroadcastReceiver() {
   override fun onReceive(context: Context, intent: Intent) {
-    if (intent.action != TvContractCompat.ACTION_INITIALIZE_PROGRAMS) {
-      return
+    when (intent.action) {
+      TvContractCompat.ACTION_INITIALIZE_PROGRAMS -> {
+        Log.d("TvRecommendations", "Handling INITIALIZE_PROGRAMS broadcast")
+        TvRecommendationsPublisher.refreshFromCache(context)
+      }
+      "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" -> {
+        val programId = intent.data?.let { ContentUris.parseId(it) } ?: -1L
+        if (programId > 0L) {
+          Log.d("TvRecommendations", "Handling PREVIEW_PROGRAM_BROWSABLE_DISABLED for programId=$programId")
+          TvRecommendationsPublisher.deletePreviewProgram(context, programId)
+        }
+      }
     }
-
-    Log.d("TvRecommendations", "Handling INITIALIZE_PROGRAMS broadcast")
-    TvRecommendationsPublisher.refreshFromCache(context)
   }
 }

modules/tv-search/src/TvSearchView.tsx

@@ -1,12 +1,19 @@
 import { requireNativeView } from "expo";
 import * as React from "react";
 import type { View } from "react-native";
+import { Platform } from "react-native";
 
 import type { TvSearchViewProps } from "./TvSearchView.types";
 
+// The native TvSearchModule is Apple-only (tvOS SwiftUI `.searchable`).
+// On Android the component is never rendered, but we must avoid calling
+// `requireNativeView` at module-scope because it would crash on import.
 const NativeView: React.ComponentType<
   TvSearchViewProps & React.RefAttributes<View>
-> = requireNativeView("TvSearchModule");
+> =
+  Platform.OS === "ios"
+    ? requireNativeView("TvSearchModule")
+    : ((() => null) as any);
 
 /**
  * Forwards its ref to the underlying native view so it can be used as a

modules/wifi-ssid/index.ts

@@ -15,7 +15,6 @@ const WifiSsidModule =
  */
 export async function getSSID(): Promise<string | null> {
   if (!WifiSsidModule) {
-    console.log("[WifiSsid] Module not available on this platform");
     return null;
   }
 

package.json

@@ -17,63 +17,63 @@
     "ios:unsigned-build": "cross-env EXPO_TV=0 bun scripts/ios/build-ios.ts --production",
     "ios:unsigned-build:tv": "cross-env EXPO_TV=1 bun scripts/ios/build-ios.ts --production",
     "prepare": "husky",
-    "typecheck": "node scripts/typecheck.js",
+    "typecheck": "bun scripts/typecheck.ts",
     "check": "biome check . --max-diagnostics 1000",
     "lint": "biome check --write --unsafe --max-diagnostics 1000",
     "format": "biome format --write .",
     "doctor": "expo-doctor",
-    "i18n:check": "bun scripts/check-i18n-keys.mjs",
-    "i18n:fix-unused": "bun scripts/check-i18n-keys.mjs --fix-unused",
+    "i18n:check": "bun scripts/check-i18n-keys.ts",
+    "i18n:fix-unused": "bun scripts/check-i18n-keys.ts --fix-unused",
     "test": "bun run typecheck && bun run lint && bun run format && bun run i18n:check && bun run doctor",
     "postinstall": "patch-package"
   },
   "dependencies": {
     "@bottom-tabs/react-navigation": "1.2.0",
     "@douglowder/expo-av-route-picker-view": "^0.0.5",
-    "@expo/metro-runtime": "~56.0.13",
+    "@expo/metro-runtime": "~56.0.15",
     "@expo/react-native-action-sheet": "^4.1.1",
-    "@expo/ui": "~56.0.14",
+    "@expo/ui": "~56.0.17",
     "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "5.2.14",
     "@jellyfin/sdk": "^0.13.0",
     "@react-native-community/netinfo": "^12.0.0",
     "@react-navigation/material-top-tabs": "7.4.28",
     "@react-navigation/native": "^7.2.5",
-    "@shopify/flash-list": "2.0.2",
+    "@shopify/flash-list": "2.0.3",
     "@tanstack/query-sync-storage-persister": "^5.100.14",
     "@tanstack/react-pacer": "^0.19.1",
     "@tanstack/react-query": "5.100.14",
     "@tanstack/react-query-persist-client": "^5.100.14",
     "axios": "^1.7.9",
-    "expo": "~56.0.6",
+    "expo": "~56.0.11",
     "expo-application": "~56.0.3",
-    "expo-asset": "~56.0.15",
-    "expo-audio": "~56.0.11",
-    "expo-background-task": "~56.0.15",
+    "expo-asset": "~56.0.17",
+    "expo-audio": "~56.0.12",
+    "expo-background-task": "~56.0.18",
     "expo-blur": "~56.0.3",
     "expo-brightness": "~56.0.5",
-    "expo-build-properties": "~56.0.15",
-    "expo-camera": "~56.0.7",
-    "expo-constants": "~56.0.16",
+    "expo-build-properties": "~56.0.18",
+    "expo-camera": "~56.0.8",
+    "expo-constants": "~56.0.18",
     "expo-crypto": "~56.0.4",
-    "expo-dev-client": "~56.0.16",
+    "expo-dev-client": "~56.0.20",
     "expo-device": "~56.0.4",
-    "expo-font": "~56.0.5",
+    "expo-font": "~56.0.6",
     "expo-haptics": "~56.0.3",
-    "expo-image": "~56.0.9",
+    "expo-image": "~56.0.11",
     "expo-linear-gradient": "~56.0.4",
-    "expo-linking": "~56.0.12",
+    "expo-linking": "~56.0.14",
     "expo-localization": "~56.0.6",
-    "expo-location": "~56.0.14",
-    "expo-notifications": "~56.0.14",
-    "expo-router": "~56.2.7",
+    "expo-location": "~56.0.17",
+    "expo-notifications": "~56.0.17",
+    "expo-router": "~56.2.10",
     "expo-screen-orientation": "~56.0.5",
     "expo-secure-store": "~56.0.4",
-    "expo-sharing": "~56.0.14",
+    "expo-sharing": "~56.0.17",
     "expo-splash-screen": "~56.0.10",
     "expo-status-bar": "~56.0.4",
     "expo-system-ui": "~56.0.5",
-    "expo-task-manager": "~56.0.15",
+    "expo-task-manager": "~56.0.18",
     "expo-web-browser": "~56.0.5",
     "i18next": "^26.3.0",
     "jotai": "2.20.0",
@@ -128,14 +128,16 @@
     "@react-native-tvos/config-tv": "0.1.6",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.24",
+    "@types/node": "^18.19.130",
     "@types/react": "~19.2.10",
     "@types/react-test-renderer": "19.1.0",
     "cross-env": "10.1.0",
     "expo-doctor": "1.19.9",
     "husky": "9.1.7",
-    "lint-staged": "17.0.5",
+    "lint-staged": "17.0.8",
     "react-test-renderer": "19.2.3",
-    "typescript": "5.9.3"
+    "tsx": "^4.22.4",
+    "typescript": "6.0.3"
   },
   "expo": {
     "doctor": {
@@ -143,6 +145,7 @@
         "exclude": [
           "react-native-google-cast",
           "react-native-udp",
+          "react-native-track-player",
           "@jellyfin/sdk"
         ],
         "listUnknownPackages": false

plugins/with-runtime-framework-headers.ts

@@ -1,4 +1,4 @@
-const { withPodfile } = require("expo/config-plugins");
+import { type ConfigPlugin, withPodfile } from "expo/config-plugins";
 
 const PATCH_START = "## >>> runtime-framework headers";
 const PATCH_END = "## <<< runtime-framework headers";
@@ -13,7 +13,7 @@ const EXTRA_HDRS = [
   `\${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers`,
 ];
 
-function buildPatch() {
+function buildPatch(): string {
   return [
     PATCH_START,
     "  extra_hdrs = [",
@@ -91,7 +91,7 @@ function buildPatch() {
   ].join("\n");
 }
 
-module.exports = function withRuntimeFrameworkHeaders(config) {
+const withRuntimeFrameworkHeaders: ConfigPlugin = (config) => {
   return withPodfile(config, (config) => {
     let podfile = config.modResults.contents;
 
@@ -125,3 +125,5 @@ end
     return config;
   });
 };
+
+export default withRuntimeFrameworkHeaders;

plugins/withAndroidAlertColors.ts

@@ -1,10 +1,20 @@
-const {
+import {
+  type ConfigPlugin,
   withAndroidColors,
   withAndroidColorsNight,
-} = require("expo/config-plugins");
+} from "expo/config-plugins";
 
-const withAndroidAlertColors = (config) => {
-  const setColor = (colorsList, name, value) => {
+interface ColorResourceItem {
+  $: { name: string };
+  _: string;
+}
+
+const withAndroidAlertColors: ConfigPlugin = (config) => {
+  const setColor = (
+    colorsList: ColorResourceItem[],
+    name: string,
+    value: string,
+  ) => {
     const existingColor = colorsList.find(
       (item) => item.$ && item.$.name === name,
     );
@@ -20,7 +30,7 @@ const withAndroidAlertColors = (config) => {
 
   config = withAndroidColors(config, (config) => {
     const colors = config.modResults;
-    const colorsList = colors.resources.color || [];
+    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
     setColor(colorsList, "colorPrimary", "#000000");
     colors.resources.color = colorsList;
     return config;
@@ -28,7 +38,7 @@ const withAndroidAlertColors = (config) => {
 
   config = withAndroidColorsNight(config, (config) => {
     const colors = config.modResults;
-    const colorsList = colors.resources.color || [];
+    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
     setColor(colorsList, "colorPrimary", "#FFFFFF");
     colors.resources.color = colorsList;
     return config;
@@ -37,4 +47,4 @@ const withAndroidAlertColors = (config) => {
   return config;
 };
 
-module.exports = withAndroidAlertColors;
+export default withAndroidAlertColors;

plugins/withAndroidManifest.ts

@@ -1,8 +1,12 @@
-const { withAndroidManifest } = require("expo/config-plugins");
+import { type ConfigPlugin, withAndroidManifest } from "expo/config-plugins";
 
-const _withGoogleCastAndroidManifest = (config) =>
+const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
   withAndroidManifest(config, async (mod) => {
-    const mainApplication = mod.modResults.manifest.application[0];
+    const mainApplication = mod.modResults.manifest.application?.[0];
+
+    if (!mainApplication) {
+      return mod;
+    }
 
     // Initialize activity array if it doesn't exist
     if (!mainApplication.activity) {
@@ -39,4 +43,4 @@ const _withGoogleCastAndroidManifest = (config) =>
     return mod;
   });
 
-module.exports = _withGoogleCastAndroidManifest;
+export default withGoogleCastAndroidManifest;