Also fix MoreMoviesWithActor component to use SimpleTouchableItemRouter

Co-authored-by: lostb1t <168401+lostb1t@users.noreply.github.com>
Fix unnecessary API requests for similar items by using SimpleTouchableItemRouter
2026-01-15 23:59:08 +00:00 · 2025-09-03 05:29:58 +00:00 · 2025-09-03 05:27:54 +00:00 · 2025-09-03 05:16:25 +00:00 · 2025-09-03 07:05:46 +02:00 · 2025-09-02 15:33:41 +02:00
145 changed files with 5125 additions and 1670 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,162 @@
+# Contributing to Streamyfin
+
+Thank you for your interest in contributing to the Streamyfin mobile app project! This document provides guidelines to smoothly collaborate on the Streamyfin codebase and help improve the app for all users.
+
+---
+
+## Table of Contents
+
+- [Reporting Issues](#reporting-issues)
+- [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities)
+- [Requesting Features & Enhancements](#requesting-features--enhancements)
+- [Developing the Mobile App](#developing-the-mobile-app)
+  - [Codebase Overview](#codebase-overview)
+  - [Setting Up Your Development Environment](#setting-up-your-development-environment)
+  - [Making Changes](#making-changes)
+- [Pull Request Guidelines](#pull-request-guidelines)
+- [Release Process](#release-process)
+- [Getting Help and Community](#getting-help-and-community)
+
+---
+
+## Reporting Issues
+
+Streamyfin uses GitHub issues to track bugs and improvements. Before opening a new issue:
+
+- Search existing issues for duplicates.
+- Provide clear, reproducible steps to demonstrate bugs.
+- Include device info, OS version, Streamyfin version, and any relevant logs.
+- Apply the `bug` label to the issue for easier triage; no title prefix needed.
+
+If you're unsure about how to report an issue or need help, reach out to the community via our chat links.
+
+### Reporting Security Vulnerabilities
+
+Please do not file public GitHub issues for security vulnerabilities.
+
+Report security concerns via GitHub Security Advisories (Repository → Security → Report a vulnerability). Provide steps to reproduce, affected versions, and mitigation ideas if available. We’ll acknowledge receipt and coordinate a fix before public disclosure.
+
+If Security Advisories are unavailable for you, contact the maintainers via the email listed in SECURITY.md.---
+
+## Requesting Features & Enhancements
+
+Please submit feature and enhancement requests as GitHub issues labeled `enhancement`.
+
+When creating a new feature request:
+
+- Check if the idea or similar request exists.
+- Use reactions like 👍 to support existing requests.
+- Provide a clear explanation of the use case and benefits.
+
+---
+
+## Developing the Mobile App
+
+### Codebase Overview
+
+Streamyfin is built primarily using Expo and React Native to support both iOS and Android platforms within a single repository. The app communicates directly with Jellyfin backend servers for media streaming.
+
+### Setting Up Your Development Environment
+
+1. Fork the Streamyfin repository on GitHub. If prompted with “Copy the main branch only,” uncheck it so all branches are copied.
+2. Clone your fork:
+
+```
+
+git clone git@github.com:yourusername/streamyfin.git
+# or
+git clone https://github.com/yourusername/streamyfin.git
+cd streamyfin
+
+```
+
+3. Initialize submodules and install dependencies:
+
+```
+bun run submodule-reload
+bun install
+```
+
+4. Start the development server locally (with Expo):
+
+```
+bun ios / bun android
+```
+
+> Optionally, to run directly on a device or emulator:
+> 
+> ```
+> # For iOS (requires macOS and Xcode):
+> bun run ios
+> # For Android (requires Android Studio or Android Debug Bridge (ADB) tool, plus an emulator or physical device):
+> bun run android 
+> ```
+
+5. Use the Expo app on your mobile device or emulator to run and debug Streamyfin.
+
+### Making Changes
+
+1. Stay up to date by syncing with upstream:
+
+```bash
+# Add the upstream remote only once (skip if already added)
+git remote add upstream https://github.com/streamyfin/streamyfin.git
+# Fetch latest changes from upstream
+git fetch upstream
+# Rebase your current branch onto the upstream default branch (replace 'develop' if you are working from another upstream branch)
+git rebase upstream/develop
+```
+
+2. Create a descriptive feature or bugfix branch:
+
+```
+
+git checkout -b feat/feature-name
+
+```
+
+3. Commit changes with clear, concise messages using imperative mood.
+4. Push changes to your fork:
+
+```
+
+git push --set-upstream origin feat/feature-name
+
+```
+
+---
+
+## Pull Request Guidelines
+
+When opening a PR:
+
+- Title should clearly summarize the change.
+- Reference any related issue(s) using keywords like `closes #123`.
+- Follow our [Conventional Commits](https://www.conventionalcommits.org/) style, e.g., `feat: add new playback controls`.
+- Provide a detailed description in the PR body, explaining what, why, and any impacts.
+- Include screenshots or recordings if UI changes are involved.
+- Ensure CI checks are green (lint, type-check, build).
+- Do not include secrets, tokens, or production credentials. Redact sensitive data in logs and screenshots.
+- Keep PRs focused; avoid bundling unrelated changes together.
+
+PRs require review and approval by maintainers before merging.---
+
+## Release Process
+
+- Streamyfin follows semantic versioning (`MAJOR.MINOR.PATCH`).
+- Releases are made periodically after testing and QA cycles.
+- Tag each release and publish a GitHub Release with a changelog.
+- Consider automating versioning and changelogs (e.g., Changesets or semantic-release).
+- Release announcements are posted on our repository and community channels.
+- Contributions accepted through PRs will be included in upcoming releases according to readiness.
+
+---
+
+## Getting Help and Community
+
+- Join our community chat channels on [Discord](https://discord.streamyfin.app) for questions and support.
+- Use GitHub discussions or open issues to get assistance or report problems.
+
+---
+
+Thank you for helping make Streamyfin a better app for everyone!
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,64 +0,0 @@
-name: Bug report
-description: Create a report to help us improve
-title: "[Bug]: "
-labels:
-  - ["❌ bug"]
-projects:
-  - ["streamyfin/3"]
-
-body:
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: A clear and concise description of what the bug is.
-    validations:
-      required: true
-
-  - type: textarea
-    id: repro
-    attributes:
-      label: Reproduction steps
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      placeholder: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: device
-    attributes:
-      label: Which device and operating system are you using?
-      description: e.g. iPhone 15, iOS 18.1.1
-    validations:
-      required: true
-
-  - type: dropdown
-    id: version
-    attributes:
-      label: Version
-      description: What version of Streamyfin are you running?
-      options:
-        - 0.29.0
-        - 0.28.0
-        - 0.27.0
-        - 0.26.1
-        - 0.26.0
-        - 0.25.0
-        - 0.24.0
-        - 0.23.0
-        - 0.22.0
-        - 0.21.0
-        - older
-    validations:
-      required: true
-
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: If applicable, please add screenshots to help explain your problem.
-        You can drag and drop images here or paste them directly into the comment box.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🤔 Questions and Help
+    url: https://discord.streamyfin.app
+    about: Support questions? Please use our Streamyfin Discord community for help.
+  - name: 🛡️ Security vulnerability report
+    url: https://github.com/streamyfin/streamyfin/security/policy
+    about: Please report security vulnerabilities privately via our Security Policy for responsible disclosure.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,15 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: '✨ enhancement'
-assignees: ''
-projects:
- - streamyfin/3
---
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,87 @@
+name: "🚀 Feature Request"
+description: Suggest an idea for this project
+title: "[REQUEST]: "
+labels: ["✨ enhancement"]
+projects:
+ - "streamyfin/3"
+body:
+  - type: markdown
+    id: introduction
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+        Please keep in mind that Streamyfin is a [free and open-source](https://github.com/streamyfin/streamyfin) project, made up entirely and exclusively of **volunteers** who donate their free time to the project.
+  - type: checkboxes
+    id: before-posting
+    attributes:
+      label: "This feature request respects the following points:"
+      description: All conditions are **required**. Failure to comply with any of these conditions may cause your feature request to be closed without comment.
+      options:
+        - label: This is a **feature request**, not a question or a configuration issue; Please visit our community channels first to troubleshoot with volunteers, before creating a report. The links can be found in our [Discord](https://discord.streamyfin.app).
+          required: true
+        - label: This issue is **not** already reported on [GitHub](https://github.com/streamyfin/streamyfin/issues?q=is%3Aissue+is%3Aopen+label%3A"✨%20enhancement") _(I've searched it)_.
+          required: true
+        - label: I'm using an up-to-date version of Streamyfin. We generally do not support older versions. If possible, please update to the latest version before opening an issue.
+          required: true
+        - label: I agree to follow Streamyfin's [Contribution Guidelines](https://github.com/streamyfin/streamyfin/blob/develop/.github/CONTRIBUTING.md).
+          required: true
+        - label: This report addresses only a single feature request; If you have multiple feature requests, kindly create separate reports for each one.
+          required: true
+  - type: markdown
+    id: preliminary-information
+    attributes:
+      value: |
+        ### General preliminary information
+
+
+        Please keep the following in mind when creating this issue:
+
+
+        1. Fill in as much of the template as possible.
+        2. Provide as much detail as possible. Do not assume other people to know what is going on.
+        3. Keep everything readable and structured. Nobody enjoys reading poorly written reports that are difficult to understand.
+        4. Keep an eye on your report as long as it is open, your involvement might be requested at a later moment.
+        5. Keep the title short and descriptive. The title is not the place to write down a full description of the issue.
+        6. When choosing to omit information in a field, write 'n/a' to explicitly indicate the deliberate absence of data. Avoid leaving the field blank or empty.
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Description of the feature request
+      description: Please provide a detailed description of the feature request, in a readable and comprehensible way.
+      placeholder: |
+        I would like to see a new feature that allows users to [...] 
+    validations:
+      required: true
+  - type: textarea
+    id: related-problems
+    attributes:
+        label: Is your feature request related to a problem?
+        description: A clear and concise description of what the problem is.     
+        placeholder: |
+            I'm always frustrated when [...]
+  - type: textarea
+    id: solution-description
+    attributes:
+        label: Describe the solution you'd like
+        description: A clear and concise description of what you want to happen.     
+        placeholder: |
+            I would like to see [...]
+    validations:
+      required: true
+  - type: textarea
+    id: alternative-description
+    attributes:
+        label: Describe alternatives you've considered
+        description: A clear and concise description of any alternative solutions or features you've considered.   
+        placeholder: |
+            I've considered [...]
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Relevant screenshots or videos
+      description: Attach relevant screenshots or videos related to this report (drag-and-drop or paste into the editor).
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any additional information that might be useful to this feature request.
--- a/.github/ISSUE_TEMPLATE/issue_report.yml
+++ b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -0,0 +1,119 @@
+name: "🐛 Bug Report"
+description: Create a report to help us improve
+title: "[Bug]: "
+labels:
+  - "🐛 bug"
+projects:
+  - "streamyfin/3"
+
+body:
+  - type: markdown
+    id: introduction
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+        Please keep in mind that Streamyfin is a [free and open-source](https://github.com/streamyfin/streamyfin) project maintained entirely by **volunteers** who donate their free time.
+
+  - type: checkboxes
+    id: before-posting
+    attributes:
+      label: "This issue respects the following points:"
+      description: All conditions are **required**. Failure to comply with any of these conditions may cause your issue to be closed without comment.
+      options:
+        - label: This is a **bug**, not a question or configuration issue; please consult our community channels before filing a report. [Discord](https://discord.streamyfin.app).
+          required: true
+        - label: This issue is **not** already reported on [GitHub](https://github.com/streamyfin/streamyfin/issues?q=is%3Aissue+is%3Aopen+label%3A"🐛%20bug") *(I've searched it)*.
+          required: true
+        - label: I'm using an up-to-date version of Streamyfin. We generally do not support older versions. If possible, please update to the latest version before opening an issue.
+          required: true
+        - label:  I agree to follow Streamyfin's [Contribution rules](https://github.com/streamyfin/streamyfin/blob/develop/.github/CONTRIBUTING.md).
+          required: true
+        - label: This report addresses only a single issue; If you encounter multiple issues, please create separate reports for each one.
+          required: true
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: A clear and concise description of what the bug is.
+      placeholder: Describe what happened in detail.
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-expected
+    attributes:
+      label: What did you expect to happen?
+      description: Tell us what you expected to happen instead.
+      placeholder: Describe the expected behavior clearly.
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: Reproduction steps
+      description: "How do you trigger this bug? Please walk us through it step by step."
+      placeholder: |
+        1. Open Streamyfin app
+        2. Navigate to [specific section]
+        3. Tap on [specific item]
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: device
+    attributes:
+      label: Which device and operating system are you using?
+      description: Please provide your device model and OS version
+      placeholder: e.g. iPhone 15 Pro, iOS 18.1.1 or Samsung Galaxy S24, Android 14
+    validations:
+      required: true
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Streamyfin Version
+      description: What version of Streamyfin are you running?
+      options:
+        - 0.30.2
+        - 0.29.0
+        - 0.28.0
+        - 0.27.0
+        - 0.26.1
+        - 0.26.0
+        - 0.25.0
+        - older
+        - TestFlight/Development build
+    validations:
+      required: true
+
+  - type: textarea
+    id: jellyfin-info
+    attributes:
+      label: Jellyfin Server Information
+      description: Please provide details about your Jellyfin server
+      placeholder: |
+        - Jellyfin Server Version: e.g. 10.10.7
+        - Server OS: e.g. Ubuntu 22.04, Windows 11, Docker
+        - Connection: e.g. Local network, Remote via domain, VPN
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots or Videos
+      description: If applicable, please add screenshots or videos to help explain your problem. You can drag and drop images here or paste them directly into the comment box.
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant logs (if available)
+      description: If you have access to app logs or crash reports, please include them here. **Remember to remove any personal information like server URLs or usernames.**
+      render: shell
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional information
+      description: Any additional context that might help us understand and reproduce the issue.
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -0,0 +1,91 @@
+<!--
+  Pull Request Template for Streamyfin
+  ====================================
+  Use this template to help reviewers understand the purpose of your PR
+  and to ensure all necessary checks are completed before merging.
+-->
+
+# 📦 Pull Request
+
+## 🔖 Summary
+<!--
+A concise description of the changes introduced by this PR.
+Example:
+“Add real-time currency conversion widget to dashboard.”
+-->
+
+## 🏷️ Ticket / Issue
+<!--
+Link to the related ticket, issue or user story.
+You can also indicate if this PR supersedes a previous one.
+Example:
+- Closes #123
+- Fixes STREAMYFIN-456
+- Resolves #789
+- Supersedes #120
+- Related: #130
+-->
+
+## 🛠️ What’s Changed
+<!-- Use a Conventional Commit in the PR title, e.g., `feat(auth): add MFA`. 
+If this PR introduces a breaking change, include a `BREAKING CHANGE:` block in the description.
+Spec: https://www.conventionalcommits.org/ -->
+
+- Type: feat | fix | docs | style | refactor | perf | test | chore | build | ci | revert
+- Scope (optional): e.g., auth, billing, mobile
+- Short summary: what changed and why (1–2 lines)
+-->
+
+## 📋 Details
+<!--
+Provide more context or background. Explain any non-obvious decisions.
+Include screenshots or GIFs for UI changes if applicable.
+-->
+
+### ⚠️ Breaking Changes
+<!-- List any breaking API/contract changes and migration guidance. If none, write “None”. -->
+
+### 🔐 Security & Privacy Impact
+<!-- Data touched, new permissions/scopes, PII, secrets, threat considerations. If none, write “None”. -->
+
+### ⚡ Performance Impact
+<!-- Hot paths, memory/CPU/latency implications, benchmarks if available. -->
+
+### 🖼️ Screenshots / GIFs (if UI)
+<!-- Before/After, dark mode, responsive states. -->
+
+## ✅ Checklist
+<!--
+Review and check off items as you complete them.
+-->
+- [ ] I’ve read the [contribution guidelines](CONTRIBUTING.md)
+- [ ] Code follows project style and passes lint/format (`npm|pnpm|yarn|bun` scripts)
+- [ ] Type checks pass (tsc/biome/etc.)
+- [ ] Docs updated (README/ADR/usage/API)
+- [ ] No secrets/credentials included; env vars documented
+- [ ] Release notes/CHANGELOG entry added (if applicable)
+- [ ] Verified locally that changes behave as expected
+
+## 🔍 Testing Instructions
+<!--
+Describe how reviewers can test your changes.
+Example:
+1. `git fetch origin pull/<PR_ID>/head:branchname && git checkout branchname`
+2. Install deps: `npm|pnpm|yarn|bun install`
+3. Start service/app: `npm|pnpm|yarn|bun run [target]` (e.g., `npm run ios` or `bun run android:tv`)
+4. Run tests: `npm|pnpm|yarn|bun test`
+5. Verification steps:
+   - [ ] Expected UI/endpoint behavior
+   - [ ] Logs show no errors
+   - [ ] Edge cases covered (list)
+-->
+
+## ⚙️ Deployment Notes
+<!--
+Describe any deployment considerations such as config, environment vars, or native builds.
+-->
+
+## 📝 Additional Notes
+<!--
+Any other information or references related to this PR.
+-->
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -0,0 +1,46 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "description": "Renovate configuration for Streamyfin - Expo React Native Jellyfin client",
+  "extends": [
+    "config:best-practices",
+    ":dependencyDashboard",
+    ":enableVulnerabilityAlertsWithLabel(security)",
+    ":semanticCommits",
+    ":timezone(Etc/UTC)",
+    "group:testNonMajor",
+    "group:monorepos",
+    "helpers:pinGitHubActionDigests",
+    "customManagers:biomeVersions",
+    ":automergeBranch",
+    ":automergeRequireAllStatusChecks"
+  ],
+  "addLabels": ["dependencies"],
+  "rebaseWhen": "conflicted",
+  "ignorePaths": ["**/node_modules/**"],
+  "ignoreUnstable": true,
+  "minimumReleaseAge": "3 days",
+  "schedule": ["before 6am on Sunday"],
+  "branchPrefix": "renovate/",
+  "commitMessagePrefix": "chore(deps):",
+  "osvVulnerabilityAlerts": true,
+  "configMigration": true,
+  "separateMinorPatch": true,
+  "lockFileMaintenance": {
+    "vulnerabilityAlerts": {
+      "enabled": true,
+      "addLabels": ["security", "vulnerability"],
+      "assigneesFromCodeOwners": true,
+      "commitMessageSuffix": " [SECURITY]"
+    },
+    "packageRules": [
+      {
+        "description": "Group minor and patch GitHub Action updates into a single PR",
+        "matchManagers": ["github-actions"],
+        "groupName": "CI dependencies",
+        "groupSlug": "ci-deps",
+        "matchUpdateTypes": ["minor", "patch", "digest", "pin"],
+        "automerge": true
+      }
+    ]
+  }
+}
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -13,6 +13,7 @@ on:

 jobs:
  build-android:
+    if: (!contains(github.event.head_commit.message, '[skip ci]'))
    runs-on: ubuntu-24.04
    name: 🏗️ Build Android APK
    permissions:
@@ -46,16 +47,6 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-bun-develop
            ${{ runner.os }}-bun-develop

-      - name: 💾 Cache node_modules
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-${{ runner.arch }}-modules-latest-develop-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-modules-latest-develop
-            ${{ runner.os }}-${{ runner.arch }}-modules-develop
-            ${{ runner.os }}-modules-develop
-
      - name: 📦 Install dependencies and reload submodules
        run: |
          bun install --frozen-lockfile
--- a/.github/workflows/build-ios.yml
+++ b/.github/workflows/build-ios.yml
@@ -8,12 +8,16 @@ on:
  workflow_dispatch:
  pull_request:
    branches: [develop, master]
+    paths-ignore:
+      - '*.md'
  push:
    branches: [develop, master]
+    paths-ignore:
+      - '*.md'

 jobs:
  build-ios:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'
+    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-15
    name: 🏗️ Build iOS IPA
    permissions:
@@ -22,7 +26,8 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        target: [phone, tv]
+        target: [phone]
+#        target: [phone, tv]

    steps:
      - name: 📥 Checkout code
@@ -58,12 +63,21 @@ jobs:
          else
            bun run prebuild
          fi
-      
+
      - name: 🏗️ Setup EAS
        uses: expo/expo-github-action@main
        with:
          eas-version: latest
          token: ${{ secrets.EXPO_TOKEN }}
+          eas-cache: true
+
+      - name: ⚙️ Ensure iOS/tvOS SDKs installed
+        run: |
+          if [ "${{ matrix.target }}" = "tv" ]; then
+            xcodebuild -downloadPlatform tvOS
+          else
+            xcodebuild -downloadPlatform iOS
+          fi

      - name: 🚀 Build iOS app
        env:
--- a/.github/workflows/ci-codeql.yml
+++ b/.github/workflows/ci-codeql.yml
@@ -20,7 +20,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        language: [ 'javascript-typescript' ]
+        language: [ 'javascript-typescript', 'actions' ]

    steps:
      - name: 📥 Checkout repository
@@ -31,13 +31,13 @@ jobs:
          fetch-depth: 0

      - name: 🏁 Initialize CodeQL
-        uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
        with:
          languages: ${{ matrix.language }}
          queries: +security-extended,security-and-quality

      - name: 🛠️ Autobuild
-        uses: github/codeql-action/autobuild@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/autobuild@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0

      - name: 🧪 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
--- a/.github/workflows/conflict.yml
+++ b/.github/workflows/conflict.yml
@@ -19,6 +19,6 @@ jobs:
      - name: 🚩 Apply merge conflict label
        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
        with:
-          dirtyLabel: 'merge-conflict'
+          dirtyLabel: '⚔️ merge-conflict'
          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
          repoToken: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -20,7 +20,7 @@ jobs:
      pull-requests: write
      contents: read
    steps:
-      - uses: amannn/action-semantic-pull-request@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # v6.0.1
+      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
        id: lint_pr_title
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -53,14 +53,13 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          fetch-depth: 0

      - name: Dependency Review
-        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
        with:
          fail-on-severity: high
-          deny-licenses: GPL-3.0, AGPL-3.0
          base-ref: ${{ github.event.pull_request.base.sha || 'develop' }}
          head-ref: ${{ github.event.pull_request.head.sha || github.ref }}

@@ -71,7 +70,7 @@ jobs:
      - name: 🛒 Checkout repository
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
          fetch-depth: 0

@@ -88,7 +87,7 @@ jobs:

  code_quality:
    name: "🔍 Lint & Test (${{ matrix.command }})"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
    strategy:
      fail-fast: false
      matrix:
@@ -96,11 +95,13 @@ jobs:
          - "lint"
          - "check"
          - "format"
+          - "typecheck"
+
    steps:
      - name: "📥 Checkout PR code"
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
          submodules: recursive
          fetch-depth: 0

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -20,12 +20,12 @@ jobs:
          # Global settings
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          operations-per-run: 500  # Increase if you have >1000 issues
-          log-level: debug
+          enable-statistics: true

          # Issue configuration
          days-before-issue-stale: 90
          days-before-issue-close: 7
-          stale-issue-label: "stale"
+          stale-issue-label: "🕰️ stale"
          exempt-issue-labels: "Roadmap v1,help needed,enhancement"

          # Notifications messages
--- a/.github/workflows/update-issue-form.yml
+++ b/.github/workflows/update-issue-form.yml
@@ -0,0 +1,67 @@
+name: 🐛 Update Bug Report Template
+
+on:
+  release:
+    types: [published]  # Run on every published release on any branch
+
+concurrency:
+   group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
+   cancel-in-progress: true
+
+jobs:
+  update-bug-report:
+    permissions:
+      contents: write
+      pull-requests: write
+      issues: write
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: 📥 Checkout repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: "🟢 Setup Node.js"
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: '24.x'
+          cache: 'npm'
+
+      - name: 🔍 Extract minor version from app.json
+        id: minor
+        uses: actions/github-script@main
+        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();
+
+      - 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: ⚙️ 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
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e #v7.0.8
+        with:
+          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
+          branch: ci-update-bug-report
+          base: develop
+          delete-branch: true
+          labels: ⚙️ ci, 🤖 github-actions
+          title: 'chore(): Update bug report template to match release version'
+          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 }})
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ streamyfin-4fec1-firebase-adminsdk.json
 .env.local
 *.aab
 /version-backup-*
+bun.lockb
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Join our Discord: [![](https://dcbadge.limes.pink/api/server/https://discord.gg/
 Need support or have questions:

 - GitHub Issues: Report bugs or request features here.
- Email: [fredrik.burmester@gmail.com](mailto:fredrik.burmester@gmail.com)
+- Email: [developer@streamyfin.app](mailto:developer@streamyfin.app)

 ## ❓ FAQ

@@ -181,6 +181,12 @@ Thanks to the following contributors for their significant contributions:
        <br /><sub><b>@topiga</b></sub>
      </a>
    </td>
+    <td align="center">
+      <a href="https://github.com/lancechant">
+        <img src="https://github.com/lancechant.png?size=55" width="55" style="border-radius: 50%;" />
+        <br /><sub><b>@lancechant</b></sub>
+      </a>
+    </td>
  </tr>
  <tr>
    <td align="center">
@@ -213,6 +219,12 @@ Thanks to the following contributors for their significant contributions:
        <br /><sub><b>@whoopsi-daisy</b></sub>
      </a>
    </td>
+    <td align="center">
+      <a href="https://github.com/Gauvino">
+        <img src="https://github.com/Gauvino.png?size=55" width="55" style="border-radius: 50%;" />
+        <br /><sub><b>@Gauvino</b></sub>
+      </a>
+    </td>
  </tr>
 </table>
 </div>
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,40 @@
+# Security Policy
+
+## Supported Versions of Streamyfin Mobile App
+
+Only the most recent stable release of the Streamyfin mobile app is guaranteed to include the latest security patches. **Running older app versions may leave you vulnerable to security risks**. Always update your app from the official App Store or Google Play Store as soon as updates are available. If you must run an older version, avoid using sensitive features (e.g., account management, payment methods) until you can upgrade.
+
+This policy applies only to the current stable app release. Security flaws in previous app versions that are no longer present in the latest release **will not** be back-ported or fixed.
+
+## Supported Versions of Other Streamyfin Components (Server, Plugins)
+
+Most Streamyfin backend services and plugins are supported only in their latest release. Consult each project’s README or release notes for any exceptions.
+
+## Vulnerability Triage
+
+Before reporting an issue, please consider:
+
+- Administrator-level risks: Certain administrative or configuration endpoints in the backend may inherently carry elevated privileges. Vulnerabilities that **require administrator or root access** are classified as low priority. Report those via normal GitHub Issues.
+- Known vulnerabilities: We maintain a public list of known issues on our Security Advisories page at https://github.com/Streamyfin/Streamyfin/security/advisories. If your issue is already listed there, please do not re-report it.
+- Local-only issues: Vulnerabilities exploitable only with physical device access, manual file modification, or local debugging (e.g., modifying app files, rooting/jailbreaking) are considered low- to medium-priority.
+- Infrastructure reports: To report issues in our website, servers, CI/CD, or other infrastructure, tag your report subject with `[Streamyfin Infrastructure]`. Our infrastructure team follows standard patch policies for public vulnerabilities, so avoid duplicating widely known issues.
+
+
+## Reporting a Vulnerability
+
+After confirming your issue is new and relevant, send an email to **developer@streamyfin.app** with the following:
+
+1. Subject line: `[Streamyfin Security] <short summary>`
+2. Overview (public-safe): Describe what component is affected (mobile app, backend API, plugin) and the high-level impact. We may reuse this text for a GitHub Security Advisory.
+3. Details: Provide reproduction steps, code or API snippets, proof-of-concept, and any suggested remediation. Detail exactly how to trigger the issue.
+4. Your GitHub username: So we can invite you to the GitHub Security Advisory (GHSA) for coordination and credit.
+
+Once received, we will review the report, file a GHSA if warranted, and include you and the relevant teams in the remediation process.
+
+## Post-Disclosure Process
+
+Streamyfin is a volunteer-driven project. **We appreciate patience and do not enforce strict disclosure deadlines**, especially for complex issues. You may send polite follow-ups if there’s no response after a reasonable interval.
+
+- Patch releases: For critical vulnerabilities, we generally issue a point release promptly unless a major release is imminent; in that case, we defer the fix.
+- Advisory publication: After releasing a patched app version, we wait at least seven days (1 week) before publishing the GHSA to allow most users to upgrade. We request that any third-party disclosures (blog posts, advisories) occur **after** our GHSA publication.
+- CVE assignment: We will request CVEs via the GitHub Security interface and include them in the published advisory.
--- a/app.config.js
+++ b/app.config.js
@@ -1,5 +1,7 @@
 module.exports = ({ config }) => {
  if (process.env.EXPO_TV !== "1") {
+    config.plugins.push("expo-background-task");
+
    config.plugins.push([
      "react-native-google-cast",
      { useDefaultExpandedMediaControls: true },
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
  "expo": {
    "name": "Streamyfin",
    "slug": "streamyfin",
-    "version": "0.30.2",
+    "version": "0.35.0",
    "orientation": "default",
    "icon": "./assets/images/icon.png",
    "scheme": "streamyfin",
@@ -37,7 +37,7 @@
    },
    "android": {
      "jsEngine": "hermes",
-      "versionCode": 58,
+      "versionCode": 66,
      "adaptiveIcon": {
        "foregroundImage": "./assets/images/icon-android-plain.png",
        "monochromeImage": "./assets/images/icon-android-themed.png",
--- a/app/(auth)/(tabs)/(home)/downloads/index.tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/index.tsx
@@ -14,7 +14,7 @@ import { toast } from "sonner-native";
 import { Button } from "@/components/Button";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
-import { ActiveDownloads } from "@/components/downloads/ActiveDownloads";
+import ActiveDownloads from "@/components/downloads/ActiveDownloads";
 import { DownloadSize } from "@/components/downloads/DownloadSize";
 import { MovieCard } from "@/components/downloads/MovieCard";
 import { SeriesCard } from "@/components/downloads/SeriesCard";
--- a/app/(auth)/(tabs)/(home)/sessions/index.tsx
+++ b/app/(auth)/(tabs)/(home)/sessions/index.tsx
@@ -99,15 +99,19 @@ const SessionCard = ({ session }: SessionCardProps) => {
    }
  }, [session]);

-  const { data: ipInfo } = useQuery({
+  const { data: ipInfo } = useQuery<{
+    cityName?: string;
+    countryCode?: string;
+  }>({
    queryKey: ["ipinfo", session.RemoteEndPoint],
-    cacheTime: Number.POSITIVE_INFINITY,
+    staleTime: Number.POSITIVE_INFINITY,
    queryFn: async () => {
-      const resp = await api.axiosInstance.get(
+      const resp = await api!.axiosInstance.get(
        `https://freeipapi.com/api/json/${session.RemoteEndPoint}`,
      );
      return resp.data;
    },
+    enabled: !!api,
  });

  // Handle session controls
--- a/app/(auth)/(tabs)/(home)/settings.tsx
+++ b/app/(auth)/(tabs)/(home)/settings.tsx
@@ -2,7 +2,7 @@ import { useNavigation, useRouter } from "expo-router";
 import { t } from "i18next";
 import { useAtom } from "jotai";
 import { useEffect } from "react";
-import { ScrollView, TouchableOpacity, View } from "react-native";
+import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
@@ -11,6 +11,7 @@ import { AppLanguageSelector } from "@/components/settings/AppLanguageSelector";
 import { AudioToggles } from "@/components/settings/AudioToggles";
 import { ChromecastSettings } from "@/components/settings/ChromecastSettings";
 import DownloadSettings from "@/components/settings/DownloadSettings";
+import { GestureControls } from "@/components/settings/GestureControls";
 import { MediaProvider } from "@/components/settings/MediaContext";
 import { MediaToggles } from "@/components/settings/MediaToggles";
 import { OtherSettings } from "@/components/settings/OtherSettings";
@@ -67,19 +68,20 @@ export default function settings() {

        <MediaProvider>
          <MediaToggles className='mb-4' />
+          <GestureControls className='mb-4' />
          <AudioToggles className='mb-4' />
          <SubtitleToggles className='mb-4' />
        </MediaProvider>

        <OtherSettings />

-        <DownloadSettings />
+        {!Platform.isTV && <DownloadSettings />}

        <PluginSettings />

        <AppLanguageSelector />

-        <ChromecastSettings />
+        {!Platform.isTV && <ChromecastSettings />}

        <ListGroup title={"Intro"}>
          <ListItem
@@ -112,7 +114,7 @@ export default function settings() {
          </ListGroup>
        </View>

-        <StorageSettings />
+        {!Platform.isTV && <StorageSettings />}
      </View>
    </ScrollView>
  );
--- a/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx
@@ -12,7 +12,7 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";

 export default function page() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);
  const user = useAtomValue(userAtom);
  const api = useAtomValue(apiAtom);

--- a/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/jellyseerr/page.tsx
@@ -3,7 +3,7 @@ import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
 import { useSettings } from "@/utils/atoms/settings";

 export default function page() {
-  const [_settings, _updateSettings, pluginSettings] = useSettings();
+  const [_settings, _updateSettings, pluginSettings] = useSettings(null);

  return (
    <DisabledSetting
--- a/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/logs/page.tsx
@@ -10,7 +10,7 @@ import { FilterButton } from "@/components/filters/FilterButton";
 import { Loader } from "@/components/Loader";
 import { LogLevel, useLog, writeErrorLog } from "@/utils/log";

-export default function page() {
+export default function Page() {
  const navigation = useNavigation();
  const { logs } = useLog();
  const { t } = useTranslation();
@@ -28,10 +28,12 @@ export default function page() {

  const [loading, setLoading] = useState<boolean>(false);
  const [state, setState] = useState<Record<string, boolean>>({});
-
  const [order, setOrder] = useState<"asc" | "desc">("desc");
  const [levels, setLevels] = useState<LogLevel[]>(defaultLevels);

+  const _orderId = useId();
+  const _levelsId = useId();
+
  const filteredLogs = useMemo(
    () =>
      logs
@@ -83,7 +85,7 @@ export default function page() {
          values={[order]}
          title={t("library.filters.sort_order")}
          renderItemLabel={(order) => t(`library.filters.${order}`)}
-          showSearch={false}
+          disableSearch={true}
        />
        <FilterButton
          id={levelsFilterId}
@@ -93,7 +95,7 @@ export default function page() {
          values={levels}
          title={t("home.settings.logs.level")}
          renderItemLabel={(level) => level}
-          showSearch={false}
+          disableSearch={true}
          multiple={true}
        />
      </View>
--- a/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
+++ b/app/(auth)/(tabs)/(home)/settings/marlin-search/page.tsx
@@ -21,7 +21,7 @@ export default function page() {

  const { t } = useTranslation();

-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);
  const queryClient = useQueryClient();

  const [value, setValue] = useState<string>(settings?.marlinServerUrl || "");
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/livetv/guide.tsx
@@ -116,8 +116,8 @@ export default function page() {
                style={{
                  width: "100%",
                  height: "100%",
-                  resizeMode: "contain",
                }}
+                contentFit='contain'
                item={c}
              />
            </View>
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/series/[id].tsx
@@ -141,8 +141,8 @@ const page: React.FC = () => {
            style={{
              height: 130,
              width: "100%",
-              resizeMode: "contain",
            }}
+            contentFit='contain'
          />
        ) : undefined
      }
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -9,7 +9,7 @@ const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
 import { useTranslation } from "react-i18next";

 export default function IndexLayout() {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);

  const { t } = useTranslation();

--- a/app/(auth)/(tabs)/(libraries)/index.tsx
+++ b/app/(auth)/(tabs)/(libraries)/index.tsx
@@ -19,7 +19,7 @@ export default function index() {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const queryClient = useQueryClient();
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);

  const { t } = useTranslation();

--- a/app/(auth)/(tabs)/(search)/index.tsx
+++ b/app/(auth)/(tabs)/(search)/index.tsx
@@ -71,7 +71,7 @@ export default function search() {

  const [api] = useAtom(apiAtom);

-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const { jellyseerrApi } = useJellyseerr();
  const [jellyseerrOrderBy, setJellyseerrOrderBy] =
    useState<JellyseerrSearchSort>(
@@ -330,7 +330,7 @@ export default function search() {
                    renderItemLabel={(item) =>
                      t(`home.settings.plugins.jellyseerr.order_by.${item}`)
                    }
-                    showSearch={false}
+                    disableSearch={true}
                  />
                  <FilterButton
                    id={orderFilterId}
@@ -340,7 +340,7 @@ export default function search() {
                    values={[jellyseerrSortOrder]}
                    title={t("library.filters.sort_order")}
                    renderItemLabel={(item) => t(`library.filters.${item}`)}
-                    showSearch={false}
+                    disableSearch={true}
                  />
                </View>
              )}
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -27,7 +27,7 @@ export const NativeTabs = withLayoutContext<
 >(Navigator);

 export default function TabLayout() {
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const { t } = useTranslation();
  const router = useRouter();

--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -15,8 +15,8 @@ import { useAtomValue } from "jotai";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Platform, View } from "react-native";
-import { useSharedValue } from "react-native-reanimated";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useAnimatedReaction, useSharedValue } from "react-native-reanimated";
+
 import { BITRATES } from "@/components/BitrateSelector";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
@@ -27,7 +27,6 @@ import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybac
 import { useWebSocket } from "@/hooks/useWebsockets";
 import { VlcPlayerView } from "@/modules";
 import type {
-  PipStartedPayload,
  PlaybackStatePayload,
  ProgressUpdatePayload,
  VlcPlayerViewRef,
@@ -38,12 +37,9 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import { writeToLog } from "@/utils/log";
-import { storage } from "@/utils/mmkv";
 import { generateDeviceProfile } from "@/utils/profiles/native";
 import { msToTicks, ticksToSeconds } from "@/utils/time";

-const IGNORE_SAFE_AREAS_KEY = "video_player_ignore_safe_areas";
-
 export default function page() {
  const videoRef = useRef<VlcPlayerViewRef>(null);
  const user = useAtomValue(userAtom);
@@ -53,16 +49,16 @@ export default function page() {

  const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
  const [showControls, _setShowControls] = useState(true);
-  const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(() => {
-    // Load persisted state from storage
-    const saved = storage.getBoolean(IGNORE_SAFE_AREAS_KEY);
-    return saved ?? false;
-  });
+  const [aspectRatio, setAspectRatio] = useState<
+    "default" | "16:9" | "4:3" | "1:1" | "21:9"
+  >("default");
+  const [scaleFactor, setScaleFactor] = useState<
+    1.0 | 1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6 | 1.7 | 1.8 | 1.9 | 2.0
+  >(1.0);
  const [isPlaying, setIsPlaying] = useState(false);
  const [isMuted, setIsMuted] = useState(false);
  const [isBuffering, setIsBuffering] = useState(true);
  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
-  const [isPipStarted, setIsPipStarted] = useState(false);

  const progress = useSharedValue(0);
  const isSeeking = useSharedValue(false);
@@ -72,6 +68,7 @@ export default function page() {
    : require("react-native-volume-manager");

  const downloadUtils = useDownload();
+  const downloadedFiles = downloadUtils.getDownloadedItems();

  const revalidateProgressCache = useInvalidatePlaybackProgressCache();

@@ -82,11 +79,6 @@ export default function page() {
    lightHapticFeedback();
  }, []);

-  // Persist ignoreSafeAreas state whenever it changes
-  useEffect(() => {
-    storage.set(IGNORE_SAFE_AREAS_KEY, ignoreSafeAreas);
-  }, [ignoreSafeAreas]);
-
  const {
    itemId,
    audioIndex: audioIndexStr,
@@ -105,8 +97,8 @@ export default function page() {
    /** Playback position in ticks. */
    playbackPosition?: string;
  }>();
-  const [settings] = useSettings();
-  const insets = useSafeAreaInsets();
+  const [_settings] = useSettings(null);
+
  const offline = offlineStr === "true";
  const playbackManager = usePlaybackManager();

@@ -184,6 +176,13 @@ export default function page() {
    const fetchStreamData = async () => {
      setStreamStatus({ isLoading: true, isError: false });
      try {
+        // Don't attempt to fetch stream data if item is not available
+        if (!item?.Id) {
+          console.log("Item not loaded yet, skipping stream data fetch");
+          setStreamStatus({ isLoading: false, isError: false });
+          return;
+        }
+
        let result: Stream | null = null;
        if (offline && downloadedItem && downloadedItem.mediaSource) {
          const url = downloadedItem.videoFilePath;
@@ -195,13 +194,25 @@ export default function page() {
            };
          }
        } else {
+          // Validate required parameters before calling getStreamUrl
+          if (!api) {
+            console.warn("API not available for streaming");
+            setStreamStatus({ isLoading: false, isError: true });
+            return;
+          }
+          if (!user?.Id) {
+            console.warn("User not authenticated for streaming");
+            setStreamStatus({ isLoading: false, isError: true });
+            return;
+          }
+
          const native = generateDeviceProfile();
          const transcoding = generateDeviceProfile({ transcode: true });
          const res = await getStreamUrl({
            api,
            item,
            startTimeTicks: getInitialPlaybackTicks(),
-            userId: user?.Id,
+            userId: user.Id,
            audioStreamIndex: audioIndex,
            maxStreamingBitrate: bitrateValue,
            mediaSourceId: mediaSourceId,
@@ -287,11 +298,15 @@ export default function page() {
  ]);

  const stop = useCallback(() => {
+    // Update URL with final playback position before stopping
+    router.setParams({
+      playbackPosition: msToTicks(progress.get()).toString(),
+    });
    reportPlaybackStopped();
    setIsPlaybackStopped(true);
    videoRef.current?.stop();
    revalidateProgressCache();
-  }, [videoRef, reportPlaybackStopped]);
+  }, [videoRef, reportPlaybackStopped, progress]);

  useEffect(() => {
    const beforeRemoveListener = navigation.addListener("beforeRemove", stop);
@@ -300,7 +315,7 @@ export default function page() {
    };
  }, [navigation, stop]);

-  const currentPlayStateInfo = () => {
+  const currentPlayStateInfo = useCallback(() => {
    if (!stream) return;
    return {
      itemId: item?.Id!,
@@ -316,7 +331,32 @@ export default function page() {
      repeatMode: RepeatMode.RepeatNone,
      playbackOrder: PlaybackOrder.Default,
    };
-  };
+  }, [
+    stream,
+    item?.Id,
+    audioIndex,
+    subtitleIndex,
+    mediaSourceId,
+    progress,
+    isPlaying,
+    isMuted,
+  ]);
+
+  const lastUrlUpdateTime = useSharedValue(0);
+  const wasJustSeeking = useSharedValue(false);
+  const URL_UPDATE_INTERVAL = 30000; // Update URL every 30 seconds instead of every second
+
+  // Track when seeking ends to update URL immediately
+  useAnimatedReaction(
+    () => isSeeking.get(),
+    (currentSeeking, previousSeeking) => {
+      if (previousSeeking && !currentSeeking) {
+        // Seeking just ended
+        wasJustSeeking.value = true;
+      }
+    },
+    [],
+  );

  const onProgress = useCallback(
    async (data: ProgressUpdatePayload) => {
@@ -329,10 +369,20 @@ export default function page() {

      progress.set(currentTime);

-      // Update the playback position in the URL.
-      router.setParams({
-        playbackPosition: msToTicks(currentTime).toString(),
-      });
+      // Update URL immediately after seeking, or every 30 seconds during normal playback
+      const now = Date.now();
+      const shouldUpdateUrl = wasJustSeeking.get();
+      wasJustSeeking.value = false;
+
+      if (
+        shouldUpdateUrl ||
+        now - lastUrlUpdateTime.get() > URL_UPDATE_INTERVAL
+      ) {
+        router.setParams({
+          playbackPosition: msToTicks(currentTime).toString(),
+        });
+        lastUrlUpdateTime.value = now;
+      }

      if (!item?.Id) return;

@@ -358,11 +408,6 @@ export default function page() {
    ],
  );

-  const onPipStarted = useCallback((e: PipStartedPayload) => {
-    const { pipStarted } = e.nativeEvent;
-    setIsPipStarted(pipStarted);
-  }, []);
-
  /** Gets the initial playback position in seconds. */
  const startPosition = useMemo(() => {
    return ticksToSeconds(getInitialPlaybackTicks());
@@ -405,6 +450,7 @@ export default function page() {
      console.error("Error toggling mute:", error);
    }
  }, [previousVolume]);
+
  const volumeDownCb = useCallback(async () => {
    if (Platform.isTV) return;

@@ -519,7 +565,7 @@ export default function page() {
  /** Whether the stream we're playing is not transcoding*/
  const notTranscoding = !stream?.mediaSource.TranscodingUrl;
  /** The initial options to pass to the VLC Player */
-  const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
+  const initOptions = [``];
  if (
    chosenSubtitleTrack &&
    (notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
@@ -544,6 +590,60 @@ export default function page() {
    return () => setIsMounted(false);
  }, []);

+  // Memoize video ref functions to prevent unnecessary re-renders
+  const startPictureInPicture = useCallback(async () => {
+    return videoRef.current?.startPictureInPicture?.();
+  }, []);
+  const play = useCallback(() => {
+    videoRef.current?.play?.();
+  }, []);
+
+  const pause = useCallback(() => {
+    videoRef.current?.pause?.();
+  }, []);
+
+  const seek = useCallback((position: number) => {
+    videoRef.current?.seekTo?.(position);
+  }, []);
+  const getAudioTracks = useCallback(async () => {
+    return videoRef.current?.getAudioTracks?.() || null;
+  }, []);
+
+  const getSubtitleTracks = useCallback(async () => {
+    return videoRef.current?.getSubtitleTracks?.() || null;
+  }, []);
+
+  const setSubtitleTrack = useCallback((index: number) => {
+    videoRef.current?.setSubtitleTrack?.(index);
+  }, []);
+
+  const setSubtitleURL = useCallback((url: string, _customName?: string) => {
+    // Note: VlcPlayer type only expects url parameter
+    videoRef.current?.setSubtitleURL?.(url);
+  }, []);
+
+  const setAudioTrack = useCallback((index: number) => {
+    videoRef.current?.setAudioTrack?.(index);
+  }, []);
+
+  const setVideoAspectRatio = useCallback(
+    async (aspectRatio: string | null) => {
+      return (
+        videoRef.current?.setVideoAspectRatio?.(aspectRatio) ||
+        Promise.resolve()
+      );
+    },
+    [],
+  );
+
+  const setVideoScaleFactor = useCallback(async (scaleFactor: number) => {
+    return (
+      videoRef.current?.setVideoScaleFactor?.(scaleFactor) || Promise.resolve()
+    );
+  }, []);
+
+  console.log("Debug: component render"); // Uncomment to debug re-renders
+
  // Show error UI first, before checking loading/missing‐data
  if (itemStatus.isError || streamStatus.isError) {
    return (
@@ -571,7 +671,14 @@ export default function page() {
    );

  return (
-    <View style={{ flex: 1, backgroundColor: "black" }}>
+    <View
+      style={{
+        flex: 1,
+        backgroundColor: "black",
+        height: "100%",
+        width: "100%",
+      }}
+    >
      <View
        style={{
          display: "flex",
@@ -580,8 +687,6 @@ export default function page() {
          position: "relative",
          flexDirection: "column",
          justifyContent: "center",
-          paddingLeft: ignoreSafeAreas ? 0 : insets.left,
-          paddingRight: ignoreSafeAreas ? 0 : insets.right,
        }}
      >
        <VlcPlayerView
@@ -598,7 +703,6 @@ export default function page() {
          onVideoProgress={onProgress}
          progressUpdateInterval={1000}
          onVideoStateChange={onPlaybackStateChanged}
-          onPipStarted={onPipStarted}
          onVideoLoadEnd={() => {
            setIsVideoLoaded(true);
          }}
@@ -612,7 +716,7 @@ export default function page() {
          }}
        />
      </View>
-      {!isPipStarted && isMounted === true && item && (
+      {isMounted === true && item && (
        <Controls
          mediaSource={stream?.mediaSource}
          item={item}
@@ -625,21 +729,27 @@ export default function page() {
          isBuffering={isBuffering}
          showControls={showControls}
          setShowControls={setShowControls}
-          setIgnoreSafeAreas={setIgnoreSafeAreas}
-          ignoreSafeAreas={ignoreSafeAreas}
          isVideoLoaded={isVideoLoaded}
-          startPictureInPicture={videoRef.current?.startPictureInPicture}
-          play={videoRef.current?.play}
-          pause={videoRef.current?.pause}
-          seek={videoRef.current?.seekTo}
+          startPictureInPicture={startPictureInPicture}
+          play={play}
+          pause={pause}
+          seek={seek}
          enableTrickplay={true}
-          getAudioTracks={videoRef.current?.getAudioTracks}
-          getSubtitleTracks={videoRef.current?.getSubtitleTracks}
+          getAudioTracks={getAudioTracks}
+          getSubtitleTracks={getSubtitleTracks}
          offline={offline}
-          setSubtitleTrack={videoRef.current?.setSubtitleTrack}
-          setSubtitleURL={videoRef.current?.setSubtitleURL}
-          setAudioTrack={videoRef.current?.setAudioTrack}
+          setSubtitleTrack={setSubtitleTrack}
+          setSubtitleURL={setSubtitleURL}
+          setAudioTrack={setAudioTrack}
+          setVideoAspectRatio={setVideoAspectRatio}
+          setVideoScaleFactor={setVideoScaleFactor}
+          aspectRatio={aspectRatio}
+          scaleFactor={scaleFactor}
+          setAspectRatio={setAspectRatio}
+          setScaleFactor={setScaleFactor}
          isVlc
+          api={api}
+          downloadedFiles={downloadedFiles}
        />
      )}
    </View>
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -33,28 +33,25 @@ const BackGroundDownloader = !Platform.isTV
 import { DarkTheme, ThemeProvider } from "@react-navigation/native";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";

-const BackgroundFetch = !Platform.isTV
-  ? require("expo-background-fetch")
-  : null;
+import * as BackgroundTask from "expo-background-task";

 import * as Device from "expo-device";
 import * as FileSystem from "expo-file-system";

 const Notifications = !Platform.isTV ? require("expo-notifications") : null;

+import { getLocales } from "expo-localization";
 import { router, Stack, useSegments } from "expo-router";
 import * as SplashScreen from "expo-splash-screen";
-import * as ScreenOrientation from "@/packages/expo-screen-orientation";

-const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
-
-import { getLocales } from "expo-localization";
+import * as TaskManager from "expo-task-manager";
 import { Provider as JotaiProvider } from "jotai";
 import { useEffect, useRef, useState } from "react";
 import { I18nextProvider } from "react-i18next";
 import { Appearance, AppState } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import "react-native-reanimated";
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
 import type { EventSubscription } from "expo-modules-core";
@@ -136,7 +133,7 @@ if (!Platform.isTV) {
    const result = response.data.filter((s) => s.NowPlayingItem);
    Notifications.setBadgeCountAsync(result.length);

-    return BackgroundFetch.BackgroundFetchResult.NewData;
+    return BackgroundTask.BackgroundTaskResult.Success;
  });

  TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
@@ -144,22 +141,22 @@ if (!Platform.isTV) {

    const settingsData = storage.getString("settings");

-    if (!settingsData) return BackgroundFetch.BackgroundFetchResult.NoData;
+    if (!settingsData) return BackgroundTask.BackgroundTaskResult.Failed;

    const settings: Partial<Settings> = JSON.parse(settingsData);

    if (!settings?.autoDownload)
-      return BackgroundFetch.BackgroundFetchResult.NoData;
+      return BackgroundTask.BackgroundTaskResult.Failed;

    const token = getTokenFromStorage();
    const deviceId = getOrSetDeviceId();
    const baseDirectory = FileSystem.documentDirectory;

    if (!token || !deviceId || !baseDirectory)
-      return BackgroundFetch.BackgroundFetchResult.NoData;
+      return BackgroundTask.BackgroundTaskResult.Failed;

    // Be sure to return the successful result type!
-    return BackgroundFetch.BackgroundFetchResult.NewData;
+    return BackgroundTask.BackgroundTaskResult.Success;
  });
 }

@@ -168,22 +165,31 @@ const checkAndRequestPermissions = async () => {
    const hasAskedBefore = storage.getString(
      "hasAskedForNotificationPermission",
    );
-
+    let granted = false;
    if (hasAskedBefore !== "true") {
      const { status } = await Notifications.requestPermissionsAsync();
-
-      if (status === "granted") {
+      granted = status === "granted";
+      if (granted) {
        writeToLog("INFO", "Notification permissions granted.");
        console.log("Notification permissions granted.");
      } else {
        writeToLog("ERROR", "Notification permissions denied.");
        console.log("Notification permissions denied.");
      }
-
      storage.set("hasAskedForNotificationPermission", "true");
    } else {
-      console.log("Already asked for notification permissions before.");
+      // Already asked before, check current status
+      const { status } = await Notifications.getPermissionsAsync();
+      granted = status === "granted";
+      if (!granted) {
+        writeToLog(
+          "ERROR",
+          "Notification permissions denied (already asked before).",
+        );
+        console.log("Notification permissions denied (already asked before).");
+      }
    }
+    return granted;
  } catch (error) {
    writeToLog(
      "ERROR",
@@ -191,6 +197,7 @@ const checkAndRequestPermissions = async () => {
      error,
    );
    console.error("Error checking/requesting notification permissions:", error);
+    return false;
  }
 };

@@ -223,7 +230,7 @@ const queryClient = new QueryClient({
 });

 function Layout() {
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const [user] = useAtom(userAtom);
  const [api] = useAtom(apiAtom);
  const appState = useRef(AppState.currentState);
@@ -238,8 +245,8 @@ function Layout() {
  useNotificationObserver();

  const [expoPushToken, setExpoPushToken] = useState<ExpoPushToken>();
-  const notificationListener = useRef<EventSubscription>();
-  const responseListener = useRef<EventSubscription>();
+  const notificationListener = useRef<EventSubscription>(null);
+  const responseListener = useRef<EventSubscription>(null);

  useEffect(() => {
    if (!Platform.isTV && expoPushToken && api && user) {
@@ -264,7 +271,13 @@ function Layout() {
      });
    }

-    await checkAndRequestPermissions();
+    const granted = await checkAndRequestPermissions();
+    if (!granted) {
+      console.log(
+        "Notification permissions not granted, skipping background fetch and push token registration.",
+      );
+      return;
+    }

    if (!Platform.isTV && user && user.Policy?.IsAdministrator) {
      await registerBackgroundFetchAsyncSessions();
@@ -280,7 +293,7 @@ function Layout() {

  useEffect(() => {
    if (!Platform.isTV) {
-      registerNotifications();
+      void registerNotifications();

      notificationListener.current =
        Notifications?.addNotificationReceivedListener(
@@ -302,7 +315,7 @@ function Layout() {
              response.notification.request.content,
            );
            if (data && Object.keys(data).length > 0) {
-              const type = data?.type?.toLower?.();
+              const type = (data?.type ?? "").toString().toLowerCase();
              const itemId = data?.id;

              switch (type) {
@@ -332,14 +345,8 @@ function Layout() {
        );

      return () => {
-        notificationListener.current &&
-          Notifications?.removeNotificationSubscription(
-            notificationListener.current,
-          );
-        responseListener.current &&
-          Notifications?.removeNotificationSubscription(
-            responseListener.current,
-          );
+        notificationListener.current?.remove();
+        responseListener.current?.remove();
      };
    }
  }, [user, api]);
--- a/app/login.tsx
+++ b/app/login.tsx
@@ -133,27 +133,52 @@ const Login: React.FC = () => {
   */
  const checkUrl = useCallback(async (url: string) => {
    setLoadingServerCheck(true);
-
+    const baseUrl = url.replace(/^https?:\/\//i, "");
+    const protocols = ["https", "http"];
    try {
-      const response = await fetch(`${url}/System/Info/Public`, {
-        mode: "cors",
-      });
-
-      if (response.ok) {
-        const data = (await response.json()) as PublicSystemInfo;
-
-        setServerName(data.ServerName || "");
-        return url;
+      return checkHttp(baseUrl, protocols);
+    } catch (e) {
+      if (e instanceof Error && e.message === "Server too old") {
+        throw e;
      }
-
-      return undefined;
-    } catch {
      return undefined;
    } finally {
      setLoadingServerCheck(false);
    }
  }, []);

+  async function checkHttp(baseUrl: string, protocols: string[]) {
+    for (const protocol of protocols) {
+      try {
+        const response = await fetch(
+          `${protocol}://${baseUrl}/System/Info/Public`,
+          {
+            mode: "cors",
+          },
+        );
+        if (response.ok) {
+          const data = (await response.json()) as PublicSystemInfo;
+          const serverVersion = data.Version?.split(".");
+          if (serverVersion && +serverVersion[0] <= 10) {
+            if (+serverVersion[1] < 10) {
+              Alert.alert(
+                t("login.too_old_server_text"),
+                t("login.too_old_server_description"),
+              );
+              throw new Error("Server too old");
+            }
+          }
+          setServerName(data.ServerName || "");
+          return `${protocol}://${baseUrl}`;
+        }
+      } catch (e) {
+        if (e instanceof Error && e.message === "Server too old") {
+          throw e;
+        }
+      }
+    }
+    return undefined;
+  }
  /**
   * Handles the connection attempt to a Jellyfin server.
   *
@@ -172,17 +197,17 @@ const Login: React.FC = () => {
   */
  const handleConnect = useCallback(async (url: string) => {
    url = url.trim().replace(/\/$/, "");
-    const result = await checkUrl(url);
-
-    if (result === undefined) {
-      Alert.alert(
-        t("login.connection_failed"),
-        t("login.could_not_connect_to_server"),
-      );
-      return;
-    }
-
-    await setServer({ address: url });
+    try {
+      const result = await checkUrl(url);
+      if (result === undefined) {
+        Alert.alert(
+          t("login.connection_failed"),
+          t("login.could_not_connect_to_server"),
+        );
+        return;
+      }
+      await setServer({ address: result });
+    } catch {}
  }, []);

  const handleQuickConnect = async () => {
@@ -207,7 +232,143 @@ const Login: React.FC = () => {
    }
  };

-  return (
+  return Platform.isTV ? (
+    // TV layout
+    <SafeAreaView className='flex-1 bg-black'>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        style={{ flex: 1 }}
+      >
+        {api?.basePath ? (
+          // ------------ Username/Password view ------------
+          <View className='flex-1 items-center justify-center'>
+            {/* Safe centered column with max width so TV doesn’t stretch too far */}
+            <View className='w-[92%] max-w-[900px] px-2 -mt-12'>
+              <Text className='text-3xl font-bold text-white mb-1'>
+                {serverName ? (
+                  <>
+                    {`${t("login.login_to_title")} `}
+                    <Text className='text-purple-500'>{serverName}</Text>
+                  </>
+                ) : (
+                  t("login.login_title")
+                )}
+              </Text>
+              <Text className='text-xs text-neutral-400 mb-6'>
+                {api.basePath}
+              </Text>
+
+              {/* Username */}
+              <Input
+                placeholder={t("login.username_placeholder")}
+                onChangeText={(text: string) =>
+                  setCredentials({ ...credentials, username: text })
+                }
+                value={credentials.username}
+                keyboardType='default'
+                returnKeyType='done'
+                autoCapitalize='none'
+                textContentType='oneTimeCode'
+                clearButtonMode='while-editing'
+                maxLength={500}
+                extraClassName='mb-4'
+              />
+
+              {/* Password */}
+              <Input
+                placeholder={t("login.password_placeholder")}
+                onChangeText={(text: string) =>
+                  setCredentials({ ...credentials, password: text })
+                }
+                value={credentials.password}
+                secureTextEntry
+                keyboardType='default'
+                returnKeyType='done'
+                autoCapitalize='none'
+                textContentType='password'
+                clearButtonMode='while-editing'
+                maxLength={500}
+                extraClassName='mb-4'
+              />
+
+              <View className='mt-4'>
+                <Button onPress={handleLogin}>{t("login.login_button")}</Button>
+              </View>
+              <View className='mt-3'>
+                <Button
+                  onPress={handleQuickConnect}
+                  className='bg-neutral-800 border border-neutral-700'
+                >
+                  {t("login.quick_connect")}
+                </Button>
+              </View>
+            </View>
+          </View>
+        ) : (
+          // ------------ Server connect view ------------
+          <View className='flex-1 items-center justify-center'>
+            <View className='w-[92%] max-w-[900px] -mt-2'>
+              <View className='items-center mb-1'>
+                <Image
+                  source={require("@/assets/images/icon-ios-plain.png")}
+                  style={{ width: 110, height: 110 }}
+                  contentFit='contain'
+                />
+              </View>
+
+              <Text className='text-white text-4xl font-bold text-center'>
+                Streamyfin
+              </Text>
+              <Text className='text-neutral-400 text-base text-left mt-2 mb-1'>
+                {t("server.enter_url_to_jellyfin_server")}
+              </Text>
+
+              {/* Full-width Input with clear focus ring */}
+              <Input
+                aria-label='Server URL'
+                placeholder={t("server.server_url_placeholder")}
+                onChangeText={setServerURL}
+                value={serverURL}
+                keyboardType='url'
+                returnKeyType='done'
+                autoCapitalize='none'
+                textContentType='URL'
+                maxLength={500}
+              />
+
+              {/* Full-width primary button */}
+              <View className='mt-4'>
+                <Button
+                  onPress={async () => {
+                    await handleConnect(serverURL);
+                  }}
+                >
+                  {t("server.connect_button")}
+                </Button>
+              </View>
+
+              {/* Lists stay full width but inside max width container */}
+              <View className='mt-2'>
+                <JellyfinServerDiscovery
+                  onServerSelect={async (server: any) => {
+                    setServerURL(server.address);
+                    if (server.serverName) setServerName(server.serverName);
+                    await handleConnect(server.address);
+                  }}
+                />
+                <PreviousServersList
+                  onServerSelect={async (s: any) => {
+                    await handleConnect(s.address);
+                  }}
+                />
+              </View>
+            </View>
+          </View>
+        )}
+      </KeyboardAvoidingView>
+    </SafeAreaView>
+  ) : (
+    // Mobile layout
    <SafeAreaView style={{ flex: 1, paddingBottom: 16 }}>
      <KeyboardAvoidingView
        behavior={Platform.OS === "ios" ? "padding" : "height"}
--- a/biome.json
+++ b/biome.json
@@ -1,14 +1,14 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
  "files": {
    "includes": [
      "**/*",
-      "!node_modules/**",
-      "!ios/**",
-      "!android/**",
-      "!Streamyfin.app/**",
-      "!utils/jellyseerr/**",
-      "!.expo/**"
+      "!node_modules",
+      "!ios",
+      "!android",
+      "!Streamyfin.app",
+      "!utils/jellyseerr",
+      "!.expo"
    ]
  },
  "linter": {
--- a/bun.lock
+++ b/bun.lock
@@ -5,7 +5,6 @@
      "name": "streamyfin",
      "dependencies": {
        "@bottom-tabs/react-navigation": "^0.9.2",
-        "@expo/config-plugins": "~10.1.1",
        "@expo/metro-runtime": "~5.0.4",
        "@expo/react-native-action-sheet": "^4.1.1",
        "@expo/vector-icons": "^14.1.0",
@@ -19,17 +18,16 @@
        "@shopify/flash-list": "^1.8.3",
        "@tanstack/react-query": "^5.66.0",
        "axios": "^1.7.9",
-        "expo": "^53.0.6",
+        "expo": "^53.0.22",
        "expo-application": "~6.1.4",
        "expo-asset": "~11.1.7",
-        "expo-background-fetch": "~13.1.5",
+        "expo-background-task": "~0.2.8",
        "expo-blur": "~14.1.4",
        "expo-brightness": "~13.1.4",
        "expo-build-properties": "~0.14.6",
        "expo-constants": "~17.1.5",
        "expo-dev-client": "^5.2.0",
        "expo-device": "~7.1.4",
-        "expo-doctor": "^1.13.5",
        "expo-font": "~13.3.1",
        "expo-haptics": "~14.1.4",
        "expo-image": "~2.4.0",
@@ -37,14 +35,14 @@
        "expo-linking": "~7.1.4",
        "expo-localization": "~16.1.5",
        "expo-notifications": "~0.31.2",
-        "expo-router": "~5.1.4",
+        "expo-router": "~5.1.5",
        "expo-screen-orientation": "~8.1.6",
        "expo-sensors": "~14.1.4",
        "expo-sharing": "~13.1.5",
        "expo-splash-screen": "~0.30.8",
        "expo-status-bar": "~2.2.3",
-        "expo-system-ui": "~5.0.7",
-        "expo-task-manager": "~13.1.5",
+        "expo-system-ui": "~5.0.11",
+        "expo-task-manager": "~13.1.6",
        "expo-web-browser": "~14.2.0",
        "i18next": "^25.0.0",
        "jotai": "^2.12.5",
@@ -67,7 +65,7 @@
        "react-native-ios-utilities": "5.1.8",
        "react-native-mmkv": "2.12.2",
        "react-native-pager-view": "^6.9.1",
-        "react-native-reanimated": "~3.16.7",
+        "react-native-reanimated": "~3.17.4",
        "react-native-reanimated-carousel": "4.0.2",
        "react-native-safe-area-context": "5.4.0",
        "react-native-screens": "~4.11.1",
@@ -82,11 +80,11 @@
        "tailwindcss": "3.3.2",
        "use-debounce": "^10.0.4",
        "zeego": "^3.0.6",
-        "zod": "^3.24.1",
+        "zod": "^4.1.3",
      },
      "devDependencies": {
        "@babel/core": "^7.20.0",
-        "@biomejs/biome": "^2.1.4",
+        "@biomejs/biome": "^2.2.2",
        "@react-native-community/cli": "^20.0.0",
        "@react-native-tvos/config-tv": "^0.1.1",
        "@types/jest": "^29.5.12",
@@ -94,6 +92,7 @@
        "@types/react": "~19.0.10",
        "@types/react-test-renderer": "^19.0.0",
        "cross-env": "^10.0.0",
+        "expo-doctor": "^1.17.0",
        "husky": "^9.1.7",
        "lint-staged": "^16.1.5",
        "postinstall-postinstall": "^2.1.0",
@@ -298,23 +297,23 @@

    "@babel/types": ["@babel/types@7.28.2", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1" } }, "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ=="],

-    "@biomejs/biome": ["@biomejs/biome@2.2.0", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.2.0", "@biomejs/cli-darwin-x64": "2.2.0", "@biomejs/cli-linux-arm64": "2.2.0", "@biomejs/cli-linux-arm64-musl": "2.2.0", "@biomejs/cli-linux-x64": "2.2.0", "@biomejs/cli-linux-x64-musl": "2.2.0", "@biomejs/cli-win32-arm64": "2.2.0", "@biomejs/cli-win32-x64": "2.2.0" }, "bin": { "biome": "bin/biome" } }, "sha512-3On3RSYLsX+n9KnoSgfoYlckYBoU6VRM22cw1gB4Y0OuUVSYd/O/2saOJMrA4HFfA1Ff0eacOvMN1yAAvHtzIw=="],
+    "@biomejs/biome": ["@biomejs/biome@2.2.2", "", { "optionalDependencies": { "@biomejs/cli-darwin-arm64": "2.2.2", "@biomejs/cli-darwin-x64": "2.2.2", "@biomejs/cli-linux-arm64": "2.2.2", "@biomejs/cli-linux-arm64-musl": "2.2.2", "@biomejs/cli-linux-x64": "2.2.2", "@biomejs/cli-linux-x64-musl": "2.2.2", "@biomejs/cli-win32-arm64": "2.2.2", "@biomejs/cli-win32-x64": "2.2.2" }, "bin": { "biome": "bin/biome" } }, "sha512-j1omAiQWCkhuLgwpMKisNKnsM6W8Xtt1l0WZmqY/dFj8QPNkIoTvk4tSsi40FaAAkBE1PU0AFG2RWFBWenAn+w=="],

-    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-zKbwUUh+9uFmWfS8IFxmVD6XwqFcENjZvEyfOxHs1epjdH3wyyMQG80FGDsmauPwS2r5kXdEM0v/+dTIA9FXAg=="],
+    "@biomejs/cli-darwin-arm64": ["@biomejs/cli-darwin-arm64@2.2.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-6ePfbCeCPryWu0CXlzsWNZgVz/kBEvHiPyNpmViSt6A2eoDf4kXs3YnwQPzGjy8oBgQulrHcLnJL0nkCh80mlQ=="],

-    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.2.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-+OmT4dsX2eTfhD5crUOPw3RPhaR+SKVspvGVmSdZ9y9O/AgL8pla6T4hOn1q+VAFBHuHhsdxDRJgFCSC7RaMOw=="],
+    "@biomejs/cli-darwin-x64": ["@biomejs/cli-darwin-x64@2.2.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-Tn4JmVO+rXsbRslml7FvKaNrlgUeJot++FkvYIhl1OkslVCofAtS35MPlBMhXgKWF9RNr9cwHanrPTUUXcYGag=="],

-    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-6eoRdF2yW5FnW9Lpeivh7Mayhq0KDdaDMYOJnH9aT02KuSIX5V1HmWJCQQPwIQbhDh68Zrcpl8inRlTEan0SXw=="],
+    "@biomejs/cli-linux-arm64": ["@biomejs/cli-linux-arm64@2.2.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-JfrK3gdmWWTh2J5tq/rcWCOsImVyzUnOS2fkjhiYKCQ+v8PqM+du5cfB7G1kXas+7KQeKSWALv18iQqdtIMvzw=="],

-    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-egKpOa+4FL9YO+SMUMLUvf543cprjevNc3CAgDNFLcjknuNMcZ0GLJYa3EGTCR2xIkIUJDVneBV3O9OcIlCEZQ=="],
+    "@biomejs/cli-linux-arm64-musl": ["@biomejs/cli-linux-arm64-musl@2.2.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-/MhYg+Bd6renn6i1ylGFL5snYUn/Ct7zoGVKhxnro3bwekiZYE8Kl39BSb0MeuqM+72sThkQv4TnNubU9njQRw=="],

-    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-5UmQx/OZAfJfi25zAnAGHUMuOd+LOsliIt119x2soA2gLggQYrVPA+2kMUxR6Mw5M1deUF/AWWP2qpxgH7Nyfw=="],
+    "@biomejs/cli-linux-x64": ["@biomejs/cli-linux-x64@2.2.2", "", { "os": "linux", "cpu": "x64" }, "sha512-Ogb+77edO5LEP/xbNicACOWVLt8mgC+E1wmpUakr+O4nKwLt9vXe74YNuT3T1dUBxC/SnrVmlzZFC7kQJEfquQ=="],

-    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-I5J85yWwUWpgJyC1CcytNSGusu2p9HjDnOPAFG4Y515hwRD0jpR9sT9/T1cKHtuCvEQ/sBvx+6zhz9l9wEJGAg=="],
+    "@biomejs/cli-linux-x64-musl": ["@biomejs/cli-linux-x64-musl@2.2.2", "", { "os": "linux", "cpu": "x64" }, "sha512-ZCLXcZvjZKSiRY/cFANKg+z6Fhsf9MHOzj+NrDQcM+LbqYRT97LyCLWy2AS+W2vP+i89RyRM+kbGpUzbRTYWig=="],

-    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.2.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-n9a1/f2CwIDmNMNkFs+JI0ZjFnMO0jdOyGNtihgUNFnlmd84yIYY2KMTBmMV58ZlVHjgmY5Y6E1hVTnSRieggA=="],
+    "@biomejs/cli-win32-arm64": ["@biomejs/cli-win32-arm64@2.2.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-wBe2wItayw1zvtXysmHJQoQqXlTzHSpQRyPpJKiNIR21HzH/CrZRDFic1C1jDdp+zAPtqhNExa0owKMbNwW9cQ=="],

-    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.2.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Nawu5nHjP/zPKTIryh2AavzTc/KEg4um/MxWdXW0A6P/RZOyIpa7+QSjeXwAwX/utJGaCoXRPWtF3m5U/bB3Ww=="],
+    "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.2.2", "", { "os": "win32", "cpu": "x64" }, "sha512-DAuHhHekGfiGb6lCcsT4UyxQmVwQiBCBUMwVra/dcOSs9q8OhfaZgey51MlekT3p8UwRqtXQfFuEJBhJNdLZwg=="],

    "@bottom-tabs/react-navigation": ["@bottom-tabs/react-navigation@0.9.2", "", { "dependencies": { "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": ">=7", "react": "*", "react-native": "*", "react-native-bottom-tabs": "*" } }, "sha512-IZZKllcaqCGsKIgeXmYFGU95IXxbBpXtwKws4Lg2GJw/qqAYYsPFEl0JBvnymSD7G1zkHYEilg5UHuTd0NmX7A=="],

@@ -324,7 +323,7 @@

    "@epic-web/invariant": ["@epic-web/invariant@1.0.0", "", {}, "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA=="],

-    "@expo/cli": ["@expo/cli@0.24.20", "", { "dependencies": { "@0no-co/graphql.web": "^1.0.8", "@babel/runtime": "^7.20.0", "@expo/code-signing-certificates": "^0.0.5", "@expo/config": "~11.0.13", "@expo/config-plugins": "~10.1.2", "@expo/devcert": "^1.1.2", "@expo/env": "~1.0.7", "@expo/image-utils": "^0.7.6", "@expo/json-file": "^9.1.5", "@expo/metro-config": "~0.20.17", "@expo/osascript": "^2.2.5", "@expo/package-manager": "^1.8.6", "@expo/plist": "^0.3.5", "@expo/prebuild-config": "^9.0.11", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.3.0", "@react-native/dev-middleware": "0.79.5", "@urql/core": "^5.0.6", "@urql/exchange-retry": "^1.3.0", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "env-editor": "^0.4.1", "freeport-async": "^2.0.0", "getenv": "^2.0.0", "glob": "^10.4.2", "lan-network": "^0.1.6", "minimatch": "^9.0.0", "node-forge": "^1.3.1", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^3.0.1", "pretty-bytes": "^5.6.0", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "qrcode-terminal": "0.11.0", "require-from-string": "^2.0.2", "requireg": "^0.2.2", "resolve": "^1.22.2", "resolve-from": "^5.0.0", "resolve.exports": "^2.0.3", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "tar": "^7.4.3", "terminal-link": "^2.1.1", "undici": "^6.18.2", "wrap-ansi": "^7.0.0", "ws": "^8.12.1" }, "bin": { "expo-internal": "build/bin/cli" } }, "sha512-uF1pOVcd+xizNtVTuZqNGzy7I6IJon5YMmQidsURds1Ww96AFDxrR/NEACqeATNAmY60m8wy1VZZpSg5zLNkpw=="],
+    "@expo/cli": ["@expo/cli@0.24.21", "", { "dependencies": { "@0no-co/graphql.web": "^1.0.8", "@babel/runtime": "^7.20.0", "@expo/code-signing-certificates": "^0.0.5", "@expo/config": "~11.0.13", "@expo/config-plugins": "~10.1.2", "@expo/devcert": "^1.1.2", "@expo/env": "~1.0.7", "@expo/image-utils": "^0.7.6", "@expo/json-file": "^9.1.5", "@expo/metro-config": "~0.20.17", "@expo/osascript": "^2.2.5", "@expo/package-manager": "^1.8.6", "@expo/plist": "^0.3.5", "@expo/prebuild-config": "^9.0.11", "@expo/schema-utils": "^0.1.0", "@expo/spawn-async": "^1.7.2", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.3.0", "@react-native/dev-middleware": "0.79.6", "@urql/core": "^5.0.6", "@urql/exchange-retry": "^1.3.0", "accepts": "^1.3.8", "arg": "^5.0.2", "better-opn": "~3.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "env-editor": "^0.4.1", "freeport-async": "^2.0.0", "getenv": "^2.0.0", "glob": "^10.4.2", "lan-network": "^0.1.6", "minimatch": "^9.0.0", "node-forge": "^1.3.1", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^3.0.1", "pretty-bytes": "^5.6.0", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "qrcode-terminal": "0.11.0", "require-from-string": "^2.0.2", "requireg": "^0.2.2", "resolve": "^1.22.2", "resolve-from": "^5.0.0", "resolve.exports": "^2.0.3", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "source-map-support": "~0.5.21", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "tar": "^7.4.3", "terminal-link": "^2.1.1", "undici": "^6.18.2", "wrap-ansi": "^7.0.0", "ws": "^8.12.1" }, "bin": { "expo-internal": "build/bin/cli" } }, "sha512-DT6K9vgFHqqWL/19mU1ofRcPoO1pn4qmgi76GtuiNU4tbBe/02mRHwFsQw7qRfFAT28If5e/wiwVozgSuZVL8g=="],

    "@expo/code-signing-certificates": ["@expo/code-signing-certificates@0.0.5", "", { "dependencies": { "node-forge": "^1.2.1", "nullthrows": "^1.1.1" } }, "sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="],

@@ -358,6 +357,8 @@

    "@expo/react-native-action-sheet": ["@expo/react-native-action-sheet@4.1.1", "", { "dependencies": { "@types/hoist-non-react-statics": "^3.3.1", "hoist-non-react-statics": "^3.3.0" }, "peerDependencies": { "react": ">=18.0.0" } }, "sha512-4KRaba2vhqDRR7ObBj6nrD5uJw8ePoNHdIOMETTpgGTX7StUbrF4j/sfrP1YUyaPEa1P8FXdwG6pB+2WtrJd1A=="],

+    "@expo/schema-utils": ["@expo/schema-utils@0.1.0", "", {}, "sha512-Me2avOfbcVT/O5iRmPKLCCSvbCfVfxIstGMlzVJOffplaZX1+ut8D18siR1wx5fkLMTWKs14ozEz11cGUY7hcw=="],
+
    "@expo/sdk-runtime-versions": ["@expo/sdk-runtime-versions@1.0.0", "", {}, "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="],

    "@expo/server": ["@expo/server@0.6.3", "", { "dependencies": { "abort-controller": "^3.0.0", "debug": "^4.3.4", "source-map-support": "~0.5.21", "undici": "^6.18.2 || ^7.0.0" } }, "sha512-Ea7NJn9Xk1fe4YeJ86rObHSv/bm3u/6WiQPXEqXJ2GrfYpVab2Swoh9/PnSM3KjR64JAgKjArDn1HiPjITCfHA=="],
@@ -544,23 +545,23 @@

    "@react-native/assets-registry": ["@react-native/assets-registry@0.79.5", "", {}, "sha512-N4Kt1cKxO5zgM/BLiyzuuDNquZPiIgfktEQ6TqJ/4nKA8zr4e8KJgU6Tb2eleihDO4E24HmkvGc73naybKRz/w=="],

-    "@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.79.5", "", { "dependencies": { "@babel/traverse": "^7.25.3", "@react-native/codegen": "0.79.5" } }, "sha512-Rt/imdfqXihD/sn0xnV4flxxb1aLLjPtMF1QleQjEhJsTUPpH4TFlfOpoCvsrXoDl4OIcB1k4FVM24Ez92zf5w=="],
+    "@react-native/babel-plugin-codegen": ["@react-native/babel-plugin-codegen@0.79.6", "", { "dependencies": { "@babel/traverse": "^7.25.3", "@react-native/codegen": "0.79.6" } }, "sha512-CS5OrgcMPixOyUJ/Sk/HSsKsKgyKT5P7y3CojimOQzWqRZBmoQfxdST4ugj7n1H+ebM2IKqbgovApFbqXsoX0g=="],

-    "@react-native/babel-preset": ["@react-native/babel-preset@0.79.5", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.24.7", "@babel/plugin-transform-async-generator-functions": "^7.25.4", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/plugin-transform-classes": "^7.25.4", "@babel/plugin-transform-computed-properties": "^7.24.7", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-for-of": "^7.24.7", "@babel/plugin-transform-function-name": "^7.25.1", "@babel/plugin-transform-literals": "^7.25.2", "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", "@babel/plugin-transform-numeric-separator": "^7.24.7", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-optional-catch-binding": "^7.24.7", "@babel/plugin-transform-optional-chaining": "^7.24.8", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-react-display-name": "^7.24.7", "@babel/plugin-transform-react-jsx": "^7.25.2", "@babel/plugin-transform-react-jsx-self": "^7.24.7", "@babel/plugin-transform-react-jsx-source": "^7.24.7", "@babel/plugin-transform-regenerator": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/plugin-transform-shorthand-properties": "^7.24.7", "@babel/plugin-transform-spread": "^7.24.7", "@babel/plugin-transform-sticky-regex": "^7.24.7", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/plugin-transform-unicode-regex": "^7.24.7", "@babel/template": "^7.25.0", "@react-native/babel-plugin-codegen": "0.79.5", "babel-plugin-syntax-hermes-parser": "0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "react-refresh": "^0.14.0" } }, "sha512-GDUYIWslMLbdJHEgKNfrOzXk8EDKxKzbwmBXUugoiSlr6TyepVZsj3GZDLEFarOcTwH1EXXHJsixihk8DCRQDA=="],
+    "@react-native/babel-preset": ["@react-native/babel-preset@0.79.6", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-transform-arrow-functions": "^7.24.7", "@babel/plugin-transform-async-generator-functions": "^7.25.4", "@babel/plugin-transform-async-to-generator": "^7.24.7", "@babel/plugin-transform-block-scoping": "^7.25.0", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/plugin-transform-classes": "^7.25.4", "@babel/plugin-transform-computed-properties": "^7.24.7", "@babel/plugin-transform-destructuring": "^7.24.8", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-for-of": "^7.24.7", "@babel/plugin-transform-function-name": "^7.25.1", "@babel/plugin-transform-literals": "^7.25.2", "@babel/plugin-transform-logical-assignment-operators": "^7.24.7", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7", "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7", "@babel/plugin-transform-numeric-separator": "^7.24.7", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-optional-catch-binding": "^7.24.7", "@babel/plugin-transform-optional-chaining": "^7.24.8", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-react-display-name": "^7.24.7", "@babel/plugin-transform-react-jsx": "^7.25.2", "@babel/plugin-transform-react-jsx-self": "^7.24.7", "@babel/plugin-transform-react-jsx-source": "^7.24.7", "@babel/plugin-transform-regenerator": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/plugin-transform-shorthand-properties": "^7.24.7", "@babel/plugin-transform-spread": "^7.24.7", "@babel/plugin-transform-sticky-regex": "^7.24.7", "@babel/plugin-transform-typescript": "^7.25.2", "@babel/plugin-transform-unicode-regex": "^7.24.7", "@babel/template": "^7.25.0", "@react-native/babel-plugin-codegen": "0.79.6", "babel-plugin-syntax-hermes-parser": "0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "react-refresh": "^0.14.0" } }, "sha512-H+FRO+r2Ql6b5IwfE0E7D52JhkxjeGSBSUpCXAI5zQ60zSBJ54Hwh2bBJOohXWl4J+C7gKYSAd2JHMUETu+c/A=="],

    "@react-native/codegen": ["@react-native/codegen@0.79.5", "", { "dependencies": { "glob": "^7.1.1", "hermes-parser": "0.25.1", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "yargs": "^17.6.2" }, "peerDependencies": { "@babel/core": "*" } }, "sha512-FO5U1R525A1IFpJjy+KVznEinAgcs3u7IbnbRJUG9IH/MBXi2lEU2LtN+JarJ81MCfW4V2p0pg6t/3RGHFRrlQ=="],

    "@react-native/community-cli-plugin": ["@react-native/community-cli-plugin@0.79.5", "", { "dependencies": { "@react-native/dev-middleware": "0.79.5", "chalk": "^4.0.0", "debug": "^2.2.0", "invariant": "^2.2.4", "metro": "^0.82.0", "metro-config": "^0.82.0", "metro-core": "^0.82.0", "semver": "^7.1.3" }, "peerDependencies": { "@react-native-community/cli": "*" }, "optionalPeers": ["@react-native-community/cli"] }, "sha512-ApLO1ARS8JnQglqS3JAHk0jrvB+zNW3dvNJyXPZPoygBpZVbf8sjvqeBiaEYpn8ETbFWddebC4HoQelDndnrrA=="],

-    "@react-native/debugger-frontend": ["@react-native/debugger-frontend@0.79.5", "", {}, "sha512-WQ49TRpCwhgUYo5/n+6GGykXmnumpOkl4Lr2l2o2buWU9qPOwoiBqJAtmWEXsAug4ciw3eLiVfthn5ufs0VB0A=="],
+    "@react-native/debugger-frontend": ["@react-native/debugger-frontend@0.79.6", "", {}, "sha512-lIK/KkaH7ueM22bLO0YNaQwZbT/oeqhaghOvmZacaNVbJR1Cdh/XAqjT8FgCS+7PUnbxA8B55NYNKGZG3O2pYw=="],

-    "@react-native/dev-middleware": ["@react-native/dev-middleware@0.79.5", "", { "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.79.5", "chrome-launcher": "^0.15.2", "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "open": "^7.0.3", "serve-static": "^1.16.2", "ws": "^6.2.3" } }, "sha512-U7r9M/SEktOCP/0uS6jXMHmYjj4ESfYCkNAenBjFjjsRWekiHE+U/vRMeO+fG9gq4UCcBAUISClkQCowlftYBw=="],
+    "@react-native/dev-middleware": ["@react-native/dev-middleware@0.79.6", "", { "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.79.6", "chrome-launcher": "^0.15.2", "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "open": "^7.0.3", "serve-static": "^1.16.2", "ws": "^6.2.3" } }, "sha512-BK3GZBa9c7XSNR27EDRtxrgyyA3/mf1j3/y+mPk7Ac0Myu85YNrXnC9g3mL5Ytwo0g58TKrAIgs1fF2Q5Mn6mQ=="],

    "@react-native/gradle-plugin": ["@react-native/gradle-plugin@0.79.5", "", {}, "sha512-K3QhfFNKiWKF3HsCZCEoWwJPSMcPJQaeqOmzFP4RL8L3nkpgUwn74PfSCcKHxooVpS6bMvJFQOz7ggUZtNVT+A=="],

    "@react-native/js-polyfills": ["@react-native/js-polyfills@0.79.5", "", {}, "sha512-a2wsFlIhvd9ZqCD5KPRsbCQmbZi6KxhRN++jrqG0FUTEV5vY7MvjjUqDILwJd2ZBZsf7uiDuClCcKqA+EEdbvw=="],

-    "@react-native/normalize-colors": ["@react-native/normalize-colors@0.79.5", "", {}, "sha512-nGXMNMclZgzLUxijQQ38Dm3IAEhgxuySAWQHnljFtfB0JdaMwpe0Ox9H7Tp2OgrEA+EMEv+Od9ElKlHwGKmmvQ=="],
+    "@react-native/normalize-colors": ["@react-native/normalize-colors@0.79.6", "", {}, "sha512-0v2/ruY7eeKun4BeKu+GcfO+SHBdl0LJn4ZFzTzjHdWES0Cn+ONqKljYaIv8p9MV2Hx/kcdEvbY4lWI34jC/mQ=="],

    "@react-navigation/bottom-tabs": ["@react-navigation/bottom-tabs@7.4.6", "", { "dependencies": { "@react-navigation/elements": "^2.6.3", "color": "^4.2.3" }, "peerDependencies": { "@react-navigation/native": "^7.1.17", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0", "react-native-screens": ">= 4.0.0" } }, "sha512-f4khxwcL70O5aKfZFbxyBo5RnzPFnBNSXmrrT7q9CRmvN4mHov9KFKGQ3H4xD5sLonsTBtyjvyvPfyEC4G7f+g=="],

@@ -618,8 +619,6 @@

    "@types/jest": ["@types/jest@29.5.14", "", { "dependencies": { "expect": "^29.0.0", "pretty-format": "^29.0.0" } }, "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ=="],

-    "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
-
    "@types/lodash": ["@types/lodash@4.17.20", "", {}, "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA=="],

    "@types/node": ["@types/node@24.2.1", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ=="],
@@ -674,10 +673,6 @@

    "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],

-    "ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="],
-
-    "ajv-keywords": ["ajv-keywords@5.1.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "ajv": "^8.8.2" } }, "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="],
-
    "anser": ["anser@1.4.10", "", {}, "sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww=="],

    "ansi-escapes": ["ansi-escapes@7.0.0", "", { "dependencies": { "environment": "^1.0.0" } }, "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw=="],
@@ -736,7 +731,7 @@

    "babel-preset-current-node-syntax": ["babel-preset-current-node-syntax@1.2.0", "", { "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-import-attributes": "^7.24.7", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0 || ^8.0.0-0" } }, "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg=="],

-    "babel-preset-expo": ["babel-preset-expo@13.2.3", "", { "dependencies": { "@babel/helper-module-imports": "^7.25.9", "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-transform-export-namespace-from": "^7.25.9", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.79.5", "babel-plugin-react-native-web": "~0.19.13", "babel-plugin-syntax-hermes-parser": "^0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "debug": "^4.3.4", "react-refresh": "^0.14.2", "resolve-from": "^5.0.0" }, "peerDependencies": { "babel-plugin-react-compiler": "^19.0.0-beta-e993439-20250405" }, "optionalPeers": ["babel-plugin-react-compiler"] }, "sha512-wQJn92lqj8GKR7Ojg/aW4+GkqI6ZdDNTDyOqhhl7A9bAqk6t0ukUOWLDXQb4p0qKJjMDV1F6gNWasI2KUbuVTQ=="],
+    "babel-preset-expo": ["babel-preset-expo@13.2.4", "", { "dependencies": { "@babel/helper-module-imports": "^7.25.9", "@babel/plugin-proposal-decorators": "^7.12.9", "@babel/plugin-proposal-export-default-from": "^7.24.7", "@babel/plugin-syntax-export-default-from": "^7.24.7", "@babel/plugin-transform-export-namespace-from": "^7.25.9", "@babel/plugin-transform-flow-strip-types": "^7.25.2", "@babel/plugin-transform-modules-commonjs": "^7.24.8", "@babel/plugin-transform-object-rest-spread": "^7.24.7", "@babel/plugin-transform-parameters": "^7.24.7", "@babel/plugin-transform-private-methods": "^7.24.7", "@babel/plugin-transform-private-property-in-object": "^7.24.7", "@babel/plugin-transform-runtime": "^7.24.7", "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.0", "@react-native/babel-preset": "0.79.6", "babel-plugin-react-native-web": "~0.19.13", "babel-plugin-syntax-hermes-parser": "^0.25.1", "babel-plugin-transform-flow-enums": "^0.0.2", "debug": "^4.3.4", "react-refresh": "^0.14.2", "resolve-from": "^5.0.0" }, "peerDependencies": { "babel-plugin-react-compiler": "^19.0.0-beta-e993439-20250405" }, "optionalPeers": ["babel-plugin-react-compiler"] }, "sha512-3IKORo3KR+4qtLdCkZNDj8KeA43oBn7RRQejFGWfiZgu/NeaRUSri8YwYjZqybm7hn3nmMv9OLahlvXBX23o5Q=="],

    "babel-preset-jest": ["babel-preset-jest@29.6.3", "", { "dependencies": { "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA=="],

@@ -988,13 +983,13 @@

    "expect": ["expect@29.7.0", "", { "dependencies": { "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", "jest-matcher-utils": "^29.7.0", "jest-message-util": "^29.7.0", "jest-util": "^29.7.0" } }, "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw=="],

-    "expo": ["expo@53.0.20", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "0.24.20", "@expo/config": "~11.0.13", "@expo/config-plugins": "~10.1.2", "@expo/fingerprint": "0.13.4", "@expo/metro-config": "0.20.17", "@expo/vector-icons": "^14.0.0", "babel-preset-expo": "~13.2.3", "expo-asset": "~11.1.7", "expo-constants": "~17.1.7", "expo-file-system": "~18.1.11", "expo-font": "~13.3.2", "expo-keep-awake": "~14.1.4", "expo-modules-autolinking": "2.1.14", "expo-modules-core": "2.5.0", "react-native-edge-to-edge": "1.6.0", "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli", "fingerprint": "bin/fingerprint", "expo-modules-autolinking": "bin/autolinking" } }, "sha512-Nh+HIywVy9KxT/LtH08QcXqrxtUOA9BZhsXn3KCsAYA+kNb80M8VKN8/jfQF+I6CgeKyFKJoPNsWgI0y0VBGrA=="],
+    "expo": ["expo@53.0.22", "", { "dependencies": { "@babel/runtime": "^7.20.0", "@expo/cli": "0.24.21", "@expo/config": "~11.0.13", "@expo/config-plugins": "~10.1.2", "@expo/fingerprint": "0.13.4", "@expo/metro-config": "0.20.17", "@expo/vector-icons": "^14.0.0", "babel-preset-expo": "~13.2.4", "expo-asset": "~11.1.7", "expo-constants": "~17.1.7", "expo-file-system": "~18.1.11", "expo-font": "~13.3.2", "expo-keep-awake": "~14.1.4", "expo-modules-autolinking": "2.1.14", "expo-modules-core": "2.5.0", "react-native-edge-to-edge": "1.6.0", "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "@expo/dom-webview": "*", "@expo/metro-runtime": "*", "react": "*", "react-native": "*", "react-native-webview": "*" }, "optionalPeers": ["@expo/dom-webview", "@expo/metro-runtime", "react-native-webview"], "bin": { "expo": "bin/cli", "fingerprint": "bin/fingerprint", "expo-modules-autolinking": "bin/autolinking" } }, "sha512-sJ2I4W/e5iiM4u/wYCe3qmW4D7WPCRqByPDD0hJcdYNdjc9HFFFdO4OAudZVyC/MmtoWZEIH5kTJP1cw9FjzYA=="],

    "expo-application": ["expo-application@6.1.5", "", { "peerDependencies": { "expo": "*" } }, "sha512-ToImFmzw8luY043pWFJhh2ZMm4IwxXoHXxNoGdlhD4Ym6+CCmkAvCglg0FK8dMLzAb+/XabmOE7Rbm8KZb6NZg=="],

    "expo-asset": ["expo-asset@11.1.7", "", { "dependencies": { "@expo/image-utils": "^0.7.6", "expo-constants": "~17.1.7" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-b5P8GpjUh08fRCf6m5XPVAh7ra42cQrHBIMgH2UXP+xsj4Wufl6pLy6jRF5w6U7DranUMbsXm8TOyq4EHy7ADg=="],

-    "expo-background-fetch": ["expo-background-fetch@13.1.6", "", { "dependencies": { "expo-task-manager": "~13.1.6" }, "peerDependencies": { "expo": "*" } }, "sha512-hl4kR32DaxoHFYqNsILLZG2mWssCkUb4wnEAHtDGmpxUP4SCnJILcAn99J6AGDFUw5lF6FXNZZCXNfcrFioO4Q=="],
+    "expo-background-task": ["expo-background-task@0.2.8", "", { "dependencies": { "expo-task-manager": "~13.1.6" }, "peerDependencies": { "expo": "*" } }, "sha512-dePyskpmyDZeOtbr9vWFh+Nrse0TvF6YitJqnKcd+3P7pDMiDr1V2aT6zHdNOc5iV9vPaDJoH/zdmlarp1uHMQ=="],

    "expo-blur": ["expo-blur@14.1.5", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-CCLJHxN4eoAl06ESKT3CbMasJ98WsjF9ZQEJnuxtDb9ffrYbZ+g9ru84fukjNUOTtc8A8yXE5z8NgY1l0OMrmQ=="],

@@ -1014,7 +1009,7 @@

    "expo-device": ["expo-device@7.1.4", "", { "dependencies": { "ua-parser-js": "^0.7.33" }, "peerDependencies": { "expo": "*" } }, "sha512-HS04IiE1Fy0FRjBLurr9e5A6yj3kbmQB+2jCZvbSGpsjBnCLdSk/LCii4f5VFhPIBWJLyYuN5QqJyEAw6BcS4Q=="],

-    "expo-doctor": ["expo-doctor@1.13.5", "", { "bin": { "expo-doctor": "build/index.js" } }, "sha512-Kp9c0+qiQ636ZuKyU+TwSe0oO9kdK1Q+xCD6VBM1zPSv8Grqa5yg1F2EkGvqQeDJYUXUZvPUqVhRBz9sLyvQOg=="],
+    "expo-doctor": ["expo-doctor@1.17.0", "", { "bin": { "expo-doctor": "build/index.js" } }, "sha512-t+cweyCKbDE+ORgNh8CCybRXFwae/uJKfPetirDUF+PjaZvc6PPVF8gwBD+nFQ1dLURjxD4IaVNwC94Iyg6q0A=="],

    "expo-file-system": ["expo-file-system@18.1.11", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-HJw/m0nVOKeqeRjPjGdvm+zBi5/NxcdPf8M8P3G2JFvH5Z8vBWqVDic2O58jnT1OFEy0XXzoH9UqFu7cHg9DTQ=="],

@@ -1042,7 +1037,7 @@

    "expo-notifications": ["expo-notifications@0.31.4", "", { "dependencies": { "@expo/image-utils": "^0.7.6", "@ide/backoff": "^1.0.0", "abort-controller": "^3.0.0", "assert": "^2.0.0", "badgin": "^1.1.5", "expo-application": "~6.1.5", "expo-constants": "~17.1.7" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-NnGKIFGpgZU66qfiFUyjEBYsS77VahURpSSeWEOLt+P1zOaUFlgx2XqS+dxH3/Bn1Vm7TMj04qKsK5KvzR/8Lw=="],

-    "expo-router": ["expo-router@5.1.4", "", { "dependencies": { "@expo/metro-runtime": "5.0.4", "@expo/server": "^0.6.3", "@radix-ui/react-slot": "1.2.0", "@react-navigation/bottom-tabs": "^7.3.10", "@react-navigation/native": "^7.1.6", "@react-navigation/native-stack": "^7.3.10", "client-only": "^0.0.1", "invariant": "^2.2.4", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.1.6", "schema-utils": "^4.0.1", "semver": "~7.6.3", "server-only": "^0.0.1", "shallowequal": "^1.1.0" }, "peerDependencies": { "@react-navigation/drawer": "^7.3.9", "expo": "*", "expo-constants": "*", "expo-linking": "*", "react-native-reanimated": "*", "react-native-safe-area-context": "*", "react-native-screens": "*" }, "optionalPeers": ["@react-navigation/drawer", "react-native-reanimated"] }, "sha512-8GulCelVN9x+VSOio74K1ZYTG6VyCdJw417gV+M/J8xJOZZTA7rFxAdzujBZZ7jd6aIAG7WEwOUU3oSvUO76Vw=="],
+    "expo-router": ["expo-router@5.1.5", "", { "dependencies": { "@expo/metro-runtime": "5.0.4", "@expo/schema-utils": "^0.1.0", "@expo/server": "^0.6.3", "@radix-ui/react-slot": "1.2.0", "@react-navigation/bottom-tabs": "^7.3.10", "@react-navigation/native": "^7.1.6", "@react-navigation/native-stack": "^7.3.10", "client-only": "^0.0.1", "invariant": "^2.2.4", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.1.6", "semver": "~7.6.3", "server-only": "^0.0.1", "shallowequal": "^1.1.0" }, "peerDependencies": { "@react-navigation/drawer": "^7.3.9", "expo": "*", "expo-constants": "*", "expo-linking": "*", "react-native-reanimated": "*", "react-native-safe-area-context": "*", "react-native-screens": "*" }, "optionalPeers": ["@react-navigation/drawer", "react-native-reanimated"] }, "sha512-VPhS21DPP+riJIUshs/qpb11L/nzmRK7N7mqSFCr/mjpziznYu/qS+BPeQ88akIuXv6QsXipY5UTfYINdV+P0Q=="],

    "expo-screen-orientation": ["expo-screen-orientation@8.1.7", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-nYwadYtdU6mMDk0MCHMPPPQtBoeFYJ2FspLRW+J35CMLqzE4nbpwGeiImfXzkvD94fpOCfI4KgLj5vGauC3pfA=="],

@@ -1054,7 +1049,7 @@

    "expo-status-bar": ["expo-status-bar@2.2.3", "", { "dependencies": { "react-native-edge-to-edge": "1.6.0", "react-native-is-edge-to-edge": "^1.1.6" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-+c8R3AESBoduunxTJ8353SqKAKpxL6DvcD8VKBuh81zzJyUUbfB4CVjr1GufSJEKsMzNPXZU+HJwXx7Xh7lx8Q=="],

-    "expo-system-ui": ["expo-system-ui@5.0.10", "", { "dependencies": { "@react-native/normalize-colors": "0.79.5", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-BTXbSyJr80yuN6VO4XQKZj7BjesZQLHgOYZ0bWyf4VB19GFZq7ZnZOEc/eoKk1B3eIocOMKUfNCrg/Wn8Kfcuw=="],
+    "expo-system-ui": ["expo-system-ui@5.0.11", "", { "dependencies": { "@react-native/normalize-colors": "0.79.6", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-PG5VdaG5cwBe1Rj02mJdnsihKl9Iw/w/a6+qh2mH3f2K/IvQ+Hf7aG2kavSADtkGNCNj7CEIg7Rn4DQz/SE5rQ=="],

    "expo-task-manager": ["expo-task-manager@13.1.6", "", { "dependencies": { "unimodules-app-loader": "~5.1.3" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-sYNAftpIeZ+j6ur17Jo0OpSTk9ks/MDvTbrNCimXMyjIt69XXYL/kAPYf76bWuxOuN8bcJ8Ef8YvihkwFG9hDA=="],

@@ -1138,7 +1133,7 @@

    "gifwrap": ["gifwrap@0.10.1", "", { "dependencies": { "image-q": "^4.0.0", "omggif": "^1.0.10" } }, "sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw=="],

-    "glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+    "glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],

    "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="],

@@ -1642,7 +1637,7 @@

    "react-native-pager-view": ["react-native-pager-view@6.9.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-uUT0MMMbNtoSbxe9pRvdJJKEi9snjuJ3fXlZhG8F2vVMOBJVt/AFtqMPUHu9yMflmqOr08PewKzj9EPl/Yj+Gw=="],

-    "react-native-reanimated": ["react-native-reanimated@3.16.7", "", { "dependencies": { "@babel/plugin-transform-arrow-functions": "^7.0.0-0", "@babel/plugin-transform-class-properties": "^7.0.0-0", "@babel/plugin-transform-classes": "^7.0.0-0", "@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0", "@babel/plugin-transform-optional-chaining": "^7.0.0-0", "@babel/plugin-transform-shorthand-properties": "^7.0.0-0", "@babel/plugin-transform-template-literals": "^7.0.0-0", "@babel/plugin-transform-unicode-regex": "^7.0.0-0", "@babel/preset-typescript": "^7.16.7", "convert-source-map": "^2.0.0", "invariant": "^2.2.4" }, "peerDependencies": { "@babel/core": "^7.0.0-0", "react": "*", "react-native": "*" } }, "sha512-qoUUQOwE1pHlmQ9cXTJ2MX9FQ9eHllopCLiWOkDkp6CER95ZWeXhJCP4cSm6AD4jigL5jHcZf/SkWrg8ttZUsw=="],
+    "react-native-reanimated": ["react-native-reanimated@3.17.5", "", { "dependencies": { "@babel/plugin-transform-arrow-functions": "^7.0.0-0", "@babel/plugin-transform-class-properties": "^7.0.0-0", "@babel/plugin-transform-classes": "^7.0.0-0", "@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0", "@babel/plugin-transform-optional-chaining": "^7.0.0-0", "@babel/plugin-transform-shorthand-properties": "^7.0.0-0", "@babel/plugin-transform-template-literals": "^7.0.0-0", "@babel/plugin-transform-unicode-regex": "^7.0.0-0", "@babel/preset-typescript": "^7.16.7", "convert-source-map": "^2.0.0", "invariant": "^2.2.4", "react-native-is-edge-to-edge": "1.1.7" }, "peerDependencies": { "@babel/core": "^7.0.0-0", "react": "*", "react-native": "*" } }, "sha512-SxBK7wQfJ4UoWoJqQnmIC7ZjuNgVb9rcY5Xc67upXAFKftWg0rnkknTw6vgwnjRcvYThrjzUVti66XoZdDJGtw=="],

    "react-native-reanimated-carousel": ["react-native-reanimated-carousel@4.0.2", "", { "peerDependencies": { "react": ">=18.0.0", "react-native": ">=0.70.3", "react-native-gesture-handler": ">=2.9.0", "react-native-reanimated": ">=3.0.0" } }, "sha512-vNpCfPlFoOVKHd+oB7B0luoJswp+nyz0NdJD8+LCrf25JiNQXfM22RSJhLaksBHqk3fm8R4fKWPNcfy5w7wL1Q=="],

@@ -1736,8 +1731,6 @@

    "scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="],

-    "schema-utils": ["schema-utils@4.3.2", "", { "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", "ajv-formats": "^2.1.1", "ajv-keywords": "^5.1.0" } }, "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ=="],
-
    "semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],

    "send": ["send@0.19.1", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "2.4.1", "range-parser": "~1.2.1", "statuses": "2.0.1" } }, "sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg=="],
@@ -1998,7 +1991,7 @@

    "zeego": ["zeego@3.0.6", "", { "dependencies": { "@radix-ui/react-context-menu": "^2.0.1", "@radix-ui/react-dropdown-menu": "^2.0.1", "sf-symbols-typescript": "^2.0.0" }, "peerDependencies": { "@react-native-menu/menu": "1.2.2", "react": "*", "react-native": "*", "react-native-ios-context-menu": "3.1.0", "react-native-ios-utilities": "5.1.2" } }, "sha512-vg0GCMPYg6or/J91bwRnUpIYwz7QnhkyeKOdd3FjvICg+Gzq2D5QhD8k5RUSv1B+048LpNmNYdLm8qJVIbBONw=="],

-    "zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
+    "zod": ["zod@4.1.3", "", {}, "sha512-1neef4bMce1hNTrxvHVKxWjKfGDn0oAli3Wy1Uwb7TRO1+wEwoZUZNP1NXIEESybOBiFnBOhI6a4m6tCLE8dog=="],

    "@babel/helper-module-transforms/@babel/helper-module-imports": ["@babel/helper-module-imports@7.27.1", "", { "dependencies": { "@babel/traverse": "^7.27.1", "@babel/types": "^7.27.1" } }, "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w=="],

@@ -2012,6 +2005,8 @@

    "@expo/cli/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

+    "@expo/cli/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/cli/ora": ["ora@3.4.0", "", { "dependencies": { "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-spinners": "^2.0.0", "log-symbols": "^2.2.0", "strip-ansi": "^5.2.0", "wcwidth": "^1.0.1" } }, "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="],

    "@expo/cli/picomatch": ["picomatch@3.0.1", "", {}, "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="],
@@ -2026,18 +2021,26 @@

    "@expo/config/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

+    "@expo/config/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/config/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

    "@expo/config-plugins/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

+    "@expo/config-plugins/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/config-plugins/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

    "@expo/devcert/debug": ["debug@3.2.7", "", { "dependencies": { "ms": "^2.1.1" } }, "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="],

+    "@expo/devcert/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/env/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

    "@expo/fingerprint/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

+    "@expo/fingerprint/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/fingerprint/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

    "@expo/image-utils/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],
@@ -2048,10 +2051,14 @@

    "@expo/metro-config/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],

+    "@expo/metro-config/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "@expo/metro-config/postcss": ["postcss@8.4.49", "", { "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA=="],

    "@expo/package-manager/ora": ["ora@3.4.0", "", { "dependencies": { "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-spinners": "^2.0.0", "log-symbols": "^2.2.0", "strip-ansi": "^5.2.0", "wcwidth": "^1.0.1" } }, "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="],

+    "@expo/prebuild-config/@react-native/normalize-colors": ["@react-native/normalize-colors@0.79.5", "", {}, "sha512-nGXMNMclZgzLUxijQQ38Dm3IAEhgxuySAWQHnljFtfB0JdaMwpe0Ox9H7Tp2OgrEA+EMEv+Od9ElKlHwGKmmvQ=="],
+
    "@expo/prebuild-config/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

    "@expo/xcpretty/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
@@ -2082,7 +2089,9 @@

    "@react-native-community/cli-tools/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

-    "@react-native/codegen/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
+    "@react-native/babel-plugin-codegen/@react-native/codegen": ["@react-native/codegen@0.79.6", "", { "dependencies": { "@babel/core": "^7.25.2", "@babel/parser": "^7.25.3", "glob": "^7.1.1", "hermes-parser": "0.25.1", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "yargs": "^17.6.2" } }, "sha512-iRBX8Lgbqypwnfba7s6opeUwVyaR23mowh9ILw7EcT2oLz3RqMmjJdrbVpWhGSMGq2qkPfqAH7bhO8C7O+xfjQ=="],
+
+    "@react-native/community-cli-plugin/@react-native/dev-middleware": ["@react-native/dev-middleware@0.79.5", "", { "dependencies": { "@isaacs/ttlcache": "^1.4.1", "@react-native/debugger-frontend": "0.79.5", "chrome-launcher": "^0.15.2", "chromium-edge-launcher": "^0.2.0", "connect": "^3.6.5", "debug": "^2.2.0", "invariant": "^2.2.4", "nullthrows": "^1.1.1", "open": "^7.0.3", "serve-static": "^1.16.2", "ws": "^6.2.3" } }, "sha512-U7r9M/SEktOCP/0uS6jXMHmYjj4ESfYCkNAenBjFjjsRWekiHE+U/vRMeO+fG9gq4UCcBAUISClkQCowlftYBw=="],

    "@react-native/community-cli-plugin/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],

@@ -2134,6 +2143,8 @@

    "expo-modules-autolinking/commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],

+    "expo-modules-autolinking/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "expo-router/semver": ["semver@7.6.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="],

    "fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -2152,6 +2163,8 @@

    "foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],

+    "glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
+
    "hoist-non-react-statics/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="],

    "hosted-git-info/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
@@ -2208,14 +2221,16 @@

    "react-dom/scheduler": ["scheduler@0.25.0", "", {}, "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="],

-    "react-native/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],
+    "react-native/@react-native/normalize-colors": ["@react-native/normalize-colors@0.79.5", "", {}, "sha512-nGXMNMclZgzLUxijQQ38Dm3IAEhgxuySAWQHnljFtfB0JdaMwpe0Ox9H7Tp2OgrEA+EMEv+Od9ElKlHwGKmmvQ=="],

-    "react-native/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
+    "react-native/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],

    "react-native/scheduler": ["scheduler@0.25.0", "", {}, "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="],

    "react-native/semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],

+    "react-native-reanimated/react-native-is-edge-to-edge": ["react-native-is-edge-to-edge@1.1.7", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-EH6i7E8epJGIcu7KpfXYXiV2JFIYITtq+rVS8uEb+92naMRBdxhTuS8Wn2Q7j9sqyO0B+Xbaaf9VdipIAmGW4w=="],
+
    "react-native-web/@react-native/normalize-colors": ["@react-native/normalize-colors@0.74.89", "", {}, "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="],

    "react-native-web/memoize-one": ["memoize-one@6.0.0", "", {}, "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="],
@@ -2226,8 +2241,6 @@

    "requireg/resolve": ["resolve@1.7.1", "", { "dependencies": { "path-parse": "^1.0.5" } }, "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="],

-    "rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
-
    "send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],

    "send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
@@ -2246,6 +2259,8 @@

    "sucrase/commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="],

+    "sucrase/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
+
    "tailwindcss/lilconfig": ["lilconfig@2.1.0", "", {}, "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="],

    "tailwindcss/postcss-nested": ["postcss-nested@6.2.0", "", { "dependencies": { "postcss-selector-parser": "^6.1.1" }, "peerDependencies": { "postcss": "^8.2.14" } }, "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ=="],
@@ -2256,8 +2271,6 @@

    "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],

-    "test-exclude/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
-
    "test-exclude/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],

    "whatwg-url/webidl-conversions": ["webidl-conversions@3.0.1", "", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="],
@@ -2302,7 +2315,9 @@

    "@istanbuljs/load-nyc-config/js-yaml/argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],

-    "@react-native/codegen/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
+    "@react-native/community-cli-plugin/@react-native/dev-middleware/@react-native/debugger-frontend": ["@react-native/debugger-frontend@0.79.5", "", {}, "sha512-WQ49TRpCwhgUYo5/n+6GGykXmnumpOkl4Lr2l2o2buWU9qPOwoiBqJAtmWEXsAug4ciw3eLiVfthn5ufs0VB0A=="],
+
+    "@react-native/community-cli-plugin/@react-native/dev-middleware/open": ["open@7.4.2", "", { "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" } }, "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="],

    "@react-native/community-cli-plugin/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],

@@ -2330,6 +2345,8 @@

    "finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],

+    "glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
+
    "lighthouse-logger/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],

    "log-update/cli-cursor/restore-cursor": ["restore-cursor@5.1.0", "", { "dependencies": { "onetime": "^7.0.0", "signal-exit": "^4.1.0" } }, "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA=="],
@@ -2360,12 +2377,8 @@

    "node-vibrant/@types/node/undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="],

-    "react-native/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
-
    "readable-web-to-node-stream/readable-stream/buffer": ["buffer@6.0.3", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],

-    "rimraf/glob/minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
-
    "send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],

    "serve-static/send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
@@ -2408,7 +2421,7 @@

    "@istanbuljs/load-nyc-config/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],

-    "@react-native/codegen/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
+    "@react-native/community-cli-plugin/@react-native/dev-middleware/open/is-wsl": ["is-wsl@2.2.0", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="],

    "ansi-fragments/slice-ansi/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="],

@@ -2428,10 +2441,6 @@

    "metro-config/cosmiconfig/js-yaml/argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],

-    "react-native/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
-
-    "rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
-
    "serve-static/send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],

    "@babel/highlight/chalk/ansi-styles/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="],
--- a/components/BitRateSheet.tsx
+++ b/components/BitRateSheet.tsx
@@ -0,0 +1,122 @@
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, TouchableOpacity, View } from "react-native";
+import { Text } from "./common/Text";
+import { FilterSheet } from "./filters/FilterSheet";
+
+export type Bitrate = {
+  key: string;
+  value: number | undefined;
+};
+
+export const BITRATES: Bitrate[] = [
+  {
+    key: "Max",
+    value: undefined,
+  },
+  {
+    key: "8 Mb/s",
+    value: 8000000,
+    height: 1080,
+  },
+  {
+    key: "4 Mb/s",
+    value: 4000000,
+    height: 1080,
+  },
+  {
+    key: "2 Mb/s",
+    value: 2000000,
+  },
+  {
+    key: "1 Mb/s",
+    value: 1000000,
+  },
+  {
+    key: "500 Kb/s",
+    value: 500000,
+  },
+  {
+    key: "250 Kb/s",
+    value: 250000,
+  },
+].sort(
+  (a, b) =>
+    (b.value || Number.POSITIVE_INFINITY) -
+    (a.value || Number.POSITIVE_INFINITY),
+);
+
+interface Props extends React.ComponentProps<typeof View> {
+  onChange: (value: Bitrate) => void;
+  selected?: Bitrate | null;
+  inverted?: boolean | null;
+}
+
+export const BitrateSheet: React.FC<Props> = ({
+  onChange,
+  selected,
+  inverted,
+  ...props
+}) => {
+  const isTv = Platform.isTV;
+  const { t } = useTranslation();
+  const [open, setOpen] = useState(false);
+
+  const sorted = useMemo(() => {
+    if (inverted)
+      return BITRATES.slice().sort(
+        (a, b) =>
+          (a.value || Number.POSITIVE_INFINITY) -
+          (b.value || Number.POSITIVE_INFINITY),
+      );
+    return BITRATES.slice().sort(
+      (a, b) =>
+        (b.value || Number.POSITIVE_INFINITY) -
+        (a.value || Number.POSITIVE_INFINITY),
+    );
+  }, [inverted]);
+
+  if (isTv) return null;
+
+  return (
+    <View
+      className='flex shrink'
+      style={{
+        minWidth: 60,
+        maxWidth: 200,
+      }}
+    >
+      <View className='flex flex-col' {...props}>
+        <Text className='opacity-50 mb-1 text-xs'>
+          {t("item_card.quality")}
+        </Text>
+        <TouchableOpacity
+          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'
+          onPress={() => setOpen(true)}
+        >
+          <Text numberOfLines={1}>
+            {BITRATES.find((b) => b.value === selected?.value)?.key}
+          </Text>
+        </TouchableOpacity>
+      </View>
+
+      <FilterSheet
+        open={open}
+        setOpen={setOpen}
+        title={t("item_card.quality")}
+        data={sorted}
+        values={selected ? [selected] : []}
+        multiple={false}
+        searchFilter={(item, query) => {
+          const label = (item as any).key || "";
+          return label.toLowerCase().includes(query.toLowerCase());
+        }}
+        renderItemLabel={(item) => <Text>{(item as any).key || ""}</Text>}
+        set={(vals) => {
+          const chosen = vals[0] as Bitrate | undefined;
+          if (chosen) onChange(chosen);
+        }}
+      />
+    </View>
+  );
+};
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -1,6 +1,20 @@
 import type React from "react";
-import { type PropsWithChildren, type ReactNode, useMemo } from "react";
-import { Text, TouchableOpacity, View } from "react-native";
+import {
+  type PropsWithChildren,
+  type ReactNode,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import {
+  Animated,
+  Easing,
+  Platform,
+  Pressable,
+  Text,
+  TouchableOpacity,
+  View,
+} from "react-native";
 import { useHaptic } from "@/hooks/useHaptic";
 import { Loader } from "./Loader";

@@ -31,10 +45,23 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
  justify = "center",
  ...props
 }) => {
+  const [focused, setFocused] = useState(false);
+  const scale = useRef(new Animated.Value(1)).current;
+
+  const animateTo = (v: number) =>
+    Animated.timing(scale, {
+      toValue: v,
+      duration: 130,
+      easing: Easing.out(Easing.quad),
+      useNativeDriver: true,
+    }).start();
+
  const colorClasses = useMemo(() => {
    switch (color) {
      case "purple":
-        return "bg-purple-600 active:bg-purple-700";
+        return focused
+          ? "bg-purple-500 border-2 border-white"
+          : "bg-purple-600 border border-purple-700";
      case "red":
        return "bg-red-600";
      case "black":
@@ -42,11 +69,43 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
      case "transparent":
        return "bg-transparent";
    }
-  }, [color]);
+  }, [color, focused]);

  const lightHapticFeedback = useHaptic("light");

-  return (
+  return Platform.isTV ? (
+    <Pressable
+      className='w-full'
+      onPress={onPress}
+      onFocus={() => {
+        setFocused(true);
+        animateTo(1.08);
+      }}
+      onBlur={() => {
+        setFocused(false);
+        animateTo(1);
+      }}
+    >
+      <Animated.View
+        style={{
+          transform: [{ scale }],
+          shadowColor: "#a855f7",
+          shadowOffset: { width: 0, height: 0 },
+          shadowOpacity: focused ? 0.9 : 0,
+          shadowRadius: focused ? 18 : 0,
+          elevation: focused ? 12 : 0, // Android glow
+        }}
+      >
+        <View
+          className={`rounded-2xl py-5 items-center justify-center 
+            ${focused ? "bg-purple-500 border-2 border-white" : "bg-purple-600 border border-purple-700"}
+            ${className}`}
+        >
+          <Text className='text-white text-xl font-bold'>{children}</Text>
+        </View>
+      </Animated.View>
+    </Pressable>
+  ) : (
    <TouchableOpacity
      className={`
        p-3 rounded-xl items-center justify-center
--- a/components/DownloadItem.tsx
+++ b/components/DownloadItem.tsx
@@ -61,7 +61,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
  const [queue, _setQueue] = useAtom(queueAtom);
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false);

  const { processes, startBackgroundDownload, getDownloadedItems } =
@@ -90,7 +90,12 @@ export const DownloadItems: React.FC<DownloadProps> = ({
    bottomSheetModalRef.current?.present();
  }, []);

-  const handleSheetChanges = useCallback((_index: number) => {}, []);
+  const handleSheetChanges = useCallback((index: number) => {
+    // Ensure modal is fully dismissed when index is -1
+    if (index === -1) {
+      // Modal is fully closed
+    }
+  }, []);

  const closeModal = useCallback(() => {
    bottomSheetModalRef.current?.dismiss();
@@ -106,20 +111,17 @@ export const DownloadItems: React.FC<DownloadProps> = ({

  // Initialize selectedOptions with default values
  useEffect(() => {
-    if (itemsNotDownloaded.length === 1) {
-      setSelectedOptions(() => ({
-        bitrate: defaultBitrate,
-        mediaSource: defaultMediaSource,
-        subtitleIndex: defaultSubtitleIndex ?? -1,
-        audioIndex: defaultAudioIndex,
-      }));
-    }
+    setSelectedOptions(() => ({
+      bitrate: defaultBitrate,
+      mediaSource: defaultMediaSource,
+      subtitleIndex: defaultSubtitleIndex ?? -1,
+      audioIndex: defaultAudioIndex,
+    }));
  }, [
    defaultAudioIndex,
    defaultBitrate,
    defaultSubtitleIndex,
    defaultMediaSource,
-    itemsNotDownloaded.length,
  ]);

  const itemsToDownload = useMemo(() => {
@@ -248,14 +250,19 @@ export const DownloadItems: React.FC<DownloadProps> = ({
    ],
  );

-  const acceptDownloadOptions = useCallback(() => {
+  const acceptDownloadOptions = useCallback(async () => {
    if (userCanDownload === true) {
      if (itemsToDownload.some((i) => !i.Id)) {
        throw new Error("No item id");
      }
-      closeModal();

-      initiateDownload(...itemsToDownload);
+      // Ensure modal is dismissed before starting download
+      await closeModal();
+
+      // Small delay to ensure modal is fully dismissed
+      setTimeout(() => {
+        initiateDownload(...itemsToDownload);
+      }, 100);
    } else {
      toast.error(
        t("home.downloads.toasts.you_are_not_allowed_to_download_files"),
@@ -329,7 +336,15 @@ export const DownloadItems: React.FC<DownloadProps> = ({
          backgroundColor: "#171717",
        }}
        onChange={handleSheetChanges}
+        onDismiss={() => {
+          // Ensure any pending state is cleared when modal is dismissed
+        }}
        backdropComponent={renderBackdrop}
+        enablePanDownToClose
+        enableDismissOnClose
+        android_keyboardInputMode='adjustResize'
+        keyboardBehavior='interactive'
+        keyboardBlurBehavior='restore'
      >
        <BottomSheetView>
          <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -6,10 +6,10 @@ import { Image } from "expo-image";
 import { useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { AudioTrackSelector } from "@/components/AudioTrackSelector";
-import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector";
+import { type Bitrate } from "@/components/BitrateSelector";
 import { ItemImage } from "@/components/common/ItemImage";
 import { DownloadSingleItem } from "@/components/DownloadItem";
 import { OverviewText } from "@/components/OverviewText";
@@ -18,7 +18,6 @@ import { ParallaxScrollView } from "@/components/ParallaxPage";
 import { PlayButton } from "@/components/PlayButton";
 import { PlayedStatus } from "@/components/PlayedStatus";
 import { SimilarItems } from "@/components/SimilarItems";
-import { SubtitleTrackSelector } from "@/components/SubtitleTrackSelector";
 import { CastAndCrew } from "@/components/series/CastAndCrew";
 import { CurrentSeries } from "@/components/series/CurrentSeries";
 import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarousel";
@@ -30,11 +29,13 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { AddToFavorites } from "./AddToFavorites";
+import { BitrateSheet } from "./BitRateSheet";
 import { ItemHeader } from "./ItemHeader";
 import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
-import { MediaSourceSelector } from "./MediaSourceSelector";
+import { MediaSourceSheet } from "./MediaSourceSheet";
 import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
 import { PlayInRemoteSessionButton } from "./PlayInRemoteSession";
+import { TrackSheet } from "./TrackSheet";

 const Chromecast = !Platform.isTV ? require("./Chromecast") : null;

@@ -53,11 +54,12 @@ interface ItemContentProps {
 export const ItemContent: React.FC<ItemContentProps> = React.memo(
  ({ item, isOffline }) => {
    const [api] = useAtom(apiAtom);
-    const [settings] = useSettings();
+    const [settings] = useSettings(null);
    const { orientation } = useOrientation();
    const navigation = useNavigation();
    const insets = useSafeAreaInsets();
    const [user] = useAtom(userAtom);
+    const { t } = useTranslation();

    useImageColors({ item });

@@ -174,8 +176,8 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                style={{
                  height: 130,
                  width: "100%",
-                  resizeMode: "contain",
                }}
+                contentFit='contain'
                onLoad={() => setLoadingLogo(false)}
                onError={() => setLoadingLogo(false)}
              />
@@ -186,10 +188,10 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
        >
          <View className='flex flex-col bg-transparent shrink'>
            <View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'>
-              <ItemHeader item={item} className='mb-4' />
+              <ItemHeader item={item} className='mb-2' />
              {item.Type !== "Program" && !Platform.isTV && !isOffline && (
                <View className='flex flex-row items-center justify-start w-full h-16'>
-                  <BitrateSelector
+                  <BitrateSheet
                    className='mr-1'
                    onChange={(val) =>
                      setSelectedOptions(
@@ -198,7 +200,7 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                    }
                    selected={selectedOptions.bitrate}
                  />
-                  <MediaSourceSelector
+                  <MediaSourceSheet
                    className='mr-1'
                    item={item}
                    onChange={(val) =>
@@ -212,8 +214,10 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                    }
                    selected={selectedOptions.mediaSource}
                  />
-                  <AudioTrackSelector
+                  <TrackSheet
                    className='mr-1'
+                    streamType='Audio'
+                    title={t("item_card.audio")}
                    source={selectedOptions.mediaSource}
                    onChange={(val) => {
                      setSelectedOptions(
@@ -226,8 +230,10 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                    }}
                    selected={selectedOptions.audioIndex}
                  />
-                  <SubtitleTrackSelector
+                  <TrackSheet
                    source={selectedOptions.mediaSource}
+                    streamType='Subtitle'
+                    title={t("item_card.subtitles")}
                    onChange={(val) =>
                      setSelectedOptions(
                        (prev) =>
--- a/components/MediaSourceSheet.tsx
+++ b/components/MediaSourceSheet.tsx
@@ -0,0 +1,75 @@
+import type {
+  BaseItemDto,
+  MediaSourceInfo,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { useCallback, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, TouchableOpacity, View } from "react-native";
+import { Text } from "./common/Text";
+import { FilterSheet } from "./filters/FilterSheet";
+
+interface Props extends React.ComponentProps<typeof View> {
+  item: BaseItemDto;
+  onChange: (value: MediaSourceInfo) => void;
+  selected?: MediaSourceInfo | null;
+}
+
+export const MediaSourceSheet: React.FC<Props> = ({
+  item,
+  onChange,
+  selected,
+  ...props
+}) => {
+  const isTv = Platform.isTV;
+  const { t } = useTranslation();
+  const [open, setOpen] = useState(false);
+
+  const getDisplayName = useCallback((source: MediaSourceInfo) => {
+    const videoStream = source.MediaStreams?.find((x) => x.Type === "Video");
+    if (source.Name) return source.Name;
+    if (videoStream?.DisplayTitle) return videoStream.DisplayTitle;
+    return `Source ${source.Id}`;
+  }, []);
+
+  const selectedName = useMemo(() => {
+    if (!selected) return "";
+    return getDisplayName(selected);
+  }, [selected, getDisplayName]);
+
+  if (isTv || (item.MediaStreams && item.MediaStreams.length <= 1)) return null;
+
+  return (
+    <View className='flex shrink' style={{ minWidth: 75 }}>
+      <View className='flex flex-col' {...props}>
+        <Text className='opacity-50 mb-1 text-xs'>{t("item_card.video")}</Text>
+        <TouchableOpacity
+          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center'
+          onPress={() => setOpen(true)}
+        >
+          <Text numberOfLines={1}>{selectedName}</Text>
+        </TouchableOpacity>
+      </View>
+
+      <FilterSheet
+        open={open}
+        setOpen={setOpen}
+        title={t("item_card.video")}
+        data={item.MediaSources || []}
+        values={selected ? [selected] : []}
+        multiple={false}
+        searchFilter={(src, query) =>
+          getDisplayName(src as MediaSourceInfo)
+            .toLowerCase()
+            .includes(query.toLowerCase())
+        }
+        renderItemLabel={(src) => (
+          <Text>{getDisplayName(src as MediaSourceInfo)}</Text>
+        )}
+        set={(vals) => {
+          const chosen = vals[0] as MediaSourceInfo | undefined;
+          if (chosen) onChange(chosen);
+        }}
+      />
+    </View>
+  );
+};
--- a/components/MoreMoviesWithActor.tsx
+++ b/components/MoreMoviesWithActor.tsx
@@ -6,8 +6,8 @@ import type React from "react";
 import { useTranslation } from "react-i18next";
 import { View, type ViewProps } from "react-native";
 import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
+import { SimpleTouchableItemRouter } from "@/components/common/SimpleTouchableItemRouter";
 import { Text } from "@/components/common/Text";
-import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
 import { ItemCardText } from "@/components/ItemCardText";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
@@ -83,8 +83,9 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
        data={items}
        loading={isLoading}
        height={247}
+        estimatedItemSize={112}
        renderItem={(item: BaseItemDto, idx: number) => (
-          <TouchableItemRouter
+          <SimpleTouchableItemRouter
            key={idx}
            item={item}
            className='flex flex-col w-28'
@@ -93,7 +94,7 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
              <MoviePoster item={item} />
              <ItemCardText item={item} />
            </View>
-          </TouchableItemRouter>
+          </SimpleTouchableItemRouter>
        )}
      />
    </View>
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -67,7 +67,7 @@ export const PlayButton: React.FC<Props> = ({
  const startColor = useSharedValue(colorAtom);
  const widthProgress = useSharedValue(0);
  const colorChangeProgress = useSharedValue(0);
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings] = useSettings(null);
  const lightHapticFeedback = useHaptic("light");

  const goToPlayer = useCallback(
@@ -125,6 +125,34 @@ export const PlayButton: React.FC<Props> = ({
                // Check if user wants H265 for Chromecast
                const enableH265 = settings.enableH265ForChromecast;

+                // Validate required parameters before calling getStreamUrl
+                if (!api) {
+                  console.warn("API not available for Chromecast streaming");
+                  Alert.alert(
+                    t("player.client_error"),
+                    t("player.missing_parameters"),
+                  );
+                  return;
+                }
+                if (!user?.Id) {
+                  console.warn(
+                    "User not authenticated for Chromecast streaming",
+                  );
+                  Alert.alert(
+                    t("player.client_error"),
+                    t("player.missing_parameters"),
+                  );
+                  return;
+                }
+                if (!item?.Id) {
+                  console.warn("Item not available for Chromecast streaming");
+                  Alert.alert(
+                    t("player.client_error"),
+                    t("player.missing_parameters"),
+                  );
+                  return;
+                }
+
                // Get a new URL with the Chromecast device profile
                try {
                  const data = await getStreamUrl({
@@ -132,7 +160,7 @@ export const PlayButton: React.FC<Props> = ({
                    item,
                    deviceProfile: enableH265 ? chromecasth265 : chromecast,
                    startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
-                    userId: user?.Id,
+                    userId: user.Id,
                    audioStreamIndex: selectedOptions.audioIndex,
                    maxStreamingBitrate: selectedOptions.bitrate?.value,
                    mediaSourceId: selectedOptions.mediaSource?.Id,
--- a/components/PlayButton.tv.tsx
+++ b/components/PlayButton.tv.tsx
@@ -44,7 +44,7 @@ export const PlayButton: React.FC<Props> = ({
  const startColor = useSharedValue(colorAtom);
  const widthProgress = useSharedValue(0);
  const colorChangeProgress = useSharedValue(0);
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const lightHapticFeedback = useHaptic("light");

  const goToPlayer = useCallback(
--- a/components/RoundButton.tsx
+++ b/components/RoundButton.tsx
@@ -1,14 +1,10 @@
 import { Ionicons } from "@expo/vector-icons";
 import { BlurView } from "expo-blur";
 import type { PropsWithChildren } from "react";
-import {
-  Platform,
-  TouchableOpacity,
-  type TouchableOpacityProps,
-} from "react-native";
+import { Platform, TouchableOpacity, type ViewProps } from "react-native";
 import { useHaptic } from "@/hooks/useHaptic";

-interface Props extends TouchableOpacityProps {
+interface Props extends ViewProps {
  onPress?: () => void;
  icon?: keyof typeof Ionicons.glyphMap;
  background?: boolean;
@@ -25,7 +21,7 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
  size = "default",
  fillColor,
  hapticFeedback = true,
-  ...props
+  ...viewProps
 }) => {
  const buttonSize = size === "large" ? "h-10 w-10" : "h-9 w-9";
  const fillColorClass = fillColor === "primary" ? "bg-purple-600" : "";
@@ -43,7 +39,7 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
      <TouchableOpacity
        onPress={handlePress}
        className={`rounded-full ${buttonSize} flex items-center justify-center ${fillColorClass}`}
-        {...props}
+        {...(viewProps as any)}
      >
        {icon ? (
          <Ionicons
@@ -61,7 +57,7 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
      <TouchableOpacity
        onPress={handlePress}
        className={`rounded-full ${buttonSize} flex items-center justify-center ${fillColorClass}`}
-        {...props}
+        {...(viewProps as any)}
      >
        {icon ? (
          <Ionicons
@@ -81,7 +77,7 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
        className={`rounded-full ${buttonSize} flex items-center justify-center ${
          fillColor ? fillColorClass : "bg-neutral-800/80"
        }`}
-        {...props}
+        {...(viewProps as any)}
      >
        {icon ? (
          <Ionicons
@@ -95,11 +91,11 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
    );

  return (
-    <TouchableOpacity onPress={handlePress} {...props}>
+    <TouchableOpacity onPress={handlePress} {...(viewProps as any)}>
      <BlurView
        intensity={90}
        className={`rounded-full overflow-hidden ${buttonSize} flex items-center justify-center ${fillColorClass}`}
-        {...props}
+        {...(viewProps as any)}
      >
        {icon ? (
          <Ionicons
--- a/components/SimilarItems.tsx
+++ b/components/SimilarItems.tsx
@@ -8,8 +8,8 @@ import { View, type ViewProps } from "react-native";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { HorizontalScroll } from "./common/HorrizontalScroll";
+import { SimpleTouchableItemRouter } from "./common/SimpleTouchableItemRouter";
 import { Text } from "./common/Text";
-import { TouchableItemRouter } from "./common/TouchableItemRouter";
 import { ItemCardText } from "./ItemCardText";

 interface SimilarItemsProps extends ViewProps {
@@ -54,9 +54,10 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
        data={movies}
        loading={isLoading}
        height={247}
+        estimatedItemSize={112}
        noItemsText={t("item_card.no_similar_items_found")}
        renderItem={(item: BaseItemDto, idx: number) => (
-          <TouchableItemRouter
+          <SimpleTouchableItemRouter
            key={idx}
            item={item}
            className='flex flex-col w-28'
@@ -65,7 +66,7 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
              <MoviePoster item={item} />
              <ItemCardText item={item} />
            </View>
-          </TouchableItemRouter>
+          </SimpleTouchableItemRouter>
        )}
      />
    </View>
--- a/components/TrackSheet.tsx
+++ b/components/TrackSheet.tsx
@@ -0,0 +1,76 @@
+import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Platform, TouchableOpacity, View } from "react-native";
+import { Text } from "./common/Text";
+import { FilterSheet } from "./filters/FilterSheet";
+
+interface Props extends React.ComponentProps<typeof View> {
+  source?: MediaSourceInfo;
+  onChange: (value: number) => void;
+  selected?: number | undefined;
+  streamType?: string;
+  title: string;
+}
+
+export const TrackSheet: React.FC<Props> = ({
+  source,
+  onChange,
+  selected,
+  streamType,
+  title,
+  ...props
+}) => {
+  const isTv = Platform.isTV;
+  const { t } = useTranslation();
+
+  const streams = useMemo(
+    () => source?.MediaStreams?.filter((x) => x.Type === streamType),
+    [source],
+  );
+
+  const selectedSteam = useMemo(
+    () => streams?.find((x) => x.Index === selected),
+    [streams, selected],
+  );
+  const [open, setOpen] = useState(false);
+
+  if (isTv || (streams && streams.length === 0)) return null;
+
+  return (
+    <View className='flex shrink' style={{ minWidth: 25 }} {...props}>
+      <View className='flex flex-col'>
+        <Text className='opacity-50 mb-1 text-xs'>{title}</Text>
+        <TouchableOpacity
+          className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'
+          onPress={() => setOpen(true)}
+        >
+          <Text numberOfLines={1}>
+            {selectedSteam?.DisplayTitle || t("common.select", "Select")}
+          </Text>
+        </TouchableOpacity>
+      </View>
+      <FilterSheet
+        open={open}
+        setOpen={setOpen}
+        title={title}
+        data={streams || []}
+        values={selectedSteam ? [selectedSteam] : []}
+        multiple={false}
+        searchFilter={(item, query) => {
+          const label = (item as any).DisplayTitle || "";
+          return label.toLowerCase().includes(query.toLowerCase());
+        }}
+        renderItemLabel={(item) => (
+          <Text>{(item as any).DisplayTitle || ""}</Text>
+        )}
+        set={(vals) => {
+          const chosen = vals[0] as any;
+          if (chosen && chosen.Index !== null && chosen.Index !== undefined) {
+            onChange(chosen.Index);
+          }
+        }}
+      />
+    </View>
+  );
+};
--- a/components/common/HorrizontalScroll.tsx
+++ b/components/common/HorrizontalScroll.tsx
@@ -43,6 +43,7 @@ export const HorizontalScroll = <T,>(
    ref,
    ...restProps
  } = props;
+
  const flashListRef = useRef<FlashList<T>>(null);

  useImperativeHandle(ref!, () => ({
@@ -70,7 +71,7 @@ export const HorizontalScroll = <T,>(
  }

  return (
-    <View style={containerStyle}>
+    <View style={[{ height }, containerStyle]}>
      <FlashList<T>
        ref={flashListRef}
        data={data}
--- a/components/common/Input.tsx
+++ b/components/common/Input.tsx
@@ -1,23 +1,40 @@
-import React from "react";
+import React, { useState } from "react";
 import {
  Platform,
  TextInput,
  type TextInputProps,
  TouchableOpacity,
 } from "react-native";
-export function Input(props: TextInputProps) {
-  const { style, ...otherProps } = props;
+
+interface InputProps extends TextInputProps {
+  extraClassName?: string; // new prop for additional classes
+}
+
+export function Input(props: InputProps) {
+  const { style, extraClassName = "", ...otherProps } = props;
  const inputRef = React.useRef<TextInput>(null);
+  const [isFocused, setIsFocused] = useState(false);

  return Platform.isTV ? (
    <TouchableOpacity onFocus={() => inputRef?.current?.focus?.()}>
      <TextInput
        ref={inputRef}
-        className='p-4  rounded-xl bg-neutral-900'
+        className={`
+          w-full text-lg px-5 py-4 rounded-2xl
+          ${isFocused ? "bg-neutral-700 border-2 border-white" : "bg-neutral-900 border-2 border-transparent"}
+          text-white ${extraClassName}
+        `}
        allowFontScaling={false}
-        style={[{ color: "white" }, style]}
-        placeholderTextColor={"#9CA3AF"}
+        style={[
+          style,
+          {
+            backgroundColor: isFocused ? "#ffffff88" : "#8f8d8d88",
+          },
+        ]}
+        placeholderTextColor={"#ffffffff"}
        clearButtonMode='while-editing'
+        onFocus={() => setIsFocused(true)}
+        onBlur={() => setIsFocused(false)}
        {...otherProps}
      />
    </TouchableOpacity>
--- a/components/common/JellyseerrItemRouter.tsx
+++ b/components/common/JellyseerrItemRouter.tsx
@@ -39,7 +39,7 @@ export const TouchableJellyseerrRouter: React.FC<PropsWithChildren<Props>> = ({
  const segments = useSegments();
  const { jellyseerrApi, jellyseerrUser, requestMedia } = useJellyseerr();

-  const from = segments[2];
+  const from = segments[2] || "(home)";

  const autoApprove = useMemo(() => {
    return (
@@ -66,14 +66,14 @@ export const TouchableJellyseerrRouter: React.FC<PropsWithChildren<Props>> = ({
            onPress={() => {
              if (!result) return;

-              // @ts-expect-error
              router.push({
                pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+                // @ts-expect-error
                params: {
                  ...result,
                  mediaTitle,
                  releaseYear,
-                  canRequest,
+                  canRequest: canRequest.toString(),
                  posterSrc,
                  mediaType,
                },
--- a/components/common/SimpleTouchableItemRouter.tsx
+++ b/components/common/SimpleTouchableItemRouter.tsx
@@ -0,0 +1,86 @@
+import type {
+  BaseItemDto,
+  BaseItemPerson,
+} from "@jellyfin/sdk/lib/generated-client/models";
+import { useRouter, useSegments } from "expo-router";
+import { type PropsWithChildren } from "react";
+import { TouchableOpacity, type TouchableOpacityProps } from "react-native";
+
+interface Props extends TouchableOpacityProps {
+  item: BaseItemDto;
+  isOffline?: boolean;
+}
+
+export const itemRouter = (
+  item: BaseItemDto | BaseItemPerson,
+  from: string,
+) => {
+  if ("CollectionType" in item && item.CollectionType === "livetv") {
+    return `/(auth)/(tabs)/${from}/livetv`;
+  }
+
+  if (item.Type === "Series") {
+    return `/(auth)/(tabs)/${from}/series/${item.Id}`;
+  }
+
+  if (item.Type === "Person" || item.Type === "Actor") {
+    return `/(auth)/(tabs)/${from}/actors/${item.Id}`;
+  }
+
+  if (item.Type === "BoxSet") {
+    return `/(auth)/(tabs)/${from}/collections/${item.Id}`;
+  }
+
+  if (item.Type === "UserView") {
+    return `/(auth)/(tabs)/${from}/collections/${item.Id}`;
+  }
+
+  if (item.Type === "CollectionFolder") {
+    return `/(auth)/(tabs)/(libraries)/${item.Id}`;
+  }
+
+  if (item.Type === "Playlist") {
+    return `/(auth)/(tabs)/(libraries)/${item.Id}`;
+  }
+
+  return `/(auth)/(tabs)/${from}/items/page?id=${item.Id}`;
+};
+
+/**
+ * Simplified TouchableItemRouter that doesn't use hooks that might trigger API calls.
+ * Intended for use in similar items rows where we want to avoid unnecessary requests.
+ */
+export const SimpleTouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
+  item,
+  isOffline = false,
+  children,
+  ...props
+}) => {
+  const router = useRouter();
+  const segments = useSegments();
+  const from = segments[2] || "(home)";
+
+  if (
+    from === "(home)" ||
+    from === "(search)" ||
+    from === "(libraries)" ||
+    from === "(favorites)"
+  )
+    return (
+      <TouchableOpacity
+        onPress={() => {
+          let url = itemRouter(item, from);
+          if (isOffline) {
+            url += `&offline=true`;
+          }
+          // @ts-expect-error
+          router.push(url);
+        }}
+        {...props}
+      >
+        {children}
+      </TouchableOpacity>
+    );
+
+  return null;
+};
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -61,7 +61,7 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
  const markAsPlayedStatus = useMarkAsPlayed([item]);
  const { isFavorite, toggleFavorite } = useFavorite(item);

-  const from = segments[2];
+  const from = segments[2] || "(home)";

  const showActionSheet = useCallback(() => {
    if (
--- a/components/downloads/ActiveDownloads.tsx
+++ b/components/downloads/ActiveDownloads.tsx
@@ -1,5 +1,5 @@
 import { Ionicons } from "@expo/vector-icons";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQueryClient } from "@tanstack/react-query";
 import { Image } from "expo-image";
 import { useRouter } from "expo-router";
 import { t } from "i18next";
@@ -19,13 +19,13 @@ import { storage } from "@/utils/mmkv";
 import { formatTimeString } from "@/utils/time";
 import { Button } from "../Button";

-interface Props extends ViewProps {}
-
 const bytesToMB = (bytes: number) => {
  return bytes / 1024 / 1024;
 };

-export const ActiveDownloads: React.FC<Props> = ({ ...props }) => {
+interface ActiveDownloadsProps extends ViewProps {}
+
+export default function ActiveDownloads({ ...props }: ActiveDownloadsProps) {
  const { processes } = useDownload();
  if (processes?.length === 0)
    return (
@@ -51,31 +51,48 @@ export const ActiveDownloads: React.FC<Props> = ({ ...props }) => {
      </View>
    </View>
  );
-};
+}

 interface DownloadCardProps extends TouchableOpacityProps {
  process: JobStatus;
 }

 const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
-  const { startDownload, removeProcess } = useDownload();
+  const { startDownload, pauseDownload, resumeDownload, removeProcess } =
+    useDownload();
  const router = useRouter();
  const queryClient = useQueryClient();

-  const cancelJobMutation = useMutation({
-    mutationFn: async (id: string) => {
-      if (!process) throw new Error("No active download");
-      removeProcess(id);
-    },
-    onSuccess: () => {
-      toast.success(t("home.downloads.toasts.download_cancelled"));
+  const handlePause = async (id: string) => {
+    try {
+      await pauseDownload(id);
+      toast.success(t("home.downloads.toasts.download_paused"));
+    } catch (error) {
+      console.error("Error pausing download:", error);
+      toast.error(t("home.downloads.toasts.could_not_pause_download"));
+    }
+  };
+
+  const handleResume = async (id: string) => {
+    try {
+      await resumeDownload(id);
+      toast.success(t("home.downloads.toasts.download_resumed"));
+    } catch (error) {
+      console.error("Error resuming download:", error);
+      toast.error(t("home.downloads.toasts.could_not_resume_download"));
+    }
+  };
+
+  const handleDelete = async (id: string) => {
+    try {
+      await removeProcess(id);
+      toast.success(t("home.downloads.toasts.download_deleted"));
      queryClient.invalidateQueries({ queryKey: ["downloads"] });
-    },
-    onError: (e) => {
-      console.error(e);
-      toast.error(t("home.downloads.toasts.could_not_cancel_download"));
-    },
-  });
+    } catch (error) {
+      console.error("Error deleting download:", error);
+      toast.error(t("home.downloads.toasts.could_not_delete_download"));
+    }
+  };

  const eta = (p: JobStatus) => {
    if (!p.speed || p.speed <= 0 || !p.estimatedTotalSizeBytes) return null;
@@ -121,8 +138,8 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
                style={{
                  width: "100%",
                  height: "100%",
-                  resizeMode: "cover",
                }}
+                contentFit='cover'
              />
            </View>
          )}
@@ -154,17 +171,30 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
              <Text className='text-xs capitalize'>{process.status}</Text>
            </View>
          </View>
-          <TouchableOpacity
-            disabled={cancelJobMutation.isPending}
-            onPress={() => cancelJobMutation.mutate(process.id)}
-            className='ml-auto p-2 rounded-full'
-          >
-            {cancelJobMutation.isPending ? (
-              <ActivityIndicator size='small' color='white' />
-            ) : (
-              <Ionicons name='close' size={24} color='red' />
+          <View className='ml-auto flex flex-row items-center space-x-2'>
+            {process.status === "downloading" && (
+              <TouchableOpacity
+                onPress={() => handlePause(process.id)}
+                className='p-2 rounded-full bg-yellow-600'
+              >
+                <Ionicons name='pause' size={20} color='white' />
+              </TouchableOpacity>
            )}
-          </TouchableOpacity>
+            {process.status === "paused" && (
+              <TouchableOpacity
+                onPress={() => handleResume(process.id)}
+                className='p-2 rounded-full bg-green-600'
+              >
+                <Ionicons name='play' size={20} color='white' />
+              </TouchableOpacity>
+            )}
+            <TouchableOpacity
+              onPress={() => handleDelete(process.id)}
+              className='p-2 rounded-full bg-red-600'
+            >
+              <Ionicons name='close' size={20} color='white' />
+            </TouchableOpacity>
+          </View>
        </View>
        {process.status === "completed" && (
          <View className='flex flex-row mt-4 space-x-4'>
--- a/components/downloads/MovieCard.tsx
+++ b/components/downloads/MovieCard.tsx
@@ -77,8 +77,8 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
            style={{
              width: "100%",
              height: "100%",
-              resizeMode: "cover",
            }}
+            contentFit='cover'
          />
          <ProgressBar item={item} />
        </View>
--- a/components/downloads/SeriesCard.tsx
+++ b/components/downloads/SeriesCard.tsx
@@ -52,8 +52,8 @@ export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
            style={{
              width: "100%",
              height: "100%",
-              resizeMode: "cover",
            }}
+            contentFit='cover'
          />
          <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center absolute bottom-1 right-1'>
            <Text className='text-xs font-bold'>{items.length}</Text>
--- a/components/filters/FilterButton.tsx
+++ b/components/filters/FilterButton.tsx
@@ -7,7 +7,7 @@ import { FilterSheet } from "./FilterSheet";

 interface FilterButtonProps<T> extends ViewProps {
  id: string;
-  showSearch?: boolean;
+  disableSearch?: boolean;
  queryKey: string;
  values: T[];
  title: string;
@@ -28,7 +28,7 @@ export const FilterButton = <T,>({
  title,
  renderItemLabel,
  searchFilter,
-  showSearch = true,
+  disableSearch = false,
  multiple = false,
  icon = "filter",
  ...props
@@ -94,7 +94,7 @@ export const FilterButton = <T,>({
        set={set}
        renderItemLabel={renderItemLabel}
        searchFilter={searchFilter}
-        showSearch={showSearch}
+        disableSearch={disableSearch}
        multiple={multiple}
      />
    </>
--- a/components/filters/FilterSheet.tsx
+++ b/components/filters/FilterSheet.tsx
@@ -5,6 +5,7 @@ import {
  BottomSheetModal,
  BottomSheetScrollView,
 } from "@gorhom/bottom-sheet";
+import { isEqual } from "lodash";
 import type React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,6 +15,7 @@ import {
  View,
  type ViewProps,
 } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { Button } from "../Button";
 import { Input } from "../common/Input";
@@ -27,7 +29,7 @@ interface Props<T> extends ViewProps {
  title: string;
  searchFilter?: (item: T, query: string) => boolean;
  renderItemLabel: (item: T) => React.ReactNode;
-  showSearch?: boolean;
+  disableSearch?: boolean;
  multiple?: boolean;
 }

@@ -49,7 +51,7 @@ const LIMIT = 100;
 * @param {string} props.title - The title of the bottom sheet
 * @param {function} props.searchFilter - Function to filter items based on search query
 * @param {function} props.renderItemLabel - Function to render the label for each item
- * @param {boolean} [props.showSearch=true] - Whether to show the search input
+ * @param {boolean} [props.disableSearch=false] - Whether to disable the search input
 *
 * @returns {React.ReactElement} The FilterSheet component
 *
@@ -70,18 +72,21 @@ export const FilterSheet = <T,>({
  title,
  searchFilter,
  renderItemLabel,
-  showSearch = true,
+  disableSearch = false,
  multiple = false,
 }: Props<T>) => {
  const bottomSheetModalRef = useRef<BottomSheetModal>(null);
-  const snapPoints = useMemo(() => ["80%"], []);
+  const snapPoints = useMemo(() => ["85%"], []);
  const { t } = useTranslation();
+  const insets = useSafeAreaInsets();

  const [data, setData] = useState<T[]>([]);
  const [offset, setOffset] = useState<number>(0);

  const [search, setSearch] = useState<string>("");

+  const [showSearch, setShowSearch] = useState<boolean>(false);
+
  const filteredData = useMemo(() => {
    if (!search) return _data;
    const results = [];
@@ -93,6 +98,13 @@ export const FilterSheet = <T,>({
    return results.slice(0, 100);
  }, [search, _data, searchFilter]);

+  useEffect(() => {
+    if (!data || data.length === 0 || disableSearch) return;
+    if (data.length > 15) {
+      setShowSearch(true);
+    }
+  }, [data]);
+
  // Loads data in batches of LIMIT size, starting from offset,
  // to implement efficient "load more" functionality
  useEffect(() => {
@@ -151,7 +163,13 @@ export const FilterSheet = <T,>({
          flex: 1,
        }}
      >
-        <View className='px-4 mt-2 mb-8'>
+        <View
+          className='mt-2 mb-8'
+          style={{
+            paddingLeft: Math.max(16, insets.left),
+            paddingRight: Math.max(16, insets.right),
+          }}
+        >
          <Text className='font-bold text-2xl'>{title}</Text>
          <Text className='mb-2 text-neutral-500'>
            {t("search.x_items", { count: _data?.length })}
@@ -159,7 +177,7 @@ export const FilterSheet = <T,>({
          {showSearch && (
            <Input
              placeholder={t("search.search")}
-              className='my-2'
+              className='my-2 border-neutral-800 border'
              value={search}
              onChangeText={(text) => {
                setSearch(text);
@@ -196,8 +214,8 @@ export const FilterSheet = <T,>({
                  }}
                  className=' bg-neutral-800 px-4 py-3 flex flex-row items-center justify-between'
                >
-                  <Text>{renderItemLabel(item)}</Text>
-                  {values.some((i) => i === item) ? (
+                  <Text className='flex shrink'>{renderItemLabel(item)}</Text>
+                  {values.some((i) => isEqual(i, item)) ? (
                    <Ionicons name='radio-button-on' size={24} color='white' />
                  ) : (
                    <Ionicons name='radio-button-off' size={24} color='white' />
--- a/components/home/Favorites.tsx
+++ b/components/home/Favorites.tsx
@@ -1,10 +1,11 @@
 import type { Api } from "@jellyfin/sdk";
 import type { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
+import { Image } from "expo-image";
 import { t } from "i18next";
 import { useAtom } from "jotai";
 import { useCallback, useEffect, useState } from "react";
-import { Image, Text, View } from "react-native";
+import { Text, View } from "react-native";
 // PNG ASSET
 import heart from "@/assets/icons/heart.fill.png";
 import { Colors } from "@/constants/Colors";
@@ -125,7 +126,8 @@ export const Favorites = () => {
        <View className='flex-1 items-center justify-center py-12'>
          <Image
            className={"w-10 h-10 mb-4"}
-            style={{ tintColor: Colors.primary, resizeMode: "contain" }}
+            style={{ tintColor: Colors.primary }}
+            contentFit='contain'
            source={heart}
          />
          <Text className='text-xl font-semibold text-white mb-2'>
--- a/components/home/LargeMovieCarousel.tsx
+++ b/components/home/LargeMovieCarousel.tsx
@@ -26,7 +26,7 @@ import { itemRouter } from "../common/TouchableItemRouter";
 interface Props extends ViewProps {}

 export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);

  const ref = React.useRef<ICarouselInstance>(null);
  const progress = useSharedValue<number>(0);
@@ -146,7 +146,7 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
  }, [item]);

  const segments = useSegments();
-  const from = segments[2];
+  const from = segments[2] || "(home)";

  const opacity = useSharedValue(1);

@@ -200,8 +200,8 @@ const RenderItem: React.FC<{ item: BaseItemDto }> = ({ item }) => {
              style={{
                width: "100%",
                height: "100%",
-                resizeMode: "contain",
              }}
+              contentFit='contain'
            />
          </View>
        </View>
--- a/components/jellyseerr/PersonPoster.tsx
+++ b/components/jellyseerr/PersonPoster.tsx
@@ -22,7 +22,7 @@ const PersonPoster: React.FC<Props & ViewProps> = ({
  const { jellyseerrApi } = useJellyseerr();
  const router = useRouter();
  const segments = useSegments();
-  const from = segments[2];
+  const from = segments[2] || "(home)";

  if (from === "(home)" || from === "(search)" || from === "(libraries)")
    return (
--- a/components/jellyseerr/discover/CompanySlide.tsx
+++ b/components/jellyseerr/discover/CompanySlide.tsx
@@ -16,11 +16,12 @@ const CompanySlide: React.FC<
 > = ({ slide, data, ...props }) => {
  const segments = useSegments();
  const { jellyseerrApi } = useJellyseerr();
-  const from = segments[2];
+  const from = segments[2] || "(home)";

  const navigate = useCallback(
    ({ id, image, name }: Network | Studio) =>
      router.push({
+        // @ts-expect-error - Dynamic pathname for jellyseerr routing
        pathname: `/(auth)/(tabs)/${from}/jellyseerr/company/${id}`,
        params: { id, image, name, type: slide.type },
      }),
--- a/components/jellyseerr/discover/GenericSlideCard.tsx
+++ b/components/jellyseerr/discover/GenericSlideCard.tsx
@@ -23,7 +23,7 @@ const GenericSlideCard: React.FC<
    id: string;
    url?: string;
    title?: string;
-    colors?: string[];
+    colors?: readonly [string, string, ...string[]];
    contentFit?: ImageContentFit;
  } & ViewProps
 > = ({
--- a/components/jellyseerr/discover/GenreSlide.tsx
+++ b/components/jellyseerr/discover/GenreSlide.tsx
@@ -13,11 +13,12 @@ import { genreColorMap } from "@/utils/jellyseerr/src/components/Discover/consta
 const GenreSlide: React.FC<SlideProps & ViewProps> = ({ slide, ...props }) => {
  const segments = useSegments();
  const { jellyseerrApi } = useJellyseerr();
-  const from = segments[2];
+  const from = segments[2] || "(home)";

  const navigate = useCallback(
    (genre: GenreSliderItem) =>
      router.push({
+        // @ts-expect-error - Dynamic pathname for jellyseerr routing
        pathname: `/(auth)/(tabs)/${from}/jellyseerr/genre/${genre.id}`,
        params: { type: slide.type, name: genre.name },
      }),
--- a/components/library/LibraryItemCard.tsx
+++ b/components/library/LibraryItemCard.tsx
@@ -41,7 +41,7 @@ const icons: Record<CollectionType, IconName> = {
 export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);

  const { t } = useTranslation();

--- a/components/list/ListItem.tsx
+++ b/components/list/ListItem.tsx
@@ -1,15 +1,11 @@
 import { Ionicons } from "@expo/vector-icons";
 import type { PropsWithChildren, ReactNode } from "react";
-import {
-  TouchableOpacity,
-  type TouchableOpacityProps,
-  View,
-  type ViewProps,
-} from "react-native";
+import { TouchableOpacity, View, type ViewProps } from "react-native";
 import { Text } from "../common/Text";

-interface Props extends TouchableOpacityProps, ViewProps {
+interface Props extends ViewProps {
  title?: string | null | undefined;
+  subtitle?: string | null | undefined;
  value?: string | null | undefined;
  children?: ReactNode;
  iconAfter?: ReactNode;
@@ -17,10 +13,12 @@ interface Props extends TouchableOpacityProps, ViewProps {
  showArrow?: boolean;
  textColor?: "default" | "blue" | "red";
  onPress?: () => void;
+  disabled?: boolean;
 }

 export const ListItem: React.FC<PropsWithChildren<Props>> = ({
  title,
+  subtitle,
  value,
  iconAfter,
  children,
@@ -29,7 +27,7 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
  textColor = "default",
  onPress,
  disabled = false,
-  ...props
+  ...viewProps
 }) => {
  if (onPress)
    return (
@@ -39,10 +37,11 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
        className={`flex flex-row items-center justify-between bg-neutral-900 h-11 pr-4 pl-4 ${
          disabled ? "opacity-50" : ""
        }`}
-        {...props}
+        {...(viewProps as any)}
      >
        <ListItemContent
          title={title}
+          subtitle={subtitle}
          value={value}
          icon={icon}
          textColor={textColor}
@@ -58,10 +57,11 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
      className={`flex flex-row items-center justify-between bg-neutral-900 h-11 pr-4 pl-4 ${
        disabled ? "opacity-50" : ""
      }`}
-      {...props}
+      {...viewProps}
    >
      <ListItemContent
        title={title}
+        subtitle={subtitle}
        value={value}
        icon={icon}
        textColor={textColor}
@@ -76,6 +76,7 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({

 const ListItemContent = ({
  title,
+  subtitle,
  textColor,
  icon,
  value,
@@ -91,18 +92,25 @@ const ListItemContent = ({
            <Ionicons name='person-circle-outline' size={18} color='white' />
          </View>
        )}
-        <Text
-          className={
-            textColor === "blue"
-              ? "text-[#0584FE]"
-              : textColor === "red"
-                ? "text-red-600"
-                : "text-white"
-          }
-          numberOfLines={1}
-        >
-          {title}
-        </Text>
+        <View className='flex-1'>
+          <Text
+            className={
+              textColor === "blue"
+                ? "text-[#0584FE]"
+                : textColor === "red"
+                  ? "text-red-600"
+                  : "text-white"
+            }
+            numberOfLines={1}
+          >
+            {title}
+          </Text>
+          {subtitle && (
+            <Text className='text-[#9899A1] text-sm mt-0.5' numberOfLines={2}>
+              {subtitle}
+            </Text>
+          )}
+        </View>
        {value && (
          <View className='ml-auto items-end'>
            <Text selectable className=' text-[#9899A1]' numberOfLines={1}>
--- a/components/search/SearchItemWrapper.tsx
+++ b/components/search/SearchItemWrapper.tsx
@@ -7,7 +7,7 @@ import { Text } from "../common/Text";

 type SearchItemWrapperProps<T> = {
  items?: T[];
-  renderItem: (item: any) => React.ReactNode;
+  renderItem: (item: any) => React.ReactElement | null;
  header?: string;
  onEndReached?: (() => void) | null | undefined;
 };
@@ -35,11 +35,9 @@ export const SearchItemWrapper = <T,>({
        showsHorizontalScrollIndicator={false}
        keyExtractor={(_, index) => index.toString()}
        estimatedItemSize={250}
-        /*@ts-expect-error */
        data={items}
        onEndReachedThreshold={1}
        onEndReached={onEndReached}
-        //@ts-expect-error
        renderItem={({ item }) => (item ? renderItem(item) : null)}
      />
    </>
--- a/components/series/CastAndCrew.tsx
+++ b/components/series/CastAndCrew.tsx
@@ -48,7 +48,7 @@ export const CastAndCrew: React.FC<Props> = ({ item, loading, ...props }) => {
      </Text>
      <HorizontalScroll
        loading={loading}
-        keyExtractor={(i, _idx) => i.Id.toString()}
+        keyExtractor={(i, _idx) => i.Id?.toString() || ""}
        height={247}
        data={destinctPeople}
        renderItem={(i) => (
@@ -60,7 +60,7 @@ export const CastAndCrew: React.FC<Props> = ({ item, loading, ...props }) => {
            }}
            className='flex flex-col w-28'
          >
-            <Poster id={i.id} url={getPrimaryImageUrl({ api, item: i })} />
+            <Poster id={i.Id} url={getPrimaryImageUrl({ api, item: i })} />
            <Text className='mt-2'>{i.Name}</Text>
            <Text className='text-xs opacity-50'>{i.Role}</Text>
          </TouchableOpacity>
--- a/components/series/CurrentSeries.tsx
+++ b/components/series/CurrentSeries.tsx
@@ -28,15 +28,17 @@ export const CurrentSeries: React.FC<Props> = ({ item, ...props }) => {
        height={247}
        renderItem={(item, _index) => (
          <TouchableOpacity
-            key={item.Id}
-            onPress={() => router.push(`/series/${item.SeriesId}`)}
+            key={item?.Id}
+            onPress={() =>
+              item?.SeriesId && router.push(`/series/${item.SeriesId}`)
+            }
            className='flex flex-col space-y-2 w-28'
          >
            <Poster
-              id={item.id}
-              url={getPrimaryImageUrlById({ api, id: item.ParentId })}
+              id={item?.Id}
+              url={getPrimaryImageUrlById({ api, id: item?.ParentId })}
            />
-            <Text>{item.SeriesName}</Text>
+            <Text>{item?.SeriesName}</Text>
          </TouchableOpacity>
        )}
      />
--- a/components/series/EpisodeTitleHeader.tsx
+++ b/components/series/EpisodeTitleHeader.tsx
@@ -19,7 +19,6 @@ export const EpisodeTitleHeader: React.FC<Props> = ({ item, ...props }) => {
        <TouchableOpacity
          onPress={() => {
            router.push(
-              // @ts-expect-error
              `/(auth)/series/${item.SeriesId}?seasonIndex=${item?.ParentIndexNumber}`,
            );
          }}
--- a/components/series/JellyseerrSeasons.tsx
+++ b/components/series/JellyseerrSeasons.tsx
@@ -49,7 +49,7 @@ const JellyseerrSeasonEpisodes: React.FC<{
      showsHorizontalScrollIndicator={false}
      estimatedItemSize={50}
      data={seasonWithEpisodes?.episodes}
-      keyExtractor={(item) => item.id}
+      keyExtractor={(item) => item.id.toString()}
      renderItem={(item, index) => (
        <RenderItem key={index} item={item} index={index} />
      )}
--- a/components/settings/AppLanguageSelector.tsx
+++ b/components/settings/AppLanguageSelector.tsx
@@ -12,7 +12,7 @@ interface Props extends ViewProps {}

 export const AppLanguageSelector: React.FC<Props> = () => {
  const isTv = Platform.isTV;
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings] = useSettings(null);
  const { t } = useTranslation();

  if (isTv) return null;
--- a/components/settings/AudioToggles.tsx
+++ b/components/settings/AudioToggles.tsx
@@ -17,7 +17,7 @@ export const AudioToggles: React.FC<Props> = ({ ...props }) => {
  const isTv = Platform.isTV;

  const media = useMedia();
-  const [_, __, pluginSettings] = useSettings();
+  const [_, __, pluginSettings] = useSettings(null);
  const { settings, updateSettings } = media;
  const cultures = media.cultures;
  const { t } = useTranslation();
--- a/components/settings/ChromecastSettings.tsx
+++ b/components/settings/ChromecastSettings.tsx
@@ -4,7 +4,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

 export const ChromecastSettings: React.FC = ({ ...props }) => {
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings] = useSettings(null);
  return (
    <View {...props}>
      <ListGroup title={"Chromecast"}>
--- a/components/settings/Dashboard.tsx
+++ b/components/settings/Dashboard.tsx
@@ -7,7 +7,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

 export const Dashboard = () => {
-  const [settings, _updateSettings] = useSettings();
+  const [settings, _updateSettings] = useSettings(null);
  const { sessions = [] } = useSessions({} as useSessionsProps);
  const router = useRouter();

--- a/components/settings/DownloadSettings.tsx
+++ b/components/settings/DownloadSettings.tsx
@@ -7,7 +7,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

 export default function DownloadSettings({ ...props }) {
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);
  const { t } = useTranslation();

  const allDisabled = useMemo(
--- a/components/settings/GestureControls.tsx
+++ b/components/settings/GestureControls.tsx
@@ -0,0 +1,83 @@
+import type React from "react";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import type { ViewProps } from "react-native";
+import { Switch } from "react-native";
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import { useSettings } from "@/utils/atoms/settings";
+import { ListGroup } from "../list/ListGroup";
+import { ListItem } from "../list/ListItem";
+
+interface Props extends ViewProps {}
+
+export const GestureControls: React.FC<Props> = ({ ...props }) => {
+  const { t } = useTranslation();
+
+  const [settings, updateSettings, pluginSettings] = useSettings(null);
+
+  const disabled = useMemo(
+    () =>
+      pluginSettings?.enableHorizontalSwipeSkip?.locked === true &&
+      pluginSettings?.enableLeftSideBrightnessSwipe?.locked === true &&
+      pluginSettings?.enableRightSideVolumeSwipe?.locked === true,
+    [pluginSettings],
+  );
+
+  if (!settings) return null;
+
+  return (
+    <DisabledSetting disabled={disabled} {...props}>
+      <ListGroup
+        title={t("home.settings.gesture_controls.gesture_controls_title")}
+      >
+        <ListItem
+          title={t("home.settings.gesture_controls.horizontal_swipe_skip")}
+          subtitle={t(
+            "home.settings.gesture_controls.horizontal_swipe_skip_description",
+          )}
+          disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
+        >
+          <Switch
+            value={settings.enableHorizontalSwipeSkip}
+            disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
+            onValueChange={(enableHorizontalSwipeSkip) =>
+              updateSettings({ enableHorizontalSwipeSkip })
+            }
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.gesture_controls.left_side_brightness")}
+          subtitle={t(
+            "home.settings.gesture_controls.left_side_brightness_description",
+          )}
+          disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
+        >
+          <Switch
+            value={settings.enableLeftSideBrightnessSwipe}
+            disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
+            onValueChange={(enableLeftSideBrightnessSwipe) =>
+              updateSettings({ enableLeftSideBrightnessSwipe })
+            }
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.gesture_controls.right_side_volume")}
+          subtitle={t(
+            "home.settings.gesture_controls.right_side_volume_description",
+          )}
+          disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
+        >
+          <Switch
+            value={settings.enableRightSideVolumeSwipe}
+            disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
+            onValueChange={(enableRightSideVolumeSwipe) =>
+              updateSettings({ enableRightSideVolumeSwipe })
+            }
+          />
+        </ListItem>
+      </ListGroup>
+    </DisabledSetting>
+  );
+};
--- a/components/settings/HomeIndex.tsx
+++ b/components/settings/HomeIndex.tsx
@@ -70,7 +70,7 @@ export const HomeIndex = () => {
    _pluginSettings,
    _setPluginSettings,
    refreshStreamyfinPluginSettings,
-  ] = useSettings();
+  ] = useSettings(null);

  const [isConnected, setIsConnected] = useState<boolean | null>(null);
  const [loadingRetry, setLoadingRetry] = useState(false);
@@ -81,7 +81,7 @@ export const HomeIndex = () => {

  const scrollViewRef = useRef<ScrollView>(null);

-  const { downloadedFiles, cleanCacheDirectory } = useDownload();
+  const { getDownloadedItems, cleanCacheDirectory } = useDownload();
  const prevIsConnected = useRef<boolean | null>(false);
  const invalidateCache = useInvalidatePlaybackProgressCache();
  useEffect(() => {
@@ -100,7 +100,7 @@ export const HomeIndex = () => {
      });
      return;
    }
-    const hasDownloads = downloadedFiles && downloadedFiles.length > 0;
+    const hasDownloads = getDownloadedItems().length > 0;
    navigation.setOptions({
      headerLeft: () => (
        <TouchableOpacity
@@ -117,7 +117,7 @@ export const HomeIndex = () => {
        </TouchableOpacity>
      ),
    });
-  }, [downloadedFiles, navigation, router]);
+  }, [navigation, router]);

  useEffect(() => {
    cleanCacheDirectory().catch((_e) =>
@@ -338,10 +338,8 @@ export const HomeIndex = () => {
  const customSections = useMemo(() => {
    if (!api || !user?.Id || !settings?.home?.sections) return [];
    const ss: Section[] = [];
-    for (const key in settings.home?.sections) {
-      // @ts-expect-error
-      const section = settings.home?.sections[key];
-      const id = section.title || key;
+    for (const [index, section] of settings.home.sections.entries()) {
+      const id = section.items?.title || `section-${index}`;
      ss.push({
        title: id,
        queryKey: ["home", id],
@@ -363,10 +361,10 @@ export const HomeIndex = () => {
            const response = await getTvShowsApi(api).getNextUp({
              userId: user?.Id,
              fields: ["MediaSourceCount"],
-              limit: section.items?.limit || 25,
+              limit: section.nextUp?.limit || 25,
              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-              enableResumable: section.items?.enableResumable,
-              enableRewatching: section.items?.enableRewatching,
+              enableResumable: section.nextUp?.enableResumable,
+              enableRewatching: section.nextUp?.enableRewatching,
            });
            return response.data.Items || [];
          }
--- a/components/settings/Jellyseerr.tsx
+++ b/components/settings/Jellyseerr.tsx
@@ -20,7 +20,7 @@ export const JellyseerrSettings = () => {
  const { t } = useTranslation();

  const [user] = useAtom(userAtom);
-  const [settings, updateSettings, _pluginSettings] = useSettings();
+  const [settings, updateSettings, _pluginSettings] = useSettings(null);

  const [jellyseerrPassword, setJellyseerrPassword] = useState<
    string | undefined
--- a/components/settings/MediaContext.tsx
+++ b/components/settings/MediaContext.tsx
@@ -28,7 +28,7 @@ export const useMedia = () => {
 };

 export const MediaProvider = ({ children }: { children: ReactNode }) => {
-  const [settings, updateSettings] = useSettings();
+  const [settings, updateSettings] = useSettings(null);
  const api = useAtomValue(apiAtom);
  const queryClient = useQueryClient();

--- a/components/settings/MediaToggles.tsx
+++ b/components/settings/MediaToggles.tsx
@@ -13,7 +13,7 @@ interface Props extends ViewProps {}
 export const MediaToggles: React.FC<Props> = ({ ...props }) => {
  const { t } = useTranslation();

-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);

  const disabled = useMemo(
    () =>
--- a/components/settings/OtherSettings.tsx
+++ b/components/settings/OtherSettings.tsx
@@ -1,5 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useRouter } from "expo-router";
+import * as TaskManager from "expo-task-manager";
 import { TFunction } from "i18next";
 import type React from "react";
 import { useEffect, useMemo } from "react";
@@ -20,14 +21,9 @@ import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

-const BackgroundFetch = !Platform.isTV
-  ? require("expo-background-fetch")
-  : null;
-const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
-
 export const OtherSettings: React.FC = () => {
  const router = useRouter();
-  const [settings, updateSettings, pluginSettings] = useSettings();
+  const [settings, updateSettings, pluginSettings] = useSettings(null);

  const { t } = useTranslation();

@@ -35,10 +31,8 @@ export const OtherSettings: React.FC = () => {
   * Background task
   *******************/
  const checkStatusAsync = async () => {
-    if (Platform.isTV) return;
-
-    await BackgroundFetch.getStatusAsync();
-    return await TaskManager.isTaskRegisteredAsync(BACKGROUND_FETCH_TASK);
+    if (Platform.isTV) return false;
+    return TaskManager.isTaskRegisteredAsync(BACKGROUND_FETCH_TASK);
  };

  useEffect(() => {
--- a/components/settings/PluginSettings.tsx
+++ b/components/settings/PluginSettings.tsx
@@ -6,7 +6,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";

 export const PluginSettings = () => {
-  const [settings, _updateSettings] = useSettings();
+  const [settings, _updateSettings] = useSettings(null);

  const router = useRouter();

--- a/components/settings/StorageSettings.tsx
+++ b/components/settings/StorageSettings.tsx
@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
-import * as FileSystem from "expo-file-system";
 import { useTranslation } from "react-i18next";
-import { View } from "react-native";
+import { Platform, View } from "react-native";
 import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { Colors } from "@/constants/Colors";
@@ -21,10 +20,12 @@ export const StorageSettings = () => {
    queryFn: async () => {
      const app = await appSizeUsage();

-      const remaining = await FileSystem.getFreeDiskStorageAsync();
-      const total = await FileSystem.getTotalDiskCapacityAsync();
-
-      return { app, remaining, total, used: (total - remaining) / total };
+      return {
+        appSize: app.appSize,
+        total: app.total,
+        remaining: app.remaining,
+        used: (app.total - app.remaining) / app.total,
+      };
    },
  });

@@ -39,6 +40,7 @@ export const StorageSettings = () => {
  };

  const calculatePercentage = (value: number, total: number) => {
+    console.log("usage", value, total);
    return ((value / total) * 100).toFixed(2);
  };

@@ -61,13 +63,13 @@ export const StorageSettings = () => {
            <View className='flex flex-row'>
              <View
                style={{
-                  width: `${(size.app / size.total) * 100}%`,
+                  width: `${(size.appSize / size.total) * 100}%`,
                  backgroundColor: Colors.primaryRGB,
                }}
              />
              <View
                style={{
-                  width: `${((size.total - size.remaining - size.app) / size.total) * 100}%`,
+                  width: `${((size.total - size.remaining - size.appSize) / size.total) * 100}%`,
                  backgroundColor: Colors.primaryLightRGB,
                }}
              />
@@ -81,7 +83,7 @@ export const StorageSettings = () => {
                <View className='w-3 h-3 rounded-full bg-purple-600 mr-1' />
                <Text className='text-white text-xs'>
                  {t("home.settings.storage.app_usage", {
-                    usedSpace: calculatePercentage(size.app, size.total),
+                    usedSpace: calculatePercentage(size.appSize, size.total),
                  })}
                </Text>
              </View>
@@ -90,7 +92,7 @@ export const StorageSettings = () => {
                <Text className='text-white text-xs'>
                  {t("home.settings.storage.device_usage", {
                    availableSpace: calculatePercentage(
-                      size.total - size.remaining - size.app,
+                      size.total - size.remaining - size.appSize,
                      size.total,
                    ),
                  })}
@@ -100,13 +102,15 @@ export const StorageSettings = () => {
          )}
        </View>
      </View>
-      <ListGroup>
-        <ListItem
-          textColor='red'
-          onPress={onDeleteClicked}
-          title={t("home.settings.storage.delete_all_downloaded_files")}
-        />
-      </ListGroup>
+      {!Platform.isTV && (
+        <ListGroup>
+          <ListItem
+            textColor='red'
+            onPress={onDeleteClicked}
+            title={t("home.settings.storage.delete_all_downloaded_files")}
+          />
+        </ListGroup>
+      )}
    </View>
  );
 };
--- a/components/settings/SubtitleToggles.tsx
+++ b/components/settings/SubtitleToggles.tsx
@@ -20,7 +20,7 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
  const isTv = Platform.isTV;

  const media = useMedia();
-  const [_, __, pluginSettings] = useSettings();
+  const [_, __, pluginSettings] = useSettings(null);
  const { settings, updateSettings } = media;
  const cultures = media.cultures;
  const { t } = useTranslation();
--- a/components/video-player/controls/AudioSlider.tsx
+++ b/components/video-player/controls/AudioSlider.tsx
@@ -20,8 +20,9 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
  const volume = useSharedValue<number>(50); // Explicitly type as number
  const min = useSharedValue<number>(0); // Explicitly type as number
  const max = useSharedValue<number>(100); // Explicitly type as number
+  const isUserInteracting = useRef(false);

-  const timeoutRef = useRef<number | null>(null); // Use a ref to store the timeout ID
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null); // Use a ref to store the timeout ID

  useEffect(() => {
    if (isTv) return;
@@ -45,18 +46,33 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
  }, [isTv, volume]);

  const handleValueChange = async (value: number) => {
+    isUserInteracting.current = true;
    volume.value = value;
-    // await VolumeManager.setVolume(value / 100);
+
+    try {
+      await VolumeManager.setVolume(value / 100);
+    } catch (error) {
+      console.error("Error setting volume:", error);
+    }

    // Re-call showNativeVolumeUI to ensure the setting is applied on iOS
    VolumeManager.showNativeVolumeUI({ enabled: false });
+
+    // Reset interaction flag after a delay
+    setTimeout(() => {
+      isUserInteracting.current = false;
+    }, 100);
  };

  useEffect(() => {
    if (isTv) return;
    const _volumeListener = VolumeManager.addVolumeListener(
      (result: VolumeResult) => {
-        volume.value = result.volume * 100;
+        // Only update if user is not currently interacting with the slider
+        if (!isUserInteracting.current) {
+          volume.value = result.volume * 100;
+        }
+
        setVisibility(true);

        // Clear any existing timeout
@@ -79,7 +95,7 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {
    };
  }, [isTv, volume, setVisibility]);

-  if (isTv) return;
+  if (isTv) return null;

  return (
    <View style={styles.sliderContainer}>
@@ -113,7 +129,7 @@ const AudioSlider: React.FC<AudioSliderProps> = ({ setVisibility }) => {

 const styles = StyleSheet.create({
  sliderContainer: {
-    width: 150,
+    width: 130,
    display: "flex",
    flexDirection: "row",
    justifyContent: "center",
--- a/components/video-player/controls/BottomControls.tsx
+++ b/components/video-player/controls/BottomControls.tsx
@@ -0,0 +1,220 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import type { FC } from "react";
+import { View } from "react-native";
+import { Slider } from "react-native-awesome-slider";
+import { type SharedValue } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { useSettings } from "@/utils/atoms/settings";
+import NextEpisodeCountDownButton from "./NextEpisodeCountDownButton";
+import SkipButton from "./SkipButton";
+import { TimeDisplay } from "./TimeDisplay";
+import { TrickplayBubble } from "./TrickplayBubble";
+
+interface BottomControlsProps {
+  item: BaseItemDto;
+  showControls: boolean;
+  isSliding: boolean;
+  showRemoteBubble: boolean;
+  currentTime: number;
+  remainingTime: number;
+  isVlc: boolean;
+  showSkipButton: boolean;
+  showSkipCreditButton: boolean;
+  skipIntro: () => void;
+  skipCredit: () => void;
+  nextItem?: BaseItemDto | null;
+  handleNextEpisodeAutoPlay: () => void;
+  handleNextEpisodeManual: () => void;
+  handleControlsInteraction: () => void;
+
+  // Slider props
+  min: SharedValue<number>;
+  max: SharedValue<number>;
+  effectiveProgress: SharedValue<number>;
+  cacheProgress: SharedValue<number>;
+  handleSliderStart: () => void;
+  handleSliderComplete: (value: number) => void;
+  handleSliderChange: (value: number) => void;
+  handleTouchStart: () => void;
+  handleTouchEnd: () => void;
+
+  // Trickplay props
+  trickPlayUrl: {
+    x: number;
+    y: number;
+    url: string;
+  } | null;
+  trickplayInfo: {
+    aspectRatio?: number;
+    data: {
+      TileWidth?: number;
+      TileHeight?: number;
+    };
+  } | null;
+  time: {
+    hours: number;
+    minutes: number;
+    seconds: number;
+  };
+}
+
+export const BottomControls: FC<BottomControlsProps> = ({
+  item,
+  showControls,
+  isSliding,
+  showRemoteBubble,
+  currentTime,
+  remainingTime,
+  isVlc,
+  showSkipButton,
+  showSkipCreditButton,
+  skipIntro,
+  skipCredit,
+  nextItem,
+  handleNextEpisodeAutoPlay,
+  handleNextEpisodeManual,
+  handleControlsInteraction,
+  min,
+  max,
+  effectiveProgress,
+  cacheProgress,
+  handleSliderStart,
+  handleSliderComplete,
+  handleSliderChange,
+  handleTouchStart,
+  handleTouchEnd,
+  trickPlayUrl,
+  trickplayInfo,
+  time,
+}) => {
+  const [settings] = useSettings(null);
+  const insets = useSafeAreaInsets();
+
+  return (
+    <View
+      style={[
+        {
+          position: "absolute",
+          right: settings?.safeAreaInControlsEnabled ? insets.right : 0,
+          left: settings?.safeAreaInControlsEnabled ? insets.left : 0,
+          bottom: settings?.safeAreaInControlsEnabled
+            ? Math.max(insets.bottom - 17, 0)
+            : 0,
+        },
+      ]}
+      className={"flex flex-col px-2"}
+      onTouchStart={handleControlsInteraction}
+    >
+      <View
+        className='shrink flex flex-col justify-center h-full'
+        style={{
+          flexDirection: "row",
+          justifyContent: "space-between",
+        }}
+      >
+        <View
+          style={{
+            flexDirection: "column",
+            alignSelf: "flex-end",
+          }}
+          pointerEvents={showControls ? "box-none" : "none"}
+        >
+          {item?.Type === "Episode" && (
+            <Text className='opacity-50'>
+              {`${item.SeriesName} - ${item.SeasonName} Episode ${item.IndexNumber}`}
+            </Text>
+          )}
+          <Text className='font-bold text-xl'>{item?.Name}</Text>
+          {item?.Type === "Movie" && (
+            <Text className='text-xs opacity-50'>{item?.ProductionYear}</Text>
+          )}
+          {item?.Type === "Audio" && (
+            <Text className='text-xs opacity-50'>{item?.Album}</Text>
+          )}
+        </View>
+        <View className='flex flex-row space-x-2'>
+          <SkipButton
+            showButton={showSkipButton}
+            onPress={skipIntro}
+            buttonText='Skip Intro'
+          />
+          <SkipButton
+            showButton={showSkipCreditButton}
+            onPress={skipCredit}
+            buttonText='Skip Credits'
+          />
+          {(settings.maxAutoPlayEpisodeCount.value === -1 ||
+            settings.autoPlayEpisodeCount <
+              settings.maxAutoPlayEpisodeCount.value) && (
+            <NextEpisodeCountDownButton
+              show={
+                !nextItem
+                  ? false
+                  : isVlc
+                    ? remainingTime < 10000
+                    : remainingTime < 10
+              }
+              onFinish={handleNextEpisodeAutoPlay}
+              onPress={handleNextEpisodeManual}
+            />
+          )}
+        </View>
+      </View>
+      <View
+        className={"flex flex-col-reverse rounded-lg items-center my-2"}
+        pointerEvents={showControls ? "box-none" : "none"}
+      >
+        <View className={"flex flex-col w-full shrink"}>
+          <View
+            style={{
+              height: 10,
+              justifyContent: "center",
+              alignItems: "stretch",
+            }}
+            onTouchStart={handleTouchStart}
+            onTouchEnd={handleTouchEnd}
+          >
+            <Slider
+              theme={{
+                maximumTrackTintColor: "rgba(255,255,255,0.2)",
+                minimumTrackTintColor: "#fff",
+                cacheTrackTintColor: "rgba(255,255,255,0.3)",
+                bubbleBackgroundColor: "#fff",
+                bubbleTextColor: "#666",
+                heartbeatColor: "#999",
+              }}
+              renderThumb={() => null}
+              cache={cacheProgress}
+              onSlidingStart={handleSliderStart}
+              onSlidingComplete={handleSliderComplete}
+              onValueChange={handleSliderChange}
+              containerStyle={{
+                borderRadius: 100,
+              }}
+              renderBubble={() =>
+                (isSliding || showRemoteBubble) && (
+                  <TrickplayBubble
+                    trickPlayUrl={trickPlayUrl}
+                    trickplayInfo={trickplayInfo}
+                    time={time}
+                  />
+                )
+              }
+              sliderHeight={10}
+              thumbWidth={0}
+              progress={effectiveProgress}
+              minimumValue={min}
+              maximumValue={max}
+            />
+          </View>
+          <TimeDisplay
+            currentTime={currentTime}
+            remainingTime={remainingTime}
+            isVlc={isVlc}
+          />
+        </View>
+      </View>
+    </View>
+  );
+};
--- a/components/video-player/controls/BrightnessSlider.tsx
+++ b/components/video-player/controls/BrightnessSlider.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { Platform, StyleSheet, View } from "react-native";
 import { Slider } from "react-native-awesome-slider";
 import { useSharedValue } from "react-native-reanimated";
@@ -14,22 +14,59 @@ const BrightnessSlider = () => {
  const brightness = useSharedValue(50);
  const min = useSharedValue(0);
  const max = useSharedValue(100);
+  const isUserInteracting = useRef(false);
+  const lastKnownBrightness = useRef<number>(50);
+
+  // Update brightness from device
+  const updateBrightnessFromDevice = async () => {
+    if (isTv || !Brightness || isUserInteracting.current) return;
+
+    try {
+      const currentBrightness = await Brightness.getBrightnessAsync();
+      const brightnessPercent = Math.round(currentBrightness * 100);
+
+      // Only update if brightness actually changed
+      if (Math.abs(brightnessPercent - lastKnownBrightness.current) > 1) {
+        brightness.value = brightnessPercent;
+        lastKnownBrightness.current = brightnessPercent;
+      }
+    } catch (error) {
+      console.error("Error fetching brightness:", error);
+    }
+  };

  useEffect(() => {
    if (isTv) return;
-    const fetchInitialBrightness = async () => {
-      const initialBrightness = await Brightness.getBrightnessAsync();
-      brightness.value = initialBrightness * 100;
+
+    // Initial brightness fetch
+    updateBrightnessFromDevice();
+
+    // Set up periodic brightness checking to sync with gesture changes
+    const interval = setInterval(updateBrightnessFromDevice, 200); // Check every 200ms
+
+    return () => {
+      clearInterval(interval);
    };
-    fetchInitialBrightness();
-  }, [brightness, isTv]);
+  }, [isTv]);

  const handleValueChange = async (value: number) => {
+    isUserInteracting.current = true;
    brightness.value = value;
-    await Brightness.setBrightnessAsync(value / 100);
+    lastKnownBrightness.current = value;
+
+    try {
+      await Brightness.setBrightnessAsync(value / 100);
+    } catch (error) {
+      console.error("Error setting brightness:", error);
+    }
+
+    // Reset interaction flag after a delay
+    setTimeout(() => {
+      isUserInteracting.current = false;
+    }, 100);
  };

-  if (isTv) return;
+  if (isTv) return null;

  return (
    <View style={styles.sliderContainer}>
@@ -63,7 +100,7 @@ const BrightnessSlider = () => {

 const styles = StyleSheet.create({
  sliderContainer: {
-    width: 150,
+    width: 130,
    display: "flex",
    flexDirection: "row",
    justifyContent: "center",
--- a/components/video-player/controls/CenterControls.tsx
+++ b/components/video-player/controls/CenterControls.tsx
@@ -0,0 +1,152 @@
+import { Ionicons } from "@expo/vector-icons";
+import type { FC } from "react";
+import { Platform, TouchableOpacity, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Text } from "@/components/common/Text";
+import { Loader } from "@/components/Loader";
+import { useSettings } from "@/utils/atoms/settings";
+import AudioSlider from "./AudioSlider";
+import BrightnessSlider from "./BrightnessSlider";
+import { ICON_SIZES } from "./constants";
+
+interface CenterControlsProps {
+  showControls: boolean;
+  isPlaying: boolean;
+  isBuffering: boolean;
+  showAudioSlider: boolean;
+  setShowAudioSlider: (show: boolean) => void;
+  togglePlay: () => void;
+  handleSkipBackward: () => void;
+  handleSkipForward: () => void;
+}
+
+export const CenterControls: FC<CenterControlsProps> = ({
+  showControls,
+  isPlaying,
+  isBuffering,
+  showAudioSlider,
+  setShowAudioSlider,
+  togglePlay,
+  handleSkipBackward,
+  handleSkipForward,
+}) => {
+  const [settings] = useSettings(null);
+  const insets = useSafeAreaInsets();
+
+  return (
+    <View
+      style={{
+        position: "absolute",
+        top: "50%",
+        left: settings?.safeAreaInControlsEnabled ? insets.left : 0,
+        right: settings?.safeAreaInControlsEnabled ? insets.right : 0,
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        transform: [{ translateY: -22.5 }],
+        paddingHorizontal: "28%",
+      }}
+      pointerEvents={showControls ? "box-none" : "none"}
+    >
+      <View
+        style={{
+          position: "absolute",
+          alignItems: "center",
+          transform: [{ rotate: "270deg" }],
+          left: 0,
+          bottom: 30,
+        }}
+      >
+        <BrightnessSlider />
+      </View>
+
+      {!Platform.isTV && (
+        <TouchableOpacity onPress={handleSkipBackward}>
+          <View
+            style={{
+              position: "relative",
+              justifyContent: "center",
+              alignItems: "center",
+            }}
+          >
+            <Ionicons
+              name='refresh-outline'
+              size={ICON_SIZES.CENTER}
+              color='white'
+              style={{
+                transform: [{ scaleY: -1 }, { rotate: "180deg" }],
+              }}
+            />
+            <Text
+              style={{
+                position: "absolute",
+                color: "white",
+                fontSize: 16,
+                fontWeight: "bold",
+                bottom: 10,
+              }}
+            >
+              {settings?.rewindSkipTime}
+            </Text>
+          </View>
+        </TouchableOpacity>
+      )}
+
+      <View style={Platform.isTV ? { flex: 1, alignItems: "center" } : {}}>
+        <TouchableOpacity onPress={togglePlay}>
+          {!isBuffering ? (
+            <Ionicons
+              name={isPlaying ? "pause" : "play"}
+              size={ICON_SIZES.CENTER}
+              color='white'
+            />
+          ) : (
+            <Loader size={"large"} />
+          )}
+        </TouchableOpacity>
+      </View>
+
+      {!Platform.isTV && (
+        <TouchableOpacity onPress={handleSkipForward}>
+          <View
+            style={{
+              position: "relative",
+              justifyContent: "center",
+              alignItems: "center",
+            }}
+          >
+            <Ionicons
+              name='refresh-outline'
+              size={ICON_SIZES.CENTER}
+              color='white'
+            />
+            <Text
+              style={{
+                position: "absolute",
+                color: "white",
+                fontSize: 16,
+                fontWeight: "bold",
+                bottom: 10,
+              }}
+            >
+              {settings?.forwardSkipTime}
+            </Text>
+          </View>
+        </TouchableOpacity>
+      )}
+
+      <View
+        style={{
+          position: "absolute",
+          alignItems: "center",
+          transform: [{ rotate: "270deg" }],
+          bottom: 30,
+          right: 0,
+          opacity: showAudioSlider || showControls ? 1 : 0,
+        }}
+      >
+        <AudioSlider setVisibility={setShowAudioSlider} />
+      </View>
+    </View>
+  );
+};
--- a/components/video-player/controls/ContinueWatchingOverlay.tsx
+++ b/components/video-player/controls/ContinueWatchingOverlay.tsx
@@ -16,7 +16,7 @@ export interface ContinueWatchingOverlayProps {
 const ContinueWatchingOverlay: React.FC<ContinueWatchingOverlayProps> = ({
  goToNextItem,
 }) => {
-  const [settings] = useSettings();
+  const [settings] = useSettings(null);
  const router = useRouter();

  return settings.autoPlayEpisodeCount >=
--- a/components/video-player/controls/Controls.tsx
+++ b/components/video-player/controls/Controls.tsx
--- a/components/video-player/controls/EpisodeList.tsx
+++ b/components/video-player/controls/EpisodeList.tsx
@@ -220,6 +220,7 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
        <HorizontalScroll
          ref={scrollViewRef}
          data={episodes}
+          height={800}
          extraData={item}
          // Note otherItem is the item that is being rendered, not the item that is currently selected
          renderItem={(otherItem, _idx) => (
@@ -227,7 +228,7 @@ export const EpisodeList: React.FC<Props> = ({ item, close, goToItem }) => {
              key={otherItem.Id}
              style={{}}
              className={`flex flex-col w-44 ${
-                item.Id !== otherItem.Id ? "opacity-75" : ""
+                item.Id !== otherItem.Id ? "opacity-50" : ""
              }`}
            >
              <TouchableOpacity
--- a/components/video-player/controls/GestureOverlay.tsx
+++ b/components/video-player/controls/GestureOverlay.tsx
@@ -0,0 +1,335 @@
+import { Ionicons } from "@expo/vector-icons";
+import { useCallback, useRef, useState } from "react";
+import { Animated, Pressable } from "react-native";
+import { Text } from "@/components/common/Text";
+import { useHaptic } from "@/hooks/useHaptic";
+import { useSettings } from "@/utils/atoms/settings";
+import { useGestureDetection } from "./hooks/useGestureDetection";
+import { useVolumeAndBrightness } from "./hooks/useVolumeAndBrightness";
+
+interface Props {
+  screenWidth: number;
+  screenHeight: number;
+  showControls: boolean;
+  onToggleControls: () => void;
+  onSkipForward: () => void;
+  onSkipBackward: () => void;
+}
+
+interface FeedbackState {
+  visible: boolean;
+  icon: string;
+  text: string;
+  side?: "left" | "right";
+}
+
+export const GestureOverlay = ({
+  screenWidth,
+  screenHeight,
+  showControls,
+  onToggleControls,
+  onSkipForward,
+  onSkipBackward,
+}: Props) => {
+  const [settings] = useSettings(null);
+  const lightHaptic = useHaptic("light");
+
+  const [feedback, setFeedback] = useState<FeedbackState>({
+    visible: false,
+    icon: "",
+    text: "",
+  });
+  const [fadeAnim] = useState(new Animated.Value(0));
+  const isDraggingRef = useRef(false);
+  const hideTimeoutRef = useRef<number | null>(null);
+  const lastUpdateTime = useRef(0);
+
+  const showFeedback = useCallback(
+    (
+      icon: string,
+      text: string,
+      side?: "left" | "right",
+      isDuringDrag = false,
+    ) => {
+      // Clear any existing timeout
+      if (hideTimeoutRef.current) {
+        clearTimeout(hideTimeoutRef.current);
+        hideTimeoutRef.current = null;
+      }
+
+      // Defer ALL state updates to avoid useInsertionEffect warning
+      requestAnimationFrame(() => {
+        setFeedback({ visible: true, icon, text, side });
+
+        if (!isDuringDrag) {
+          // For discrete actions (like skip), show normal animation
+          Animated.sequence([
+            Animated.timing(fadeAnim, {
+              toValue: 1,
+              duration: 200,
+              useNativeDriver: true,
+            }),
+            Animated.delay(1000),
+            Animated.timing(fadeAnim, {
+              toValue: 0,
+              duration: 300,
+              useNativeDriver: true,
+            }),
+          ]).start(() => {
+            requestAnimationFrame(() => {
+              setFeedback((prev) => ({ ...prev, visible: false }));
+            });
+          });
+        } else if (!isDraggingRef.current) {
+          // For drag start, just fade in and stay visible
+          isDraggingRef.current = true;
+          Animated.timing(fadeAnim, {
+            toValue: 1,
+            duration: 200,
+            useNativeDriver: true,
+          }).start();
+        }
+        // For drag updates, just update the state, don't restart animation
+      });
+    },
+    [fadeAnim],
+  );
+
+  const hideDragFeedback = useCallback(() => {
+    isDraggingRef.current = false;
+
+    // Delay hiding slightly to avoid flicker
+    hideTimeoutRef.current = setTimeout(() => {
+      Animated.timing(fadeAnim, {
+        toValue: 0,
+        duration: 300,
+        useNativeDriver: true,
+      }).start(() => {
+        requestAnimationFrame(() => {
+          setFeedback((prev) => ({ ...prev, visible: false }));
+        });
+      });
+    }, 100) as unknown as number;
+  }, [fadeAnim]);
+
+  const {
+    startVolumeDrag,
+    updateVolumeDrag,
+    endVolumeDrag,
+    startBrightnessDrag,
+    updateBrightnessDrag,
+    endBrightnessDrag,
+  } = useVolumeAndBrightness({
+    onVolumeChange: (volume: number) => {
+      // Throttle feedback updates during dragging to reduce callback frequency
+      const now = Date.now();
+      if (now - lastUpdateTime.current < 50) return; // 50ms throttle
+      lastUpdateTime.current = now;
+
+      // Defer feedback update to avoid useInsertionEffect warning
+      requestAnimationFrame(() => {
+        showFeedback("volume-high", `${volume}%`, "right", true);
+      });
+    },
+    onBrightnessChange: (brightness: number) => {
+      // Throttle feedback updates during dragging to reduce callback frequency
+      const now = Date.now();
+      if (now - lastUpdateTime.current < 50) return; // 50ms throttle
+      lastUpdateTime.current = now;
+
+      // Defer feedback update to avoid useInsertionEffect warning
+      requestAnimationFrame(() => {
+        showFeedback("sunny", `${brightness}%`, "left", true);
+      });
+    },
+  });
+
+  const handleSkipForward = useCallback(() => {
+    if (!settings.enableHorizontalSwipeSkip) return;
+    lightHaptic();
+    // Defer all actions to avoid useInsertionEffect warning
+    requestAnimationFrame(() => {
+      onSkipForward();
+      showFeedback("play-forward", `+${settings.forwardSkipTime}s`);
+    });
+  }, [
+    settings.enableHorizontalSwipeSkip,
+    settings.forwardSkipTime,
+    lightHaptic,
+    onSkipForward,
+    showFeedback,
+  ]);
+
+  const handleSkipBackward = useCallback(() => {
+    if (!settings.enableHorizontalSwipeSkip) return;
+    lightHaptic();
+    // Defer all actions to avoid useInsertionEffect warning
+    requestAnimationFrame(() => {
+      onSkipBackward();
+      showFeedback("play-back", `-${settings.rewindSkipTime}s`);
+    });
+  }, [
+    settings.enableHorizontalSwipeSkip,
+    settings.rewindSkipTime,
+    lightHaptic,
+    onSkipBackward,
+    showFeedback,
+  ]);
+
+  const handleVerticalDragStart = useCallback(
+    (side: "left" | "right", startY: number) => {
+      if (side === "left" && settings.enableLeftSideBrightnessSwipe) {
+        lightHaptic();
+        // Defer drag start to avoid useInsertionEffect warning
+        requestAnimationFrame(() => {
+          startBrightnessDrag(startY);
+        });
+      } else if (side === "right" && settings.enableRightSideVolumeSwipe) {
+        lightHaptic();
+        // Defer drag start to avoid useInsertionEffect warning
+        requestAnimationFrame(() => {
+          startVolumeDrag(startY);
+        });
+      }
+    },
+    [
+      settings.enableLeftSideBrightnessSwipe,
+      settings.enableRightSideVolumeSwipe,
+      lightHaptic,
+      startBrightnessDrag,
+      startVolumeDrag,
+    ],
+  );
+
+  const handleVerticalDragMove = useCallback(
+    (side: "left" | "right", deltaY: number) => {
+      // Use requestAnimationFrame to defer drag move updates too
+      requestAnimationFrame(() => {
+        if (side === "left" && settings.enableLeftSideBrightnessSwipe) {
+          updateBrightnessDrag(deltaY);
+        } else if (side === "right" && settings.enableRightSideVolumeSwipe) {
+          updateVolumeDrag(deltaY);
+        }
+      });
+    },
+    [
+      settings.enableLeftSideBrightnessSwipe,
+      settings.enableRightSideVolumeSwipe,
+      updateBrightnessDrag,
+      updateVolumeDrag,
+    ],
+  );
+
+  const handleVerticalDragEnd = useCallback(
+    (side: "left" | "right") => {
+      // Defer drag end to avoid useInsertionEffect warning
+      requestAnimationFrame(() => {
+        if (side === "left") {
+          endBrightnessDrag();
+        } else {
+          endVolumeDrag();
+        }
+        hideDragFeedback();
+      });
+    },
+    [endBrightnessDrag, endVolumeDrag, hideDragFeedback],
+  );
+
+  const { handleTouchStart, handleTouchMove, handleTouchEnd } =
+    useGestureDetection({
+      onSwipeLeft: handleSkipBackward,
+      onSwipeRight: handleSkipForward,
+      onVerticalDragStart: handleVerticalDragStart,
+      onVerticalDragMove: handleVerticalDragMove,
+      onVerticalDragEnd: handleVerticalDragEnd,
+      onTap: onToggleControls,
+      screenWidth,
+      screenHeight,
+    });
+
+  // If controls are visible, act like the old tap overlay
+  if (showControls) {
+    return (
+      <Pressable
+        onPress={onToggleControls}
+        style={{
+          position: "absolute",
+          width: screenWidth,
+          height: screenHeight,
+          backgroundColor: "black",
+          left: 0,
+          right: 0,
+          top: 0,
+          bottom: 0,
+          opacity: 0.75,
+        }}
+      />
+    );
+  }
+
+  return (
+    <>
+      {/* Gesture detection area */}
+      <Pressable
+        onTouchStart={handleTouchStart}
+        onTouchMove={handleTouchMove}
+        onTouchEnd={handleTouchEnd}
+        style={{
+          position: "absolute",
+          width: screenWidth,
+          height: screenHeight,
+          backgroundColor: "transparent",
+          left: 0,
+          right: 0,
+          top: 0,
+          bottom: 0,
+        }}
+      />
+
+      {/* Feedback overlay */}
+      {feedback.visible && (
+        <Animated.View
+          style={{
+            position: "absolute",
+            top: "50%",
+            left:
+              feedback.side === "left"
+                ? "20%"
+                : feedback.side === "right"
+                  ? "80%"
+                  : "50%",
+            transform: [
+              { translateY: -25 },
+              {
+                translateX:
+                  feedback.side === "right"
+                    ? -50
+                    : feedback.side === "left"
+                      ? 0
+                      : -50,
+              },
+            ],
+            backgroundColor: "rgba(0, 0, 0, 0.8)",
+            paddingHorizontal: 16,
+            paddingVertical: 12,
+            borderRadius: 8,
+            flexDirection: "row",
+            alignItems: "center",
+            opacity: fadeAnim,
+            zIndex: 20,
+          }}
+        >
+          <Ionicons
+            name={feedback.icon as any}
+            size={24}
+            color='white'
+            style={{ marginRight: 8 }}
+          />
+          <Text style={{ color: "white", fontSize: 16, fontWeight: "600" }}>
+            {feedback.text}
+          </Text>
+        </Animated.View>
+      )}
+    </>
+  );
+};
--- a/components/video-player/controls/HeaderControls.tsx
+++ b/components/video-player/controls/HeaderControls.tsx
@@ -0,0 +1,194 @@
+import { Ionicons, MaterialIcons } from "@expo/vector-icons";
+import type {
+  BaseItemDto,
+  MediaSourceInfo,
+} from "@jellyfin/sdk/lib/generated-client";
+import { useRouter } from "expo-router";
+import { type Dispatch, type FC, type SetStateAction } from "react";
+import {
+  Platform,
+  TouchableOpacity,
+  useWindowDimensions,
+  View,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useHaptic } from "@/hooks/useHaptic";
+import { useSettings, VideoPlayer } from "@/utils/atoms/settings";
+import { ICON_SIZES } from "./constants";
+import { VideoProvider } from "./contexts/VideoContext";
+import DropdownView from "./dropdown/DropdownView";
+import { type ScaleFactor, ScaleFactorSelector } from "./ScaleFactorSelector";
+import {
+  type AspectRatio,
+  AspectRatioSelector,
+} from "./VideoScalingModeSelector";
+
+interface HeaderControlsProps {
+  item: BaseItemDto;
+  showControls: boolean;
+  offline: boolean;
+  mediaSource?: MediaSourceInfo | null;
+  startPictureInPicture?: () => Promise<void>;
+  switchOnEpisodeMode: () => void;
+  goToPreviousItem: () => void;
+  goToNextItem: (options: { isAutoPlay?: boolean }) => void;
+  previousItem?: BaseItemDto | null;
+  nextItem?: BaseItemDto | null;
+  getAudioTracks?: (() => Promise<any[] | null>) | (() => any[]);
+  getSubtitleTracks?: (() => Promise<any[] | null>) | (() => any[]);
+  setAudioTrack?: (index: number) => void;
+  setSubtitleTrack?: (index: number) => void;
+  setSubtitleURL?: (url: string, customName: string) => void;
+  aspectRatio?: AspectRatio;
+  scaleFactor?: ScaleFactor;
+  setAspectRatio?: Dispatch<SetStateAction<AspectRatio>>;
+  setScaleFactor?: Dispatch<SetStateAction<ScaleFactor>>;
+  setVideoAspectRatio?: (aspectRatio: string | null) => Promise<void>;
+  setVideoScaleFactor?: (scaleFactor: number) => Promise<void>;
+}
+
+export const HeaderControls: FC<HeaderControlsProps> = ({
+  item,
+  showControls,
+  offline,
+  mediaSource,
+  startPictureInPicture,
+  switchOnEpisodeMode,
+  goToPreviousItem,
+  goToNextItem,
+  previousItem,
+  nextItem,
+  getAudioTracks,
+  getSubtitleTracks,
+  setAudioTrack,
+  setSubtitleTrack,
+  setSubtitleURL,
+  aspectRatio = "default",
+  scaleFactor = 1.0,
+  setAspectRatio,
+  setScaleFactor,
+  setVideoAspectRatio,
+  setVideoScaleFactor,
+}) => {
+  const [settings] = useSettings(null);
+  const router = useRouter();
+  const insets = useSafeAreaInsets();
+  const { width: screenWidth } = useWindowDimensions();
+  const lightHapticFeedback = useHaptic("light");
+
+  const handleAspectRatioChange = async (newRatio: AspectRatio) => {
+    if (!setAspectRatio || !setVideoAspectRatio) return;
+
+    setAspectRatio(newRatio);
+    const aspectRatioString = newRatio === "default" ? null : newRatio;
+    await setVideoAspectRatio(aspectRatioString);
+  };
+
+  const handleScaleFactorChange = async (newScale: ScaleFactor) => {
+    if (!setScaleFactor || !setVideoScaleFactor) return;
+
+    setScaleFactor(newScale);
+    await setVideoScaleFactor(newScale);
+  };
+
+  const onClose = async () => {
+    lightHapticFeedback();
+    router.back();
+  };
+
+  return (
+    <View
+      style={[
+        {
+          position: "absolute",
+          top: settings?.safeAreaInControlsEnabled ? insets.top : 0,
+          right: settings?.safeAreaInControlsEnabled ? insets.right : 0,
+          width: settings?.safeAreaInControlsEnabled
+            ? screenWidth - insets.left - insets.right
+            : screenWidth,
+        },
+      ]}
+      pointerEvents={showControls ? "auto" : "none"}
+      className={"flex flex-row w-full pt-2"}
+    >
+      <View className='mr-auto'>
+        {!Platform.isTV && (!offline || !mediaSource?.TranscodingUrl) && (
+          <VideoProvider
+            getAudioTracks={getAudioTracks}
+            getSubtitleTracks={getSubtitleTracks}
+            setAudioTrack={setAudioTrack}
+            setSubtitleTrack={setSubtitleTrack}
+            setSubtitleURL={setSubtitleURL}
+          >
+            <DropdownView />
+          </VideoProvider>
+        )}
+      </View>
+
+      <View className='flex flex-row items-center space-x-2'>
+        {!Platform.isTV &&
+          (settings.defaultPlayer === VideoPlayer.VLC_4 ||
+            Platform.OS === "android") && (
+            <TouchableOpacity
+              onPress={startPictureInPicture}
+              className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+            >
+              <MaterialIcons
+                name='picture-in-picture'
+                size={ICON_SIZES.HEADER}
+                color='white'
+              />
+            </TouchableOpacity>
+          )}
+        {item?.Type === "Episode" && (
+          <TouchableOpacity
+            onPress={switchOnEpisodeMode}
+            className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+          >
+            <Ionicons name='list' size={ICON_SIZES.HEADER} color='white' />
+          </TouchableOpacity>
+        )}
+        {previousItem && (
+          <TouchableOpacity
+            onPress={goToPreviousItem}
+            className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+          >
+            <Ionicons
+              name='play-skip-back'
+              size={ICON_SIZES.HEADER}
+              color='white'
+            />
+          </TouchableOpacity>
+        )}
+        {nextItem && (
+          <TouchableOpacity
+            onPress={() => goToNextItem({ isAutoPlay: false })}
+            className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+          >
+            <Ionicons
+              name='play-skip-forward'
+              size={ICON_SIZES.HEADER}
+              color='white'
+            />
+          </TouchableOpacity>
+        )}
+        <AspectRatioSelector
+          currentRatio={aspectRatio}
+          onRatioChange={handleAspectRatioChange}
+          disabled={!setVideoAspectRatio}
+        />
+        <ScaleFactorSelector
+          currentScale={scaleFactor}
+          onScaleChange={handleScaleFactorChange}
+          disabled={!setVideoScaleFactor}
+        />
+        <TouchableOpacity
+          onPress={onClose}
+          className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+        >
+          <Ionicons name='close' size={ICON_SIZES.HEADER} color='white' />
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+};
--- a/components/video-player/controls/ScaleFactorSelector.tsx
+++ b/components/video-player/controls/ScaleFactorSelector.tsx
@@ -0,0 +1,149 @@
+import { Ionicons } from "@expo/vector-icons";
+import React, { useState } from "react";
+import { Platform, TouchableOpacity } from "react-native";
+import { Text } from "@/components/common/Text";
+import { FilterSheet } from "@/components/filters/FilterSheet";
+import { useHaptic } from "@/hooks/useHaptic";
+
+export type ScaleFactor =
+  | 1.0
+  | 1.1
+  | 1.2
+  | 1.3
+  | 1.4
+  | 1.5
+  | 1.6
+  | 1.7
+  | 1.8
+  | 1.9
+  | 2.0;
+
+interface ScaleFactorSelectorProps {
+  currentScale: ScaleFactor;
+  onScaleChange: (scale: ScaleFactor) => void;
+  disabled?: boolean;
+}
+
+interface ScaleFactorOption {
+  id: ScaleFactor;
+  label: string;
+  description: string;
+}
+
+const SCALE_FACTOR_OPTIONS: ScaleFactorOption[] = [
+  {
+    id: 1.0,
+    label: "1.0x",
+    description: "Original size",
+  },
+  {
+    id: 1.1,
+    label: "1.1x",
+    description: "10% larger",
+  },
+  {
+    id: 1.2,
+    label: "1.2x",
+    description: "20% larger",
+  },
+  {
+    id: 1.3,
+    label: "1.3x",
+    description: "30% larger",
+  },
+  {
+    id: 1.4,
+    label: "1.4x",
+    description: "40% larger",
+  },
+  {
+    id: 1.5,
+    label: "1.5x",
+    description: "50% larger",
+  },
+  {
+    id: 1.6,
+    label: "1.6x",
+    description: "60% larger",
+  },
+  {
+    id: 1.7,
+    label: "1.7x",
+    description: "70% larger",
+  },
+  {
+    id: 1.8,
+    label: "1.8x",
+    description: "80% larger",
+  },
+  {
+    id: 1.9,
+    label: "1.9x",
+    description: "90% larger",
+  },
+  {
+    id: 2.0,
+    label: "2.0x",
+    description: "Double size",
+  },
+];
+
+export const ScaleFactorSelector: React.FC<ScaleFactorSelectorProps> = ({
+  currentScale,
+  onScaleChange,
+  disabled = false,
+}) => {
+  const lightHapticFeedback = useHaptic("light");
+  const [open, setOpen] = useState(false);
+
+  // Hide on TV platforms
+  if (Platform.isTV) return null;
+
+  const handleScaleSelect = (scale: ScaleFactor) => {
+    onScaleChange(scale);
+    lightHapticFeedback();
+  };
+
+  const currentOption = SCALE_FACTOR_OPTIONS.find(
+    (option) => option.id === currentScale,
+  );
+
+  return (
+    <>
+      <TouchableOpacity
+        disabled={disabled}
+        className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+        style={{ opacity: disabled ? 0.5 : 1 }}
+        onPress={() => setOpen(true)}
+      >
+        <Ionicons name='search-outline' size={24} color='white' />
+      </TouchableOpacity>
+
+      <FilterSheet
+        open={open}
+        setOpen={setOpen}
+        title='Scale Factor'
+        data={SCALE_FACTOR_OPTIONS}
+        values={currentOption ? [currentOption] : []}
+        multiple={false}
+        searchFilter={(item, query) => {
+          const option = item as ScaleFactorOption;
+          return (
+            option.label.toLowerCase().includes(query.toLowerCase()) ||
+            option.description.toLowerCase().includes(query.toLowerCase())
+          );
+        }}
+        renderItemLabel={(item) => {
+          const option = item as ScaleFactorOption;
+          return <Text>{option.label}</Text>;
+        }}
+        set={(vals) => {
+          const chosen = vals[0] as ScaleFactorOption | undefined;
+          if (chosen) {
+            handleScaleSelect(chosen.id);
+          }
+        }}
+      />
+    </>
+  );
+};
--- a/components/video-player/controls/TimeDisplay.tsx
+++ b/components/video-player/controls/TimeDisplay.tsx
@@ -0,0 +1,43 @@
+import type { FC } from "react";
+import { View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { formatTimeString } from "@/utils/time";
+
+interface TimeDisplayProps {
+  currentTime: number;
+  remainingTime: number;
+  isVlc: boolean;
+}
+
+export const TimeDisplay: FC<TimeDisplayProps> = ({
+  currentTime,
+  remainingTime,
+  isVlc,
+}) => {
+  const getFinishTime = () => {
+    const now = new Date();
+    const remainingMs = isVlc ? remainingTime : remainingTime * 1000;
+    const finishTime = new Date(now.getTime() + remainingMs);
+    return finishTime.toLocaleTimeString([], {
+      hour: "2-digit",
+      minute: "2-digit",
+      hour12: false,
+    });
+  };
+
+  return (
+    <View className='flex flex-row items-center justify-between mt-2'>
+      <Text className='text-[12px] text-neutral-400'>
+        {formatTimeString(currentTime, isVlc ? "ms" : "s")}
+      </Text>
+      <View className='flex flex-col items-end'>
+        <Text className='text-[12px] text-neutral-400'>
+          -{formatTimeString(remainingTime, isVlc ? "ms" : "s")}
+        </Text>
+        <Text className='text-[10px] text-neutral-500 opacity-70'>
+          ends at {getFinishTime()}
+        </Text>
+      </View>
+    </View>
+  );
+};
--- a/components/video-player/controls/TrickplayBubble.tsx
+++ b/components/video-player/controls/TrickplayBubble.tsx
@@ -0,0 +1,91 @@
+import { Image } from "expo-image";
+import type { FC } from "react";
+import { View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { CONTROLS_CONSTANTS } from "./constants";
+
+interface TrickplayBubbleProps {
+  trickPlayUrl: {
+    x: number;
+    y: number;
+    url: string;
+  } | null;
+  trickplayInfo: {
+    aspectRatio?: number;
+    data: {
+      TileWidth?: number;
+      TileHeight?: number;
+    };
+  } | null;
+  time: {
+    hours: number;
+    minutes: number;
+    seconds: number;
+  };
+}
+
+export const TrickplayBubble: FC<TrickplayBubbleProps> = ({
+  trickPlayUrl,
+  trickplayInfo,
+  time,
+}) => {
+  if (!trickPlayUrl || !trickplayInfo) {
+    return null;
+  }
+
+  const { x, y, url } = trickPlayUrl;
+  const tileWidth = CONTROLS_CONSTANTS.TILE_WIDTH;
+  const tileHeight = tileWidth / trickplayInfo.aspectRatio!;
+
+  return (
+    <View
+      style={{
+        position: "absolute",
+        left: -62,
+        bottom: 0,
+        paddingTop: 30,
+        paddingBottom: 5,
+        width: tileWidth * 1.5,
+        justifyContent: "center",
+        alignItems: "center",
+      }}
+    >
+      <View
+        style={{
+          width: tileWidth,
+          height: tileHeight,
+          alignSelf: "center",
+          transform: [{ scale: 1.4 }],
+          borderRadius: 5,
+        }}
+        className='bg-neutral-800 overflow-hidden'
+      >
+        <Image
+          cachePolicy={"memory-disk"}
+          style={{
+            width: tileWidth * trickplayInfo?.data.TileWidth!,
+            height:
+              (tileWidth / trickplayInfo.aspectRatio!) *
+              trickplayInfo?.data.TileHeight!,
+            transform: [
+              { translateX: -x * tileWidth },
+              { translateY: -y * tileHeight },
+            ],
+          }}
+          source={{ uri: url }}
+          contentFit='cover'
+        />
+      </View>
+      <Text
+        style={{
+          marginTop: 30,
+          fontSize: 16,
+        }}
+      >
+        {`${time.hours > 0 ? `${time.hours}:` : ""}${
+          time.minutes < 10 ? `0${time.minutes}` : time.minutes
+        }:${time.seconds < 10 ? `0${time.seconds}` : time.seconds}`}
+      </Text>
+    </View>
+  );
+};
--- a/components/video-player/controls/VideoScalingModeSelector.tsx
+++ b/components/video-player/controls/VideoScalingModeSelector.tsx
@@ -0,0 +1,108 @@
+import { Ionicons } from "@expo/vector-icons";
+import React, { useState } from "react";
+import { Platform, TouchableOpacity } from "react-native";
+import { Text } from "@/components/common/Text";
+import { FilterSheet } from "@/components/filters/FilterSheet";
+import { useHaptic } from "@/hooks/useHaptic";
+
+export type AspectRatio = "default" | "16:9" | "4:3" | "1:1" | "21:9";
+
+interface AspectRatioSelectorProps {
+  currentRatio: AspectRatio;
+  onRatioChange: (ratio: AspectRatio) => void;
+  disabled?: boolean;
+}
+
+interface AspectRatioOption {
+  id: AspectRatio;
+  label: string;
+  description: string;
+}
+
+const ASPECT_RATIO_OPTIONS: AspectRatioOption[] = [
+  {
+    id: "default",
+    label: "Original",
+    description: "Use video's original aspect ratio",
+  },
+  {
+    id: "16:9",
+    label: "16:9",
+    description: "Widescreen (most common)",
+  },
+  {
+    id: "4:3",
+    label: "4:3",
+    description: "Traditional TV format",
+  },
+  {
+    id: "1:1",
+    label: "1:1",
+    description: "Square format",
+  },
+  {
+    id: "21:9",
+    label: "21:9",
+    description: "Ultra-wide cinematic",
+  },
+];
+
+export const AspectRatioSelector: React.FC<AspectRatioSelectorProps> = ({
+  currentRatio,
+  onRatioChange,
+  disabled = false,
+}) => {
+  const lightHapticFeedback = useHaptic("light");
+  const [open, setOpen] = useState(false);
+
+  // Hide on TV platforms
+  if (Platform.isTV) return null;
+
+  const handleRatioSelect = (ratio: AspectRatio) => {
+    onRatioChange(ratio);
+    lightHapticFeedback();
+  };
+
+  const currentOption = ASPECT_RATIO_OPTIONS.find(
+    (option) => option.id === currentRatio,
+  );
+
+  return (
+    <>
+      <TouchableOpacity
+        disabled={disabled}
+        className='aspect-square flex flex-col rounded-xl items-center justify-center p-2'
+        style={{ opacity: disabled ? 0.5 : 1 }}
+        onPress={() => setOpen(true)}
+      >
+        <Ionicons name='crop-outline' size={24} color='white' />
+      </TouchableOpacity>
+
+      <FilterSheet
+        open={open}
+        setOpen={setOpen}
+        title='Aspect Ratio'
+        data={ASPECT_RATIO_OPTIONS}
+        values={currentOption ? [currentOption] : []}
+        multiple={false}
+        searchFilter={(item, query) => {
+          const option = item as AspectRatioOption;
+          return (
+            option.label.toLowerCase().includes(query.toLowerCase()) ||
+            option.description.toLowerCase().includes(query.toLowerCase())
+          );
+        }}
+        renderItemLabel={(item) => {
+          const option = item as AspectRatioOption;
+          return <Text>{option.label}</Text>;
+        }}
+        set={(vals) => {
+          const chosen = vals[0] as AspectRatioOption | undefined;
+          if (chosen) {
+            handleRatioSelect(chosen.id);
+          }
+        }}
+      />
+    </>
+  );
+};
--- a/components/video-player/controls/VideoTouchOverlay.tsx
+++ b/components/video-player/controls/VideoTouchOverlay.tsx
@@ -1,38 +0,0 @@
-import { Pressable } from "react-native";
-import { useTapDetection } from "./useTapDetection";
-
-interface Props {
-  screenWidth: number;
-  screenHeight: number;
-  showControls: boolean;
-  onToggleControls: () => void;
-}
-
-export const VideoTouchOverlay = ({
-  screenWidth,
-  screenHeight,
-  showControls,
-  onToggleControls,
-}: Props) => {
-  const { handleTouchStart, handleTouchEnd } = useTapDetection({
-    onValidTap: onToggleControls,
-  });
-
-  return (
-    <Pressable
-      onTouchStart={handleTouchStart}
-      onTouchEnd={handleTouchEnd}
-      style={{
-        position: "absolute",
-        width: screenWidth,
-        height: screenHeight,
-        backgroundColor: "black",
-        left: 0,
-        right: 0,
-        top: 0,
-        bottom: 0,
-        opacity: showControls ? 0.75 : 0,
-      }}
-    />
-  );
-};
--- a/Show More
+++ b/Show More