Compare commits

..

36 Commits

Author SHA1 Message Date
Fredrik Burmester
a39461e09a fix: handle optional chaining for 'other' media items in DownloadProvider 2025-10-02 19:49:20 +02:00
Fredrik Burmester
a0725d89a0 Merge branch 'develop' into feature/newarch 2025-10-02 19:46:34 +02:00
Fredrik Burmester
7e2cfb9790 chore: back to bun 2025-10-02 19:10:00 +02:00
Fredrik Burmester
38d1b513d4 fix: building at least 2025-10-02 19:09:37 +02:00
Fredrik Burmester
cc54a3a71b fix: update deps 2025-10-02 18:18:22 +02:00
Fredrik Burmester
6842ae03f9 chore: update deps 2025-10-02 10:26:17 +02:00
Fredrik Burmester
a5ffbd6a4c fix: deps linking 2025-10-01 20:59:17 +02:00
Fredrik Burmester
02fa738cfd wip: downloads "complete" is broken? 2025-10-01 16:57:02 +02:00
Fredrik Burmester
32c01c6f89 fix: rn downloads 2025-10-01 15:25:16 +02:00
Fredrik Burmester
6fc4c33759 fix: update package 2025-10-01 12:18:52 +02:00
Fredrik Burmester
49ea64b0fd wip: rnbd fix? 2025-10-01 12:15:58 +02:00
Fredrik Burmester
c866b105e7 Revert "chore(tmp): workaround download provider"
This reverts commit e9effd5436.
2025-10-01 11:36:21 +02:00
Fredrik Burmester
1b42e61310 Revert "fix(tmp): remove plugin temporarely"
This reverts commit 47c52e0739.
2025-10-01 11:36:16 +02:00
Fredrik Burmester
fb032fa973 feat: glass filter ios for search 2025-09-30 18:35:28 +02:00
Fredrik Burmester
a0a90e48d8 feat: home page design 2025-09-30 16:45:18 +02:00
Fredrik Burmester
ab472bab6e fix: modal for android + dropdown for ios 2025-09-30 15:23:15 +02:00
Fredrik Burmester
8407124464 fix: memoize dropdown rerender controls issue 2025-09-30 13:28:05 +02:00
Fredrik Burmester
afe57d4c76 wip 2025-09-30 13:07:15 +02:00
Fredrik Burmester
7a11f4a54b wip 2025-09-30 11:58:59 +02:00
Fredrik Burmester
47c52e0739 fix(tmp): remove plugin temporarely 2025-09-30 11:00:15 +02:00
Fredrik Burmester
e9effd5436 chore(tmp): workaround download provider 2025-09-30 10:20:28 +02:00
Fredrik Burmester
6ae655abf2 chore 2025-09-30 10:20:11 +02:00
Fredrik Burmester
c74a394a6a wip: global modal provider 2025-09-30 10:20:05 +02:00
Fredrik Burmester
5e6cd6bed6 wip: remove zeego + expo ui 2025-09-30 08:26:45 +02:00
Fredrik Burmester
dfb6bd03a9 fix: non supported prop 2025-09-29 15:21:04 +02:00
Fredrik Burmester
eaf0a9fae4 fix: update tvos dep 2025-09-29 15:11:51 +02:00
Fredrik Burmester
f2bd10b1a6 fix: deps 2025-09-29 15:07:27 +02:00
Fredrik Burmester
dd03c2038d Merge branch 'develop' into feature/newarch 2025-09-29 15:07:23 +02:00
Gauvain
6af9d88a72 Merge branch 'develop' into feature/newarch 2025-09-26 20:52:32 +02:00
Lance Chant
dfa3c06857 Merge branch 'feature/newarch' of https://github.com/streamyfin/streamyfin into feature/newarch 2025-09-08 13:41:36 +02:00
Lance Chant
b0bb9d10e5 chore: adding package updates + MMKV changes
Updated package versions
Updated mmkv.ts to work with the new layout/design

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>
2025-09-08 13:40:21 +02:00
Gauvain
5d080664a0 Merge branch 'develop' into feature/newarch 2025-09-03 17:09:32 +02:00
Lance Chant
cde205e762 fix: android building
It builds, but don't ask it to run, it'll give exception hell

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>
2025-09-02 13:01:19 +02:00
Lance Chant
c335a3269e chore: package updates to try get android to build
Updated packages to latest expo beta
Updated some MMKV usages

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>
2025-09-02 08:15:04 +02:00
sarendsen
ccf27284f6 wip 2025-09-01 12:57:04 +02:00
sarendsen
a11b9f5875 chore: upgrade to newarch 2025-09-01 12:52:43 +02:00
223 changed files with 3856 additions and 8856 deletions

View File

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

View File

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

View File

@@ -1,13 +1,11 @@
# Contributing to Streamyfin # Contributing to Streamyfin
Thank you for your interest in contributing to the Streamyfin project. This document outlines the guidelines for effective collaboration across the Streamyfin codebase and aims to ensure a smooth, productive experience for all contributors. 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 ## Table of Contents
- [AI Assistance Disclosure](#ai-assistance-disclosure)
- [Reporting Issues](#reporting-issues) - [Reporting Issues](#reporting-issues)
- [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities) - [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities)
- [Requesting Features & Enhancements](#requesting-features--enhancements) - [Requesting Features & Enhancements](#requesting-features--enhancements)
@@ -21,25 +19,6 @@ Thank you for your interest in contributing to the Streamyfin project. This docu
--- ---
## AI Assistance Disclosure
> [!IMPORTANT]
> If any AI tool was used while contributing to Streamyfin, it must be disclosed in the pull request.
State in your PR whether AI assistance was used and to what extent (for example, *docs only* or *code generation*).
If AI-generated text was used in PR discussions or responses, disclose that as well.
Minor autocomplete or keyword suggestions do not require disclosure.
### Examples
> This PR was written primarily by Claude Code.
> I used Cursor to explore parts of the codebase, but the implementation is fully manual.
Failing to disclose AI usage wastes maintainers time and complicates review efforts.
AI-assisted contributions are welcome, but contributors remain fully responsible for the code they submit.
Always disclose AI involvement to maintain transparency and respect for maintainers time.
## Reporting Issues ## Reporting Issues
Streamyfin uses GitHub issues to track bugs and improvements. Before opening a new issue: Streamyfin uses GitHub issues to track bugs and improvements. Before opening a new issue:
@@ -67,11 +46,11 @@ When creating a new feature request:
- Check if the idea or similar request exists. - Check if the idea or similar request exists.
- Use reactions like 👍 to support existing requests. - Use reactions like 👍 to support existing requests.
- Clearly describe the use case and potential benefits. - Provide a clear explanation of the use case and benefits.
- Include screenshots when relevant.
--- ---
## Developing Streamyfin ## Developing the Mobile App
### Codebase Overview ### Codebase Overview
@@ -157,8 +136,6 @@ When opening a PR:
- Provide a detailed description in the PR body, explaining what, why, and any impacts. - Provide a detailed description in the PR body, explaining what, why, and any impacts.
- Include screenshots or recordings if UI changes are involved. - Include screenshots or recordings if UI changes are involved.
- Ensure CI checks are green (lint, type-check, build). - Ensure CI checks are green (lint, type-check, build).
- Confirm that the branch is **up to date with `main`** before submission.
- Mention if AI-generated code or content was used (see [AI Assistance Disclosure](#ai-assistance-disclosure)).
- Do not include secrets, tokens, or production credentials. Redact sensitive data in logs and screenshots. - Do not include secrets, tokens, or production credentials. Redact sensitive data in logs and screenshots.
- Keep PRs focused; avoid bundling unrelated changes together. - Keep PRs focused; avoid bundling unrelated changes together.
@@ -182,4 +159,4 @@ PRs require review and approval by maintainers before merging.---
--- ---
Thank you for contributing to make Streamyfin better for everyone! Thank you for helping make Streamyfin a better app for everyone!

View File

@@ -3,94 +3,58 @@
## Project Overview ## Project Overview
Streamyfin is a cross-platform Jellyfin video streaming client built with Expo (React Native). Streamyfin is a cross-platform Jellyfin video streaming client built with Expo (React Native).
It supports mobile (iOS/Android) and TV platforms, integrates with Jellyfin and Jellyseerr APIs, It supports mobile (iOS/Android) and TV platforms, and integrates with Jellyfin and Jellyseerr APIs.
and provides seamless media streaming with offline capabilities and Chromecast support.
## Main Technologies ## Main Technologies
- **Runtime**: Bun (JavaScript/TypeScript execution) - React Native (Expo)
- **Framework**: React Native (Expo) - TypeScript
- **Language**: TypeScript (strict mode) - React Query
- **State Management**: Jotai (global state) + React Query (server state) - Jotai (state management)
- **API SDK**: Jellyfin SDK (TypeScript) - Jellyfin SDK (TypeScript)
- **Navigation**: Expo Router (file-based routing) - BiomeJS (code formatting/linting)
- **Code Quality**: BiomeJS (formatting/linting) - EAS (Expo Application Services)
- **Build Platform**: EAS (Expo Application Services) - Shell scripting (for automation)
- **CI/CD**: GitHub Actions with Bun - GitHub Actions (CI/CD)
## Package Management
**CRITICAL: ALWAYS use `bun` for all package management operations**
- **NEVER use `npm`, `yarn` or `npx` commands**
- Use `bun install` instead of `npm install` or `yarn install`
- Use `bun add <package>` instead of `npm install <package>`
- Use `bun remove <package>` instead of `npm uninstall <package>`
- Use `bun run <script>` instead of `npm run <script>`
- Use `bunx <command>` instead of `npx <command>`
- For Expo: use `bunx create-expo-app` or `bunx @expo/cli`
## Code Structure ## Code Structure
- `app/` Main application code (screens, navigation, etc.) - `app/` Main application code (screens, navigation, etc.)
- `components/` Reusable UI components - `components/` Reusable UI components
- `providers/` Context and API providers (e.g., JellyfinProvider.tsx) - `providers/` Context and API providers (e.g., JellyfinProvider.tsx)
- `utils/` Utility functions and Jotai atoms - `utils/` Utility functions and atoms
- `assets/` Images and static assets - `assets/` Images and static assets
- `scripts/` Automation scripts (Node.js, Bash) - `scripts/` Automation scripts (Node.js, Bash)
- `plugins/` Expo/Metro plugins - `plugins/` Expo/Metro plugins
- `README.md` Project documentation
## Coding Standards ## Coding Conventions
- Use TypeScript for ALL files (no .js files) - Use TypeScript for all new code.
- Use descriptive English names for variables, functions, and components - Prefer functional React components.
- Prefer functional React components with hooks - Use hooks for state and side effects.
- Use Jotai atoms for global state management - Use Jotai for global state.
- Use React Query for server state and caching - Use React Query for data fetching/caching.
- Follow BiomeJS formatting and linting rules - Use BiomeJS for formatting and linting.
- Use `const` over `let`, avoid `var` entirely - Follow the established folder structure for screens/components.
- Implement proper error boundaries
- Use React.memo() for performance optimization
- Handle both mobile and TV navigation patterns
## API Integration ## API Usage
- Use Jellyfin SDK for all server interactions - Use the Jellyfin SDK for all server interactions.
- Access authenticated APIs via `apiAtom` and `userAtom` from JellyfinProvider - Use the `apiAtom` and `userAtom` from `JellyfinProvider` for authenticated API calls.
- Implement proper loading states and error handling - For navigation, use `expo-router`.
- Use React Query for caching and background updates
- Handle offline scenarios gracefully
## Performance Optimization
- Leverage Bun's superior runtime performance
- Optimize FlatList components with proper props
- Use lazy loading for non-critical components
- Implement proper image caching strategies
- Monitor bundle size and use tree-shaking effectively
## Testing
- Use Bun's built-in test runner when possible
- Test files: `*.test.ts` or `*.test.tsx`
- Run tests with: `bun test`
- Mock external APIs in tests
- Focus on testing business logic and custom hooks
## Commit Messages ## Commit Messages
Use Conventional Commits (https://www.conventionalcommits.org/): - Use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) (e.g., `feat:`, `fix:`, `chore:`).
Exemples: - Example: `feat(player): add Chromecast support`
- `feat(player): add Chromecast support`
- `fix(auth): handle expired JWT tokens`
- `chore(deps): update Jellyfin SDK`
## Special Instructions ## Special Instructions
- Prioritize cross-platform compatibility (mobile + TV) - When suggesting code, prefer using existing atoms, hooks, and utility functions.
- Ensure accessibility for TV remote navigation - When adding new features, ensure they are accessible via both mobile and TV navigation if relevant.
- Use existing atoms, hooks, and utilities before creating new ones - When updating dependencies or scripts, check for compatibility with Expo and EAS.
- Maintain compatibility with Expo and EAS workflows
- Always verify Bun compatibility when suggesting new dependencies ---
**Copilot: Please use these instructions to provide context-aware suggestions and code completions for this repository.** **Copilot: Please use these instructions to provide context-aware suggestions and code completions for this repository.**

12
.github/crowdin.yml vendored
View File

@@ -1,12 +0,0 @@
"project_id_env": "CROWDIN_PROJECT_ID"
"api_token_env": "CROWDIN_PERSONAL_TOKEN"
"base_path": "."
"preserve_hierarchy": true
"files": [
{
"source": "translations/en.json",
"translation": "translations/%two_letters_code%.json"
}
]

View File

@@ -26,7 +26,7 @@ jobs:
steps: steps:
- name: 🔍 Get PR and Artifacts - name: 🔍 Get PR and Artifacts
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8 uses: actions/github-script@v8
with: with:
script: | script: |
// Check if we're running from a fork (more precise detection) // Check if we're running from a fork (more precise detection)

View File

@@ -76,7 +76,7 @@ jobs:
run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
- name: 📤 Upload APK artifact - name: 📤 Upload APK artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: streamyfin-android-phone-apk-${{ env.DATE_TAG }} name: streamyfin-android-phone-apk-${{ env.DATE_TAG }}
path: | path: |
@@ -147,7 +147,7 @@ jobs:
run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
- name: 📤 Upload APK artifact - name: 📤 Upload APK artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: streamyfin-android-tv-apk-${{ env.DATE_TAG }} name: streamyfin-android-tv-apk-${{ env.DATE_TAG }}
path: | path: |
@@ -156,7 +156,7 @@ jobs:
build-ios-phone: build-ios-phone:
if: (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin')) if: (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
runs-on: macos-26 runs-on: macos-15
name: 🍎 Build iOS IPA (Phone) name: 🍎 Build iOS IPA (Phone)
permissions: permissions:
contents: read contents: read
@@ -170,11 +170,6 @@ jobs:
submodules: recursive submodules: recursive
show-progress: false show-progress: false
- name: 🟢 Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "24"
- name: 🍞 Setup Bun - name: 🍞 Setup Bun
uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2 uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
with: with:
@@ -196,11 +191,6 @@ jobs:
- name: 🛠️ Generate project files - name: 🛠️ Generate project files
run: bun run prebuild run: bun run prebuild
- name: 🔧 Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "26.0.1"
- name: 🏗️ Setup EAS - name: 🏗️ Setup EAS
uses: expo/expo-github-action@main uses: expo/expo-github-action@main
with: with:
@@ -220,7 +210,7 @@ jobs:
run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV
- name: 📤 Upload IPA artifact - name: 📤 Upload IPA artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with: with:
name: streamyfin-ios-phone-ipa-${{ env.DATE_TAG }} name: streamyfin-ios-phone-ipa-${{ env.DATE_TAG }}
path: build-*.ipa path: build-*.ipa
@@ -229,7 +219,7 @@ jobs:
# Disabled for now - uncomment when ready to build iOS TV # Disabled for now - uncomment when ready to build iOS TV
# build-ios-tv: # build-ios-tv:
# if: (!contains(github.event.head_commit.message, '[skip ci]') && (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-26 # runs-on: macos-15
# name: 🍎 Build iOS IPA (TV) # name: 🍎 Build iOS IPA (TV)
# permissions: # permissions:
# contents: read # contents: read
@@ -243,11 +233,6 @@ jobs:
# submodules: recursive # submodules: recursive
# show-progress: false # show-progress: false
# #
# - name: 🟢 Setup Node.js
# uses: actions/setup-node@v4
# with:
# node-version: '20'
#
# - name: 🍞 Setup Bun # - name: 🍞 Setup Bun
# uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2 # uses: oven-sh/setup-bun@735343b667d3e6f658f44d0eca948eb6282f2b76 # v2.0.2
# with: # with:
@@ -269,11 +254,6 @@ jobs:
# - name: 🛠️ Generate project files # - name: 🛠️ Generate project files
# run: bun run prebuild:tv # run: bun run prebuild:tv
# #
# - name: 🔧 Setup Xcode
# uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: '26.0.1'
#
# - name: 🏗️ Setup EAS # - name: 🏗️ Setup EAS
# uses: expo/expo-github-action@main # uses: expo/expo-github-action@main
# with: # with:

View File

@@ -31,13 +31,13 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: 🏁 Initialize CodeQL - name: 🏁 Initialize CodeQL
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3 uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
queries: +security-extended,security-and-quality queries: +security-extended,security-and-quality
- name: 🛠️ Autobuild - name: 🛠️ Autobuild
uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3 uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
- name: 🧪 Perform CodeQL Analysis - name: 🧪 Perform CodeQL Analysis
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3 uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5

View File

@@ -1,50 +1,34 @@
name: 🌐 Translation Sync name: Crowdin Action
on: on:
push: push:
branches: [develop] branches: [ main ]
paths:
- "translations/**"
- "crowdin.yml"
- "i18n.ts"
- ".github/workflows/crowdin.yml"
# Run weekly to pull new translations
schedule:
- cron: "0 2 * * 1" # Every Monday at 2 AM UTC
workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs: jobs:
sync-translations: synchronize-with-crowdin:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: 📥 Checkout Repository - name: Checkout
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 🌐 Sync Translations with Crowdin - name: crowdin action
uses: crowdin/github-action@08713f00a50548bfe39b37e8f44afb53e7a802d4 # v2.12.0 uses: crowdin/github-action@v2
with: with:
upload_sources: true upload_sources: true
upload_translations: true upload_translations: true
download_translations: true download_translations: true
localization_branch_name: I10n_crowdin_translations localization_branch_name: l10n_crowdin_translations
create_pull_request: true create_pull_request: true
pull_request_title: "feat: New Crowdin Translations" pull_request_title: 'feat: New Crowdin Translations'
pull_request_body: "New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)" pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
pull_request_base_branch_name: "develop" pull_request_base_branch_name: 'develop'
pull_request_labels: "🌐 translation"
# Quality control options
skip_untranslated_strings: true
export_only_approved: false
# Commit customization
commit_message: "feat(i18n): update translations from Crowdin"
env: env:
# A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
GITHUB_TOKEN: ${{ secrets.CROWDIN_GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.CROWDIN_GITHUB_TOKEN }}
# A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
# Visit https://crowdin.com/settings#api-key to create this token
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

View File

@@ -57,7 +57,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Dependency Review - name: Dependency Review
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2 uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
with: with:
fail-on-severity: high fail-on-severity: high
base-ref: ${{ github.event.pull_request.base.sha || 'develop' }} base-ref: ${{ github.event.pull_request.base.sha || 'develop' }}
@@ -107,7 +107,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: "🟢 Setup Node.js" - name: "🟢 Setup Node.js"
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
with: with:
node-version: '24.x' node-version: '24.x'

View File

@@ -1,18 +1,13 @@
name: 🛎️ Discord Notification name: 🛎️ Discord Pull Request Notification
on: on:
pull_request: pull_request:
types: [opened, reopened] types: [opened, reopened]
branches: [develop] branches: [develop]
workflow_run:
workflows: ["*"]
types: [completed]
branches: [develop]
jobs: jobs:
notify: notify:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
if: github.event_name == 'pull_request'
steps: steps:
- name: 🛎️ Notify Discord - name: 🛎️ Notify Discord
uses: Ilshidur/action-discord@d2594079a10f1d6739ee50a2471f0ca57418b554 # 0.4.0 uses: Ilshidur/action-discord@d2594079a10f1d6739ee50a2471f0ca57418b554 # 0.4.0
@@ -26,21 +21,3 @@ jobs:
**By:** ${{ github.event.pull_request.user.login }} **By:** ${{ github.event.pull_request.user.login }}
**Branch:** ${{ github.event.pull_request.head.ref }} **Branch:** ${{ github.event.pull_request.head.ref }}
🔗 ${{ github.event.pull_request.html_url }} 🔗 ${{ github.event.pull_request.html_url }}
notify-on-failure:
runs-on: ubuntu-24.04
if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure'
steps:
- name: 🚨 Notify Discord on Failure
uses: Ilshidur/action-discord@d2594079a10f1d6739ee50a2471f0ca57418b554 # 0.4.0
env:
DISCORD_WEBHOOK: ${{ secrets.WEBHOOK_FAILED_JOB_URL }}
DISCORD_AVATAR: https://avatars.githubusercontent.com/u/193271640
with:
args: |
🚨 **Workflow Failed** in **${{ github.repository }}**
**Workflow:** ${{ github.event.workflow_run.name }}
**Branch:** ${{ github.event.workflow_run.head_branch }}
**Triggered by:** ${{ github.event.workflow_run.triggering_actor.login }}
**Commit:** ${{ github.event.workflow_run.head_commit.message }}
🔗 ${{ github.event.workflow_run.html_url }}

View File

@@ -15,7 +15,7 @@ jobs:
steps: steps:
- name: 🔄 Mark/Close Stale Issues - name: 🔄 Mark/Close Stale Issues
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0 uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
with: with:
# Global settings # Global settings
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: "🟢 Setup Node.js" - name: "🟢 Setup Node.js"
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
with: with:
node-version: '24.x' node-version: '24.x'
cache: 'npm' cache: 'npm'

71
.gitignore vendored
View File

@@ -1,16 +1,27 @@
# Dependencies and Package Managers
node_modules/ node_modules/
bun.lock
bun.lockb
package-lock.json
# Expo and React Native Build Artifacts
.expo/ .expo/
dist/ dist/
npm-debug.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision
*.orig.*
web-build/ web-build/
.tsbuildinfo modules/vlc-player/android/build
# macOS
.DS_Store
expo-env.d.ts
Streamyfin.app
*.mp4
Streamyfin.app
package-lock.json
# Platform-specific Build Directories
/ios /ios
/android /android
/iostv /iostv
@@ -18,51 +29,21 @@ web-build/
/androidmobile /androidmobile
/androidtv /androidtv
# Module-specific Builds
modules/vlc-player/android/build
modules/player/android modules/player/android
modules/hls-downloader/android/build
# Generated Applications pc-api-7079014811501811218-719-3b9f15aeccf8.json
Streamyfin.app credentials.json
*.apk *.apk
*.ipa *.ipa
*.aab .continuerc.json
# Certificates and Keys
*.jks
*.p8
*.p12
*.key
*.mobileprovision
# Debug and Temporary Files
npm-debug.*
*.orig.*
*.mp4
# OS-specific Files
# macOS
.DS_Store
# IDE and Editor Files
.vscode/ .vscode/
.idea/ .idea/
.ruby-lsp .ruby-lsp
.cursor/ modules/hls-downloader/android/build
.claude/ streamyfin-4fec1-firebase-adminsdk.json
# Environment and Configuration
expo-env.d.ts
.continuerc.json
.env .env
.env.local .env.local
*.aab
# Secrets and Credentials
pc-api-7079014811501811218-719-3b9f15aeccf8.json
credentials.json
streamyfin-4fec1-firebase-adminsdk.json
# Version and Backup Files
/version-backup-* /version-backup-*
modules/background-downloader/android/build/* bun.lockb

View File

@@ -1,24 +0,0 @@
{
// ==========================================
// Streamyfin - Recommended VS Code Extensions
// ==========================================
// Essential extensions for working with Streamyfin
// See .github/copilot-instructions.md for coding standards
"recommendations": [
// Code Quality & Formatting
"biomejs.biome", // Fast formatter and linter for JavaScript/TypeScript - replaces ESLint + Prettier
// React Native & Expo
"expo.vscode-expo-tools", // Official Expo extension - provides commands, debugging, and config IntelliSense
"msjsdiag.vscode-react-native", // React Native debugging and IntelliSense - essential for RN development
// Developer Experience
"bradlc.vscode-tailwindcss", // Tailwind CSS IntelliSense - autocomplete for NativeWind classes
"yoavbls.pretty-ts-errors", // Makes TypeScript error messages human-readable with formatting and highlights
"usernamehw.errorlens", // Shows errors and warnings inline in the editor - faster debugging
// Bun Support
"oven.bun-vscode" // Official Bun extension - provides debugging and language support for Bun runtime
]
}

35
.vscode/settings.json vendored
View File

@@ -1,25 +1,24 @@
{ {
"editor.defaultFormatter": "biomejs.biome", "[javascript]": {
"editor.formatOnSave": true, "editor.defaultFormatter": "biomejs.biome",
"editor.codeActionsOnSave": { "editor.formatOnSave": true
"source.fixAll.biome": "explicit"
},
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome"
}, },
"[typescriptreact]": { "[typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome" "editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
}, },
"[javascript]": { "prettier.printWidth": 120,
"editor.defaultFormatter": "biomejs.biome" "[swift]": {
"editor.defaultFormatter": "sswg.swift-lang"
},
"editor.formatOnSave": true,
"editor.defaultFormatter": "biomejs.biome",
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
}, },
"[javascriptreact]": { "[javascriptreact]": {
"editor.defaultFormatter": "biomejs.biome" "editor.defaultFormatter": "biomejs.biome",
}, "editor.formatOnSave": true
"[json]": { }
"editor.defaultFormatter": "biomejs.biome"
},
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.formatOnSaveMode": "file"
} }

161
README.md
View File

@@ -5,135 +5,146 @@
<img src="https://raw.githubusercontent.com/streamyfin/.github/refs/heads/main/streamyfin-github-banner.png" alt="Streamyfin" width="100%"> <img src="https://raw.githubusercontent.com/streamyfin/.github/refs/heads/main/streamyfin-github-banner.png" alt="Streamyfin" width="100%">
</p> </p>
**Streamyfin is a user-friendly Jellyfin video streaming client built with Expo. Designed as an alternative to other Jellyfin clients, it aims to offer a smooth and reliable streaming experience. We hope you'll find it a valuable addition to your media streaming toolbox.** **Streamyfin is a simple, user-friendly Jellyfin video streaming client built with Expo. Designed as an alternative to other Jellyfin clients, it aims to offer a smooth and reliable streaming experience. We hope you'll find it a valuable addition to your media streaming toolbox.**
--- ---
<p align="center"> <p align="center">
<img src="./assets/images/screenshots/screenshot1.png" width="20%"> <img src="./assets/images/screenshots/screenshot1.png" width="22%">
&nbsp; &nbsp;
<img src="./assets/images/screenshots/screenshot3.png" width="20%"> <img src="./assets/images/screenshots/screenshot3.png" width="22%">
&nbsp; &nbsp;
<img src="./assets/images/screenshots/screenshot2.png" width="20%"> <img src="./assets/images/screenshots/screenshot2.png" width="22%">
&nbsp; &nbsp;
<img src="./assets/images/jellyseerr.PNG" width="21%"> <img src="./assets/images/jellyseerr.PNG" width="23%">
</p> </p>
## 🌟 Features ## 🌟 Features
- 🚀 **Skip Intro / Credits Support**: Lets you quickly skip intros and credits during playback - 🚀 **Skip Intro / Credits Support**
- 🖼️ **Trickplay images**: The new golden standard for chapter previews when seeking - 🖼️ **Trickplay images**: The new golden standard for chapter previews when seeking.
- 📥 **Download media**: Save your media locally and watch it offline - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
- ⚙️ **Settings management**: Manage app configurations for all users through our plugin - 📡 **Chromecast** (Experimental): Cast your media to any Chromecast-enabled device.
- 🤖 **Seerr (formerly Jellyseerr) integration**: Request media directly in the app - 📡 **Settings management** (Experimental): Manage app settings for all your users with a JF plugin.
- 👁️ **Sessions view:** View all active sessions currently streaming on your server - 🤖 **Jellyseerr integration**: Request media directly in the app.
- 📡 **Chromecast**: Cast your media to any Chromecast-enabled device - 👁️ **Sessions View:** View all active sessions currently streaming on your server.
## 🧪 Experimental Features ## 🧪 Experimental Features
Streamyfin offers exciting experimental features such as media downloading and Chromecast support. These features are under active development, and your feedback and patience help us make them even better. Streamyfin includes some exciting experimental features like media downloading and Chromecast support. These features are still in development, and your patience and feedback are much appreciated as we work to improve them.
### 📥 Downloading ### 📥 Downloading
Downloading works by using FFmpeg to convert an HLS stream into a video file on your device. This lets you download and watch any content that you can stream. The conversion is handled in real time by Jellyfin on the server during the download. While this may take a bit longer, it ensures compatibility with any file your server can transcode. Downloading works by using ffmpeg to convert an HLS stream into a video file on the device. This means that you can download and view any file you can stream! The file is converted by Jellyfin on the server in real time as it is downloaded. This means a **bit longer download times** but supports any file that your server can transcode.
### 🎥 Chromecast
Chromecast support is still in development, and we're working on improving it. Currently, it supports casting videos, but we're working on adding support for subtitles and other features.
### 🧩 Streamyfin Plugin ### 🧩 Streamyfin Plugin
The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that holds all settings for the client Streamyfin. This allows you to synchronize settings across all your users, like for example: The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that holds all settings for the client Streamyfin. This allows you to synchronize settings across all your users, like for example:
- Automatic Seerr login with no user input required - Auto log in to Jellyseerr without the user having to do anything
- Set your preferred default languages - Choose the default languages
- Configure download method and search provider - Set download method and search provider
- Personalize your home screen - Customize home screen
- And much more - And much more...
[Streamyfin Plugin](https://github.com/streamyfin/jellyfin-plugin-streamyfin) [Streamyfin Plugin](https://github.com/streamyfin/jellyfin-plugin-streamyfin)
### 📡 Chromecast
Chromecast support is currently under development. Video casting is already available, and we're actively working on adding subtitle support and additional features.
### 🔍 Jellysearch ### 🔍 Jellysearch
[Jellysearch](https://gitlab.com/DomiStyle/jellysearch) works with Streamyfin [Jellysearch](https://gitlab.com/DomiStyle/jellysearch) now works with Streamyfin!
> A fast full-text search proxy for Jellyfin. Integrates seamlessly with most Jellyfin clients. > A fast full-text search proxy for Jellyfin. Integrates seamlessly with most Jellyfin clients.
## 🛣️ Roadmap ## 🛣️ Roadmap for V1
Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests. Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
## 📥 Download Streamyfin ## 📥 Get it now
<div style="display: flex; gap: 5px;"> <div style="display: flex; gap: 5px;">
<a href="https://apps.apple.com/app/streamyfin/id6593660679?l=en-GB"><img height=50 alt="Get Streamyfin on App Store" src="./assets/Download_on_the_App_Store_Badge.png"/></a> <a href="https://apps.apple.com/app/streamyfin/id6593660679?l=en-GB"><img height=50 alt="Get Streamyfin on App Store" src="./assets/Download_on_the_App_Store_Badge.png"/></a>
<a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin"><img height=50 alt="Get Streamyfin on Google Play Store" src="./assets/Google_Play_Store_badge_EN.svg"/></a> <a href="https://play.google.com/store/apps/details?id=com.fredrikburmester.streamyfin"><img height=50 alt="Get the beta on Google Play" src="./assets/Google_Play_Store_badge_EN.svg"/></a>
<a href="https://github.com/streamyfin/streamyfin/releases/latest"><img height=50 alt="Get Streamyfin on Github" src="./assets/Download_on_Github_.png"/></a>
</div> </div>
### 🧪 Beta Testing Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/releases) for Android.
To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This grants you immediate access to the ⁠🧪-beta-releases channel on Discord and lets me know youve subscribed. This is where I share APKs and IPAs. It does not provide automatic TestFlight access, so please send me a DM (Cagemaster) with the email you use for Apple so we can add you manually. ### 🧪 Beta testing
**Note**: Anyone actively contributing to Streamyfins source code will receive automatic access to beta releases. To access the Streamyfin beta, you need to subscribe to the Member tier (or higher) on [Patreon](https://www.patreon.com/streamyfin). This will give you immediate access to the ⁠🧪-public-beta channel on Discord and I'll know that you have subscribed. This is where I post APKs and IPAs. This won't give automatic access to the TestFlight, however, so you need to send me a DM with the email you use for Apple so that I can manually add you.
**Note**: Everyone who is actively contributing to the source code of Streamyfin will have automatic access to the betas.
## 🚀 Getting Started ## 🚀 Getting Started
### ⚙️ Prerequisites ### Prerequisites
- Your device is on the same network as the Jellyfin server (for local connections) - Ensure you have an active Jellyfin server.
- Your Jellyfin server is up and running with remote access enabled if you plan to connect from outside your local network - Make sure your device is connected to the same network as your Jellyfin server.
- Your server version is up to date (older versions may cause compatibility issues)
- You have a valid Jellyfin user account with access to the media libraries you want to view
- If using features such as **downloads** or **Seerr integration**, confirm the required plugins are installed and configured on your Jellyfin server
## 🙌 Contributing ## 🙌 Contributing
We welcome contributions that improve Streamyfin. Start by forking the repository and submitting a pull request. For major changes or new features, please open an issue first to discuss your ideas and ensure alignment with the project. We welcome any help to make Streamyfin better. If you'd like to contribute, please fork the repository and submit a pull request. For major changes, it's best to open an issue first to discuss your ideas.
## 🌍 Translations ### 👨‍💻 Development info
[![Crowdin Translation Status](https://badges.crowdin.net/streamyfin/localized.svg)](https://crowdin.com/project/streamyfin)
Streamyfin is available in multiple languages, and were always looking for contributors to help make the app accessible worldwide.
You can contribute translations directly on our [Crowdin project page](https://crowdin.com/project/streamyfin).
### 👨‍💻 Development Info
1. Use node `>20` 1. Use node `>20`
2. Install dependencies `bun i && bun run submodule-reload` 2. Install dependencies `bun i && bun run submodule-reload`
3. Make sure you have xcode and/or android studio installed. (follow the guides for expo: https://docs.expo.dev/workflow/android-studio-emulator/) 3. Make sure you have xcode and/or android studio installed. (follow the guides for expo: https://docs.expo.dev/workflow/android-studio-emulator/)
4. Install BiomeJS extension in VSCode/Your IDE (https://biomejs.dev/) 4. Install BiomeJS extension in VSCode/Your IDE (https://biomejs.dev/)
4. run `npm run prebuild` 4. run `npm run prebuild`
5. Create an expo dev build by running `npm run ios` or `npm run android`. This will open a simulator on your computer and run the app 5. Create an expo dev build by running `npm run ios` or `npm run android`. This will open a simulator on your computer and run the app.
For the TV version suffix the npm commands with `:tv`. For the TV version suffix the npm commands with `:tv`.
`npm run prebuild:tv` `npm run prebuild:tv`
`npm run ios:tv or npm run android:tv` `npm run ios:tv or npm run android:tv`
## 👋 Get in Touch with Us ## 📄 License
Need assistance or have any questions? Streamyfin is licensed under the Mozilla Public License 2.0 (MPL-2.0).
This means you are free to use, modify, and distribute this software. The MPL-2.0 is a copyleft license that allows for more flexibility in combining the software with proprietary code.
Key points of the MPL-2.0:
- **Discord:** [Join our server](https://discord.gg/BuGG9ZNhaE) - You can use the software for any purpose
- **GitHub Issues:** [Report bugs or request features](https://github.com/streamyfin/streamyfin/issues) - You can modify the software and distribute modified versions
- **Email:** [developer@streamyfin.app](mailto:developer@streamyfin.app) - You must include the original copyright and license notices
- You must disclose your source code for any modifications to the covered files
- Larger works may combine MPL code with code under other licenses
- MPL-licensed components must remain under the MPL, but the larger work can be under a different license
- For the full text of the license, please see the LICENSE file in this repository
## 🌐 Connect with Us
Join our Discord: [![](https://dcbadge.limes.pink/api/server/https://discord.gg/BuGG9ZNhaE)](https://discord.gg/BuGG9ZNhaE)
Need support or have questions:
- GitHub Issues: Report bugs or request features here.
- Email: [developer@streamyfin.app](mailto:developer@streamyfin.app)
## ❓ FAQ ## ❓ FAQ
1. Q: Why can't I see my libraries in Streamyfin? 1. Q: Why can't I see my libraries in Streamyfin?
A: Make sure your server is running one of the latest versions and that you have at least one library that isn't audio only A: Make sure your server is running one of the latest versions and that you have at least one library that isn't audio only.
2. Q: Why can't I see my music library? 2. Q: Why can't I see my music library?
A: We don't currently support music and are unlikely to support music in the near future A: We don't currently support music and are unlikely to support music in the near future.
## 📝 Credits ## 📝 Credits
Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmester) and is not affiliated with Jellyfin. The app is built using Expo, React Native, and other open-source libraries. Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmester) and is not affiliated with Jellyfin. The app is built with Expo, React Native, and other open-source libraries.
## 🎖️ Core Developers ## ✨ Acknowledgements
We would like to thank the Jellyfin team for their great software and awesome support on discord.
Special shoutout to the JF official clients for being an inspiration to ours.
### 🏆 Core Developers
Thanks to the following contributors for their significant contributions: Thanks to the following contributors for their significant contributions:
@@ -218,41 +229,21 @@ Thanks to the following contributors for their significant contributions:
</table> </table>
</div> </div>
## ✨ Acknowledgements And all other developers who have contributed to Streamyfin, thank you for your contributions.
We would like to thank the Jellyfin team for their excellent software and support on Discord. I'd also like to thank the following people and projects for their contributions to Streamyfin:
Special thanks to the official Jellyfin clients, which have served as an inspiration for Streamyfin.
We also thank all other developers who have contributed to Streamyfin, your efforts are greatly appreciated.
A special mention to the following people and projects for their contributions:
- [Reiverr](https://github.com/aleksilassila/reiverr) for invaluable help with understanding the Jellyfin API
- [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for providing the TypeScript SDK
- [Seerr](https://github.com/seerr-team/seerr) for enabling API integration with their project
- [Reiverr](https://github.com/aleksilassila/reiverr) for great help with understanding the Jellyfin API.
- [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for the TypeScript SDK.
- [Jellyseerr](https://github.com/Fallenbagel/jellyseerr) for enabling API integration with their project.
- The Jellyfin devs for always being helpful in the Discord.
## ⭐ Star History ## ⭐ Star History
[![Star History Chart](https://api.star-history.com/svg?repos=streamyfin/streamyfin&type=Date)](https://star-history.com/#streamyfin/streamyfin&Date) [![Star History Chart](https://api.star-history.com/svg?repos=streamyfin/streamyfin&type=Date)](https://star-history.com/#streamyfin/streamyfin&Date)
## 📄 License
Streamyfin is licensed under the Mozilla Public License 2.0 (MPL-2.0).
This means you are free to use, modify, and distribute this software. The MPL-2.0 is a copyleft license that allows for more flexibility in combining the software with proprietary code.
Key points of the MPL-2.0:
- You can use the software for any purpose
- You can modify the software and distribute modified versions
- You must include the original copyright and license notices
- You must disclose your source code for any modifications to the covered files
- Larger works may combine MPL code with code under other licenses
- MPL-licensed components must remain under the MPL, but the larger work can be under a different license
- For the full text of the license, please see the LICENSE file in this repository
## ⚠️ Disclaimer ## ⚠️ Disclaimer
Streamyfin does not promote, support, or condone piracy in any form. The app is intended solely for streaming media that you personally own and control. It does not provide or include any media content. Any discussions, support requests, or references to piracy, as well as any tools, software, or websites related to piracy, are strictly prohibited across all our channels. Streamyfin does not promote, support, or condone piracy in any form. The app is intended solely for streaming media that you personally own and control. It does not provide or include any media content. Any discussions or support requests related to piracy are strictly prohibited across all our channels.
## 🤝 Sponsorship ## 🤝 Sponsorship
VPS hosting generously provided by [Hexabyte](https://hexabyte.se/en/vps/?currency=eur) and [SweHosting](https://swehosting.se/en/#tj%C3%A4nster) VPS hosting generously provided by [Hexabyte](https://hexabyte.se/en/vps/?currency=eur) and [SweHosting](https://swehosting.se/en/#tj%C3%A4nster)

View File

@@ -6,16 +6,14 @@ module.exports = ({ config }) => {
"react-native-google-cast", "react-native-google-cast",
{ useDefaultExpandedMediaControls: true }, { useDefaultExpandedMediaControls: true },
]); ]);
}
// Only override googleServicesFile if env var is set // Add the background downloader plugin only for non-TV builds
const androidConfig = {}; config.plugins.push("./plugins/withRNBackgroundDownloader.js");
if (process.env.GOOGLE_SERVICES_JSON) {
androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
} }
return { return {
...(Object.keys(androidConfig).length > 0 && { android: androidConfig }), android: {
googleServicesFile: process.env.GOOGLE_SERVICES_JSON,
},
...config, ...config,
}; };
}; };

View File

@@ -2,7 +2,7 @@
"expo": { "expo": {
"name": "Streamyfin", "name": "Streamyfin",
"slug": "streamyfin", "slug": "streamyfin",
"version": "0.47.1", "version": "0.39.0",
"orientation": "default", "orientation": "default",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",
"scheme": "streamyfin", "scheme": "streamyfin",
@@ -29,12 +29,16 @@
}, },
"supportsTablet": true, "supportsTablet": true,
"bundleIdentifier": "com.fredrikburmester.streamyfin", "bundleIdentifier": "com.fredrikburmester.streamyfin",
"icon": "./assets/images/icon-ios-liquid-glass.icon", "icon": {
"dark": "./assets/images/icon-ios-plain.png",
"light": "./assets/images/icon-ios-light.png",
"tinted": "./assets/images/icon-ios-tinted.png"
},
"appleTeamId": "MWD5K362T8" "appleTeamId": "MWD5K362T8"
}, },
"android": { "android": {
"jsEngine": "hermes", "jsEngine": "hermes",
"versionCode": 84, "versionCode": 71,
"adaptiveIcon": { "adaptiveIcon": {
"foregroundImage": "./assets/images/icon-android-plain.png", "foregroundImage": "./assets/images/icon-android-plain.png",
"monochromeImage": "./assets/images/icon-android-themed.png", "monochromeImage": "./assets/images/icon-android-themed.png",
@@ -113,6 +117,10 @@
} }
} }
], ],
["./plugins/withChangeNativeAndroidTextToWhite.js"],
["./plugins/withAndroidManifest.js"],
["./plugins/withTrustLocalCerts.js"],
["./plugins/withGradleProperties.js"],
[ [
"expo-splash-screen", "expo-splash-screen",
{ {
@@ -128,12 +136,8 @@
"color": "#9333EA" "color": "#9333EA"
} }
], ],
"expo-web-browser", "./plugins/with-runtime-framework-headers.js",
["./plugins/with-runtime-framework-headers.js"], "react-native-bottom-tabs"
["./plugins/withChangeNativeAndroidTextToWhite.js"],
["./plugins/withAndroidManifest.js"],
["./plugins/withTrustLocalCerts.js"],
["./plugins/withGradleProperties.js"]
], ],
"experiments": { "experiments": {
"typedRoutes": true "typedRoutes": true

View File

@@ -1,5 +1,5 @@
import { useCallback, useState } from "react"; import { useCallback, useState } from "react";
import { Platform, RefreshControl, ScrollView, View } from "react-native"; import { RefreshControl, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Favorites } from "@/components/home/Favorites"; import { Favorites } from "@/components/home/Favorites";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache"; import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
@@ -28,7 +28,7 @@ export default function favorites() {
paddingBottom: 16, paddingBottom: 16,
}} }}
> >
<View style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}> <View className='my-4'>
<Favorites /> <Favorites />
</View> </View>
</ScrollView> </ScrollView>

View File

@@ -22,6 +22,11 @@ export default function IndexLayout() {
options={{ options={{
headerShown: !Platform.isTV, headerShown: !Platform.isTV,
headerTitle: t("tabs.home"), headerTitle: t("tabs.home"),
headerLeft: () => (
<TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
headerBlurEffect: "none", headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios", headerTransparent: Platform.OS === "ios",
headerShadowVisible: false, headerShadowVisible: false,
@@ -30,6 +35,7 @@ export default function IndexLayout() {
{!Platform.isTV && ( {!Platform.isTV && (
<> <>
<Chromecast.Chromecast background='transparent' /> <Chromecast.Chromecast background='transparent' />
{user?.Policy?.IsAdministrator && <SessionsButton />} {user?.Policy?.IsAdministrator && <SessionsButton />}
<SettingsButton /> <SettingsButton />
</> </>
@@ -41,16 +47,9 @@ export default function IndexLayout() {
<Stack.Screen <Stack.Screen
name='downloads/index' name='downloads/index'
options={{ options={{
headerShown: true,
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
title: t("home.downloads.downloads_title"), title: t("home.downloads.downloads_title"),
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -59,17 +58,9 @@ export default function IndexLayout() {
<Stack.Screen <Stack.Screen
name='downloads/[seriesId]' name='downloads/[seriesId]'
options={{ options={{
headerShown: true,
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
title: t("home.downloads.tvseries"), title: t("home.downloads.tvseries"),
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -79,16 +70,8 @@ export default function IndexLayout() {
name='sessions/index' name='sessions/index'
options={{ options={{
title: t("home.sessions.title"), title: t("home.sessions.title"),
headerShown: true,
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -98,159 +81,41 @@ export default function IndexLayout() {
name='settings' name='settings'
options={{ options={{
title: t("home.settings.settings_title"), title: t("home.settings.settings_title"),
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/playback-controls/page' name='settings/marlin-search/page'
options={{ options={{
title: t("home.settings.playback_controls.title"), title: "",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/audio-subtitles/page' name='settings/jellyseerr/page'
options={{ options={{
title: t("home.settings.audio_subtitles.title"), title: "",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/appearance/page' name='settings/hide-libraries/page'
options={{ options={{
title: t("home.settings.appearance.title"), title: "",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
}}
/>
<Stack.Screen
name='settings/appearance/hide-libraries/page'
options={{
title: t("home.settings.other.hide_libraries"),
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => (
<TouchableOpacity
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
}}
/>
<Stack.Screen
name='settings/plugins/page'
options={{
title: t("home.settings.plugins.plugins_title"),
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => (
<TouchableOpacity
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
}}
/>
<Stack.Screen
name='settings/plugins/marlin-search/page'
options={{
title: "Marlin Search",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => (
<TouchableOpacity
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
}}
/>
<Stack.Screen
name='settings/plugins/jellyseerr/page'
options={{
title: "Jellyseerr",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => (
<TouchableOpacity
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity>
),
}}
/>
<Stack.Screen
name='settings/intro/page'
options={{
title: t("home.settings.intro.title"),
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => (
<TouchableOpacity
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -259,16 +124,9 @@ export default function IndexLayout() {
<Stack.Screen <Stack.Screen
name='settings/logs/page' name='settings/logs/page'
options={{ options={{
title: t("home.settings.logs.logs_title"), title: "",
headerBlurEffect: "none",
headerTransparent: Platform.OS === "ios",
headerShadowVisible: false,
headerLeft: () => ( headerLeft: () => (
<TouchableOpacity <TouchableOpacity onPress={() => _router.back()} className='pl-0.5'>
onPress={() => _router.back()}
className='pl-0.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather name='chevron-left' size={28} color='white' /> <Feather name='chevron-left' size={28} color='white' />
</TouchableOpacity> </TouchableOpacity>
), ),

View File

@@ -1,10 +1,8 @@
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { FlashList } from "@shopify/flash-list";
import { router, useLocalSearchParams, useNavigation } from "expo-router"; import { router, useLocalSearchParams, useNavigation } from "expo-router";
import { useCallback, useEffect, useMemo, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import { Alert, Platform, TouchableOpacity, View } from "react-native"; import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { EpisodeCard } from "@/components/downloads/EpisodeCard"; import { EpisodeCard } from "@/components/downloads/EpisodeCard";
import { import {
@@ -25,23 +23,21 @@ export default function page() {
const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>( const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>(
{}, {},
); );
const { downloadedItems, deleteItems } = useDownload(); const { getDownloadedItems, deleteItems } = useDownload();
const insets = useSafeAreaInsets();
const series = useMemo(() => { const series = useMemo(() => {
try { try {
return ( return (
downloadedItems getDownloadedItems()
?.filter((f) => f.item.SeriesId === seriesId) ?.filter((f) => f.item.SeriesId === seriesId)
?.sort( ?.sort(
(a, b) => (a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!,
(a.item.ParentIndexNumber ?? 0) - (b.item.ParentIndexNumber ?? 0),
) || [] ) || []
); );
} catch { } catch {
return []; return [];
} }
}, [downloadedItems, seriesId]); }, [getDownloadedItems]);
// Group episodes by season in a single pass // Group episodes by season in a single pass
const seasonGroups = useMemo(() => { const seasonGroups = useMemo(() => {
@@ -74,9 +70,8 @@ export default function page() {
}, [seasonGroups]); }, [seasonGroups]);
const seasonIndex = const seasonIndex =
seasonIndexState[series?.[0]?.item?.ParentId ?? ""] ?? seasonIndexState[series?.[0]?.item?.ParentId ?? ""] ||
episodeSeasonIndex ?? episodeSeasonIndex ||
series?.[0]?.item?.ParentIndexNumber ??
""; "";
const groupBySeason = useMemo<BaseItemDto[]>(() => { const groupBySeason = useMemo<BaseItemDto[]>(() => {
@@ -85,9 +80,9 @@ export default function page() {
const initialSeasonIndex = useMemo( const initialSeasonIndex = useMemo(
() => () =>
groupBySeason?.[0]?.ParentIndexNumber ?? Object.values(groupBySeason)?.[0]?.ParentIndexNumber ??
series?.[0]?.item?.ParentIndexNumber, series?.[0]?.item?.ParentIndexNumber,
[groupBySeason, series], [groupBySeason],
); );
useEffect(() => { useEffect(() => {
@@ -112,70 +107,44 @@ export default function page() {
}, },
{ {
text: "Delete", text: "Delete",
onPress: () => onPress: () => deleteItems(groupBySeason),
deleteItems(
groupBySeason
.map((item) => item.Id)
.filter((id) => id !== undefined),
),
style: "destructive", style: "destructive",
}, },
], ],
); );
}, [groupBySeason, deleteItems]); }, [groupBySeason]);
const ListHeaderComponent = useCallback(() => {
if (series.length === 0) return null;
return (
<View className='flex flex-row items-center justify-start pb-2'>
<SeasonDropdown
item={series[0].item}
seasons={uniqueSeasons}
state={seasonIndexState}
initialSeasonIndex={initialSeasonIndex!}
onSelect={(season) => {
setSeasonIndexState((prev) => ({
...prev,
[series[0].item.ParentId ?? ""]: season.ParentIndexNumber,
}));
}}
/>
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center ml-2'>
<Text className='text-xs font-bold'>{groupBySeason.length}</Text>
</View>
<View className='bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto'>
<TouchableOpacity onPress={deleteSeries}>
<Ionicons name='trash' size={20} color='white' />
</TouchableOpacity>
</View>
</View>
);
}, [
series,
uniqueSeasons,
seasonIndexState,
initialSeasonIndex,
groupBySeason,
deleteSeries,
]);
return ( return (
<View className='flex-1'> <View className='flex-1'>
<FlashList {series.length > 0 && (
key={seasonIndex} <View className='flex flex-row items-center justify-start my-2 px-4'>
data={groupBySeason} <SeasonDropdown
renderItem={({ item }) => <EpisodeCard item={item} />} item={series[0].item}
keyExtractor={(item, index) => item.Id ?? `episode-${index}`} seasons={uniqueSeasons}
ListHeaderComponent={ListHeaderComponent} state={seasonIndexState}
contentInsetAdjustmentBehavior='automatic' initialSeasonIndex={initialSeasonIndex!}
contentContainerStyle={{ onSelect={(season) => {
paddingHorizontal: 16, setSeasonIndexState((prev) => ({
paddingLeft: insets.left + 16, ...prev,
paddingRight: insets.right + 16, [series[0].item.ParentId ?? ""]: season.ParentIndexNumber,
paddingTop: Platform.OS === "android" ? 10 : 8, }));
}} }}
/> />
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center ml-2'>
<Text className='text-xs font-bold'>{groupBySeason.length}</Text>
</View>
<View className='bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto'>
<TouchableOpacity onPress={deleteSeries}>
<Ionicons name='trash' size={20} color='white' />
</TouchableOpacity>
</View>
</View>
)}
<ScrollView key={seasonIndex} className='px-4'>
{groupBySeason.map((episode, index) => (
<EpisodeCard key={index} item={episode} />
))}
</ScrollView>
</View> </View>
); );
} }

View File

@@ -1,17 +1,17 @@
import { BottomSheetModal } from "@gorhom/bottom-sheet"; import { Ionicons } from "@expo/vector-icons";
import {
BottomSheetBackdrop,
type BottomSheetBackdropProps,
BottomSheetModal,
BottomSheetView,
} from "@gorhom/bottom-sheet";
import { useNavigation, useRouter } from "expo-router"; import { useNavigation, useRouter } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useEffect, useMemo, useRef, useState } from "react"; import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
Alert,
Platform,
ScrollView,
TouchableOpacity,
View,
} from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { TouchableItemRouter } from "@/components/common/TouchableItemRouter"; import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
import ActiveDownloads from "@/components/downloads/ActiveDownloads"; import ActiveDownloads from "@/components/downloads/ActiveDownloads";
@@ -26,15 +26,18 @@ import { writeToLog } from "@/utils/log";
export default function page() { export default function page() {
const navigation = useNavigation(); const navigation = useNavigation();
const { t } = useTranslation(); const { t } = useTranslation();
const [_queue, _setQueue] = useAtom(queueAtom); const [queue, setQueue] = useAtom(queueAtom);
const { downloadedItems, deleteFileByType, deleteAllFiles } = useDownload(); const {
removeProcess,
getDownloadedItems,
deleteFileByType,
deleteAllFiles,
} = useDownload();
const router = useRouter(); const router = useRouter();
const bottomSheetModalRef = useRef<BottomSheetModal>(null); const bottomSheetModalRef = useRef<BottomSheetModal>(null);
const [showMigration, setShowMigration] = useState(false); const [showMigration, setShowMigration] = useState(false);
const _insets = useSafeAreaInsets();
const migration_20241124 = () => { const migration_20241124 = () => {
Alert.alert( Alert.alert(
t("home.downloads.new_app_version_requires_re_download"), t("home.downloads.new_app_version_requires_re_download"),
@@ -59,7 +62,10 @@ export default function page() {
); );
}; };
const downloadedFiles = useMemo(() => downloadedItems, [downloadedItems]); const downloadedFiles = useMemo(
() => getDownloadedItems(),
[getDownloadedItems],
);
const movies = useMemo(() => { const movies = useMemo(() => {
try { try {
@@ -103,10 +109,7 @@ export default function page() {
useEffect(() => { useEffect(() => {
navigation.setOptions({ navigation.setOptions({
headerRight: () => ( headerRight: () => (
<TouchableOpacity <TouchableOpacity onPress={bottomSheetModalRef.current?.present}>
onPress={bottomSheetModalRef.current?.present}
className='px-2'
>
<DownloadSize items={downloadedFiles?.map((f) => f.item) || []} /> <DownloadSize items={downloadedFiles?.map((f) => f.item) || []} />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -119,7 +122,7 @@ export default function page() {
} }
}, [showMigration]); }, [showMigration]);
const _deleteMovies = () => const deleteMovies = () =>
deleteFileByType("Movie") deleteFileByType("Movie")
.then(() => .then(() =>
toast.success( toast.success(
@@ -130,7 +133,7 @@ export default function page() {
writeToLog("ERROR", reason); writeToLog("ERROR", reason);
toast.error(t("home.downloads.toasts.failed_to_delete_all_movies")); toast.error(t("home.downloads.toasts.failed_to_delete_all_movies"));
}); });
const _deleteShows = () => const deleteShows = () =>
deleteFileByType("Episode") deleteFileByType("Episode")
.then(() => .then(() =>
toast.success( toast.success(
@@ -141,39 +144,38 @@ export default function page() {
writeToLog("ERROR", reason); writeToLog("ERROR", reason);
toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries")); toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
}); });
const _deleteOtherMedia = () => const deleteOtherMedia = () =>
Promise.all( Promise.all(
otherMedia otherMedia.map((item) =>
.filter((item) => item.item.Type) deleteFileByType(item.item.Type)
.map((item) => .then(() =>
deleteFileByType(item.item.Type!) toast.success(
.then(() => t("home.downloads.toasts.deleted_media_successfully", {
toast.success( type: item.item.Type,
t("home.downloads.toasts.deleted_media_successfully", { }),
type: item.item.Type, ),
}), )
), .catch((reason) => {
) writeToLog("ERROR", reason);
.catch((reason) => { toast.error(
writeToLog("ERROR", reason); t("home.downloads.toasts.failed_to_delete_media", {
toast.error( type: item.item.Type,
t("home.downloads.toasts.failed_to_delete_media", { }),
type: item.item.Type, );
}), }),
); ),
}),
),
); );
const deleteAllMedia = async () =>
await Promise.all([deleteMovies(), deleteShows(), deleteOtherMedia()]);
return ( return (
<ScrollView <>
showsVerticalScrollIndicator={false} <View style={{ flex: 1 }}>
contentInsetAdjustmentBehavior='automatic' <ScrollView showsVerticalScrollIndicator={false} className='flex-1'>
> <View className='py-4'>
<View style={{ paddingTop: Platform.OS === "android" ? 17 : 0 }}> <View className='mb-4 flex flex-col space-y-4 px-4'>
<View className='mb-4 flex flex-col space-y-4 px-4'> <View className='bg-neutral-900 p-4 rounded-2xl'>
{/* Queue card - hidden */}
{/* <View className='bg-neutral-900 p-4 rounded-2xl'>
<Text className='text-lg font-bold'> <Text className='text-lg font-bold'>
{t("home.downloads.queue")} {t("home.downloads.queue")}
</Text> </Text>
@@ -215,96 +217,139 @@ export default function page() {
{t("home.downloads.no_items_in_queue")} {t("home.downloads.no_items_in_queue")}
</Text> </Text>
)} )}
</View> */}
<ActiveDownloads />
</View>
{movies.length > 0 && (
<View className='mb-4'>
<View className='flex flex-row items-center justify-between mb-2 px-4'>
<Text className='text-lg font-bold'>
{t("home.downloads.movies")}
</Text>
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
<Text className='text-xs font-bold'>{movies?.length}</Text>
</View> </View>
<ActiveDownloads />
</View> </View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'> {movies.length > 0 && (
{movies?.map((item) => ( <View className='mb-4'>
<TouchableItemRouter <View className='flex flex-row items-center justify-between mb-2 px-4'>
item={item.item} <Text className='text-lg font-bold'>
isOffline {t("home.downloads.movies")}
key={item.item.Id} </Text>
> <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
<MovieCard item={item.item} /> <Text className='text-xs font-bold'>{movies?.length}</Text>
</TouchableItemRouter> </View>
))} </View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'>
{movies?.map((item) => (
<TouchableItemRouter
item={item.item}
isOffline
key={item.item.Id}
>
<MovieCard item={item.item} />
</TouchableItemRouter>
))}
</View>
</ScrollView>
</View> </View>
</ScrollView> )}
</View> {groupedBySeries.length > 0 && (
)} <View className='mb-4'>
{groupedBySeries.length > 0 && ( <View className='flex flex-row items-center justify-between mb-2 px-4'>
<View className='mb-4'> <Text className='text-lg font-bold'>
<View className='flex flex-row items-center justify-between mb-2 px-4'> {t("home.downloads.tvseries")}
<Text className='text-lg font-bold'> </Text>
{t("home.downloads.tvseries")} <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
</Text> <Text className='text-xs font-bold'>
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'> {groupedBySeries?.length}
<Text className='text-xs font-bold'> </Text>
{groupedBySeries?.length} </View>
</View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'>
{groupedBySeries?.map((items) => (
<View
className='mb-2 last:mb-0'
key={items[0].item.SeriesId}
>
<SeriesCard
items={items.map((i) => i.item)}
key={items[0].item.SeriesId}
/>
</View>
))}
</View>
</ScrollView>
</View>
)}
{otherMedia.length > 0 && (
<View className='mb-4'>
<View className='flex flex-row items-center justify-between mb-2 px-4'>
<Text className='text-lg font-bold'>
{t("home.downloads.other_media")}
</Text>
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
<Text className='text-xs font-bold'>
{otherMedia?.length}
</Text>
</View>
</View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'>
{otherMedia?.map((item) => (
<TouchableItemRouter
item={item.item}
isOffline
key={item.item.Id}
>
<MovieCard item={item.item} />
</TouchableItemRouter>
))}
</View>
</ScrollView>
</View>
)}
{downloadedFiles?.length === 0 && (
<View className='flex px-4'>
<Text className='opacity-50'>
{t("home.downloads.no_downloaded_items")}
</Text> </Text>
</View> </View>
</View> )}
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'>
{groupedBySeries?.map((items) => (
<View className='mb-2 last:mb-0' key={items[0].item.SeriesId}>
<SeriesCard
items={items.map((i) => i.item)}
key={items[0].item.SeriesId}
/>
</View>
))}
</View>
</ScrollView>
</View> </View>
)} </ScrollView>
{otherMedia.length > 0 && (
<View className='mb-4'>
<View className='flex flex-row items-center justify-between mb-2 px-4'>
<Text className='text-lg font-bold'>
{t("home.downloads.other_media")}
</Text>
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
<Text className='text-xs font-bold'>{otherMedia?.length}</Text>
</View>
</View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'>
{otherMedia?.map((item) => (
<TouchableItemRouter
item={item.item}
isOffline
key={item.item.Id}
>
<MovieCard item={item.item} />
</TouchableItemRouter>
))}
</View>
</ScrollView>
</View>
)}
{downloadedFiles?.length === 0 && (
<View className='flex px-4'>
<Text className='opacity-50'>
{t("home.downloads.no_downloaded_items")}
</Text>
</View>
)}
</View> </View>
</ScrollView> <BottomSheetModal
ref={bottomSheetModalRef}
enableDynamicSizing
handleIndicatorStyle={{
backgroundColor: "white",
}}
backgroundStyle={{
backgroundColor: "#171717",
}}
backdropComponent={(props: BottomSheetBackdropProps) => (
<BottomSheetBackdrop
{...props}
disappearsOnIndex={-1}
appearsOnIndex={0}
/>
)}
>
<BottomSheetView>
<View className='p-4 space-y-4 mb-4'>
<Button color='purple' onPress={deleteMovies}>
{t("home.downloads.delete_all_movies_button")}
</Button>
<Button color='purple' onPress={deleteShows}>
{t("home.downloads.delete_all_tvseries_button")}
</Button>
{otherMedia.length > 0 && (
<Button color='purple' onPress={deleteOtherMedia}>
{t("home.downloads.delete_all_other_media_button")}
</Button>
)}
<Button color='red' onPress={deleteAllMedia}>
{t("home.downloads.delete_all_button")}
</Button>
</View>
</BottomSheetView>
</BottomSheetModal>
</>
); );
} }

View File

@@ -1,16 +1,5 @@
import { useSettings } from "@/utils/atoms/settings"; import { HomeIndex } from "@/components/home/HomeIndex";
import { Home } from "../../../../components/home/Home";
import { HomeWithCarousel } from "../../../../components/home/HomeWithCarousel";
const Index = () => { export default function page() {
const { settings } = useSettings(); return <HomeIndex />;
const showLargeHomeCarousel = settings.showLargeHomeCarousel ?? false; }
if (showLargeHomeCarousel) {
return <HomeWithCarousel />;
}
return <Home />;
};
export default Index;

View File

@@ -1,9 +1,11 @@
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import { HardwareAccelerationType } from "@jellyfin/sdk/lib/generated-client"; import {
HardwareAccelerationType,
type SessionInfoDto,
} from "@jellyfin/sdk/lib/generated-client";
import { import {
GeneralCommandType, GeneralCommandType,
PlaystateCommand, PlaystateCommand,
SessionInfoDto,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api"; import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
import { FlashList } from "@shopify/flash-list"; import { FlashList } from "@shopify/flash-list";
@@ -11,7 +13,7 @@ import { useQuery } from "@tanstack/react-query";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, TouchableOpacity, View } from "react-native"; import { TouchableOpacity, View } from "react-native";
import { Badge } from "@/components/Badge"; import { Badge } from "@/components/Badge";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { Loader } from "@/components/Loader"; import { Loader } from "@/components/Loader";
@@ -47,13 +49,14 @@ export default function page() {
<FlashList <FlashList
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{ contentContainerStyle={{
paddingTop: Platform.OS === "android" ? 17 : 0, paddingTop: 17,
paddingHorizontal: 17, paddingHorizontal: 17,
paddingBottom: 150, paddingBottom: 150,
}} }}
data={sessions} data={sessions}
renderItem={({ item }) => <SessionCard session={item} />} renderItem={({ item }) => <SessionCard session={item} />}
keyExtractor={(item) => item.Id || ""} keyExtractor={(item) => item.Id || ""}
estimatedItemSize={200}
/> />
); );
} }

View File

@@ -8,16 +8,34 @@ import { Text } from "@/components/common/Text";
import { ListGroup } from "@/components/list/ListGroup"; import { ListGroup } from "@/components/list/ListGroup";
import { ListItem } from "@/components/list/ListItem"; import { ListItem } from "@/components/list/ListItem";
import { AppLanguageSelector } from "@/components/settings/AppLanguageSelector"; 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";
import { PluginSettings } from "@/components/settings/PluginSettings";
import { QuickConnect } from "@/components/settings/QuickConnect"; import { QuickConnect } from "@/components/settings/QuickConnect";
import { StorageSettings } from "@/components/settings/StorageSettings"; import { StorageSettings } from "@/components/settings/StorageSettings";
import { SubtitleToggles } from "@/components/settings/SubtitleToggles";
import { UserInfo } from "@/components/settings/UserInfo"; import { UserInfo } from "@/components/settings/UserInfo";
import { useHaptic } from "@/hooks/useHaptic";
import { useJellyfin, userAtom } from "@/providers/JellyfinProvider"; import { useJellyfin, userAtom } from "@/providers/JellyfinProvider";
import { clearLogs } from "@/utils/log";
import { storage } from "@/utils/mmkv";
export default function settings() { export default function settings() {
const router = useRouter(); const router = useRouter();
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const [_user] = useAtom(userAtom); const [_user] = useAtom(userAtom);
const { logout } = useJellyfin(); const { logout } = useJellyfin();
const successHapticFeedback = useHaptic("success");
const onClearLogsClicked = async () => {
clearLogs();
successHapticFeedback();
};
const navigation = useNavigation(); const navigation = useNavigation();
useEffect(() => { useEffect(() => {
@@ -38,58 +56,61 @@ export default function settings() {
return ( return (
<ScrollView <ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{ contentContainerStyle={{
paddingLeft: insets.left, paddingLeft: insets.left,
paddingRight: insets.right, paddingRight: insets.right,
}} }}
> >
<View <View className='p-4 flex flex-col gap-y-4'>
className='p-4 flex flex-col' <UserInfo />
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<View className='mb-4'>
<UserInfo />
</View>
<QuickConnect className='mb-4' /> <QuickConnect className='mb-4' />
<View className='mb-4'> <MediaProvider>
<AppLanguageSelector /> <MediaToggles className='mb-4' />
</View> <GestureControls className='mb-4' />
<AudioToggles className='mb-4' />
<SubtitleToggles className='mb-4' />
</MediaProvider>
<OtherSettings />
{!Platform.isTV && <DownloadSettings />}
<PluginSettings />
<AppLanguageSelector />
{!Platform.isTV && <ChromecastSettings />}
<ListGroup title={"Intro"}>
<ListItem
onPress={() => {
router.push("/intro/page");
}}
title={t("home.settings.intro.show_intro")}
/>
<ListItem
textColor='red'
onPress={() => {
storage.set("hasShownIntro", false);
}}
title={t("home.settings.intro.reset_intro")}
/>
</ListGroup>
<View className='mb-4'> <View className='mb-4'>
<ListGroup title={t("home.settings.categories.title")}> <ListGroup title={t("home.settings.logs.logs_title")}>
<ListItem
onPress={() => router.push("/settings/playback-controls/page")}
showArrow
title={t("home.settings.playback_controls.title")}
/>
<ListItem
onPress={() => router.push("/settings/audio-subtitles/page")}
showArrow
title={t("home.settings.audio_subtitles.title")}
/>
<ListItem
onPress={() => router.push("/settings/appearance/page")}
showArrow
title={t("home.settings.appearance.title")}
/>
<ListItem
onPress={() => router.push("/settings/plugins/page")}
showArrow
title={t("home.settings.plugins.plugins_title")}
/>
<ListItem
onPress={() => router.push("/settings/intro/page")}
showArrow
title={t("home.settings.intro.title")}
/>
<ListItem <ListItem
onPress={() => router.push("/settings/logs/page")} onPress={() => router.push("/settings/logs/page")}
showArrow showArrow
title={t("home.settings.logs.logs_title")} title={t("home.settings.logs.logs_title")}
/> />
<ListItem
textColor='red'
onPress={onClearLogsClicked}
title={t("home.settings.logs.delete_all_logs")}
/>
</ListGroup> </ListGroup>
</View> </View>

View File

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

View File

@@ -1,25 +0,0 @@
import { Platform, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { AppearanceSettings } from "@/components/settings/AppearanceSettings";
export default function AppearancePage() {
const insets = useSafeAreaInsets();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<View
className='p-4 flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<AppearanceSettings />
<View className='h-24' />
</View>
</ScrollView>
);
}

View File

@@ -1,29 +0,0 @@
import { Platform, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { AudioToggles } from "@/components/settings/AudioToggles";
import { MediaProvider } from "@/components/settings/MediaContext";
import { SubtitleToggles } from "@/components/settings/SubtitleToggles";
export default function AudioSubtitlesPage() {
const insets = useSafeAreaInsets();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<View
className='p-4 flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<MediaProvider>
<AudioToggles className='mb-4' />
<SubtitleToggles className='mb-4' />
</MediaProvider>
</View>
</ScrollView>
);
}

View File

@@ -1,45 +0,0 @@
import { useRouter } from "expo-router";
import { useTranslation } from "react-i18next";
import { Platform, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { ListGroup } from "@/components/list/ListGroup";
import { ListItem } from "@/components/list/ListItem";
import { storage } from "@/utils/mmkv";
export default function IntroPage() {
const router = useRouter();
const insets = useSafeAreaInsets();
const { t } = useTranslation();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<View
className='p-4 flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<ListGroup title={t("home.settings.intro.title")}>
<ListItem
onPress={() => {
router.push("/intro/page");
}}
title={t("home.settings.intro.show_intro")}
/>
<ListItem
textColor='red'
onPress={() => {
storage.set("hasShownIntro", false);
}}
title={t("home.settings.intro.reset_intro")}
/>
</ListGroup>
<View className='h-24' />
</View>
</ScrollView>
);
}

View File

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

View File

@@ -1,21 +1,14 @@
import { File, Paths } from "expo-file-system";
import { useNavigation } from "expo-router"; import { useNavigation } from "expo-router";
import type * as SharingType from "expo-sharing"; import * as Sharing from "expo-sharing";
import { useCallback, useEffect, useId, useMemo, useState } from "react"; import { useCallback, useEffect, useId, useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, ScrollView, TouchableOpacity, View } from "react-native"; import { ScrollView, TouchableOpacity, View } from "react-native";
import Collapsible from "react-native-collapsible"; import Collapsible from "react-native-collapsible";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { FilterButton } from "@/components/filters/FilterButton"; import { FilterButton } from "@/components/filters/FilterButton";
import { Loader } from "@/components/Loader"; import { Loader } from "@/components/Loader";
import { LogLevel, useLog, writeErrorLog } from "@/utils/log"; import { LogLevel, useLog, writeErrorLog } from "@/utils/log";
// Conditionally import expo-sharing only on non-TV platforms
const Sharing = Platform.isTV
? null
: (require("expo-sharing") as typeof SharingType);
export default function Page() { export default function Page() {
const navigation = useNavigation(); const navigation = useNavigation();
const { logs } = useLog(); const { logs } = useLog();
@@ -39,7 +32,6 @@ export default function Page() {
const _orderId = useId(); const _orderId = useId();
const _levelsId = useId(); const _levelsId = useId();
const insets = useSafeAreaInsets();
const filteredLogs = useMemo( const filteredLogs = useMemo(
() => () =>
@@ -54,30 +46,27 @@ export default function Page() {
// Sharing it as txt while its formatted allows us to share it with many more applications // Sharing it as txt while its formatted allows us to share it with many more applications
const share = useCallback(async () => { const share = useCallback(async () => {
if (!Sharing) return; const uri = `${FileSystem.documentDirectory}logs.txt`;
const logsFile = new File(Paths.document, "logs.txt");
setLoading(true); setLoading(true);
try { FileSystem.writeAsStringAsync(uri, JSON.stringify(filteredLogs))
logsFile.write(JSON.stringify(filteredLogs)); .then(() => {
await Sharing.shareAsync(logsFile.uri, { mimeType: "txt", UTI: "txt" }); setLoading(false);
} catch (e: any) { Sharing.shareAsync(uri, { mimeType: "txt", UTI: "txt" });
writeErrorLog("Something went wrong attempting to export", e); })
} finally { .catch((e) =>
setLoading(false); writeErrorLog("Something went wrong attempting to export", e),
} )
}, [filteredLogs, Sharing]); .finally(() => setLoading(false));
}, [filteredLogs]);
useEffect(() => { useEffect(() => {
if (Platform.isTV) return;
navigation.setOptions({ navigation.setOptions({
headerRight: () => headerRight: () =>
loading ? ( loading ? (
<Loader /> <Loader />
) : ( ) : (
<TouchableOpacity onPress={share} className='px-2'> <TouchableOpacity onPress={share}>
<Text>{t("home.settings.logs.export_logs")}</Text> <Text>{t("home.settings.logs.export_logs")}</Text>
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -85,12 +74,7 @@ export default function Page() {
}, [share, loading]); }, [share, loading]);
return ( return (
<View <>
className='flex-1'
style={{
paddingTop: insets.top + 48,
}}
>
<View className='flex flex-row justify-end py-2 px-4 space-x-2'> <View className='flex flex-row justify-end py-2 px-4 space-x-2'>
<FilterButton <FilterButton
id={orderFilterId} id={orderFilterId}
@@ -172,6 +156,6 @@ export default function Page() {
)} )}
</View> </View>
</ScrollView> </ScrollView>
</View> </>
); );
} }

View File

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

View File

@@ -1,35 +0,0 @@
import { Platform, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { GestureControls } from "@/components/settings/GestureControls";
import { MediaProvider } from "@/components/settings/MediaContext";
import { MediaToggles } from "@/components/settings/MediaToggles";
import { PlaybackControlsSettings } from "@/components/settings/PlaybackControlsSettings";
import { ChromecastSettings } from "../../../../../../components/settings/ChromecastSettings";
export default function PlaybackControlsPage() {
const insets = useSafeAreaInsets();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<View
className='p-4 flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<View className='mb-4'>
<MediaProvider>
<MediaToggles className='mb-4' />
<GestureControls className='mb-4' />
<PlaybackControlsSettings />
</MediaProvider>
</View>
{!Platform.isTV && <ChromecastSettings />}
</View>
</ScrollView>
);
}

View File

@@ -1,27 +0,0 @@
import { ScrollView } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import DisabledSetting from "@/components/settings/DisabledSetting";
import { JellyseerrSettings } from "@/components/settings/Jellyseerr";
import { useSettings } from "@/utils/atoms/settings";
export default function page() {
const { pluginSettings } = useSettings();
const insets = useSafeAreaInsets();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<DisabledSetting
disabled={pluginSettings?.jellyseerrServerUrl?.locked === true}
className='px-4'
>
<JellyseerrSettings />
</DisabledSetting>
</ScrollView>
);
}

View File

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

View File

@@ -1,24 +0,0 @@
import { Platform, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { PluginSettings } from "@/components/settings/PluginSettings";
export default function PluginsPage() {
const insets = useSafeAreaInsets();
return (
<ScrollView
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
}}
>
<View
className='px-4 flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
<PluginSettings />
</View>
</ScrollView>
);
}

View File

@@ -16,7 +16,6 @@ import type React from "react";
import { useCallback, useEffect, useMemo, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { FlatList, View } from "react-native"; import { FlatList, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { TouchableItemRouter } from "@/components/common/TouchableItemRouter"; import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
import { FilterButton } from "@/components/filters/FilterButton"; import { FilterButton } from "@/components/filters/FilterButton";
@@ -205,154 +204,154 @@ const page: React.FC = () => {
const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []); const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
const _insets = useSafeAreaInsets();
const ListHeaderComponent = useCallback( const ListHeaderComponent = useCallback(
() => ( () => (
<FlatList <View className=''>
horizontal <FlatList
showsHorizontalScrollIndicator={false} horizontal
contentContainerStyle={{ showsHorizontalScrollIndicator={false}
display: "flex", contentContainerStyle={{
paddingHorizontal: 15, display: "flex",
paddingVertical: 16, paddingHorizontal: 15,
flexDirection: "row", paddingVertical: 16,
}} flexDirection: "row",
extraData={[ }}
selectedGenres, extraData={[
selectedYears, selectedGenres,
selectedTags, selectedYears,
sortBy, selectedTags,
sortOrder, sortBy,
]} sortOrder,
data={[ ]}
{ data={[
key: "reset", {
component: <ResetFiltersButton />, key: "reset",
}, component: <ResetFiltersButton />,
{ },
key: "genre", {
component: ( key: "genre",
<FilterButton component: (
className='mr-1' <FilterButton
id={collectionId} className='mr-1'
queryKey='genreFilter' id={collectionId}
queryFn={async () => { queryKey='genreFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: collectionId, userId: user?.Id,
}); parentId: collectionId,
return response.data.Genres || []; });
}} return response.data.Genres || [];
set={setSelectedGenres} }}
values={selectedGenres} set={setSelectedGenres}
title={t("library.filters.genres")} values={selectedGenres}
renderItemLabel={(item) => item.toString()} title={t("library.filters.genres")}
searchFilter={(item, search) => renderItemLabel={(item) => item.toString()}
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "year", {
component: ( key: "year",
<FilterButton component: (
className='mr-1' <FilterButton
id={collectionId} className='mr-1'
queryKey='yearFilter' id={collectionId}
queryFn={async () => { queryKey='yearFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: collectionId, userId: user?.Id,
}); parentId: collectionId,
return response.data.Years || []; });
}} return response.data.Years || [];
set={setSelectedYears} }}
values={selectedYears} set={setSelectedYears}
title={t("library.filters.years")} values={selectedYears}
renderItemLabel={(item) => item.toString()} title={t("library.filters.years")}
searchFilter={(item, search) => item.includes(search)} renderItemLabel={(item) => item.toString()}
/> searchFilter={(item, search) => item.includes(search)}
), />
}, ),
{ },
key: "tags", {
component: ( key: "tags",
<FilterButton component: (
className='mr-1' <FilterButton
id={collectionId} className='mr-1'
queryKey='tagsFilter' id={collectionId}
queryFn={async () => { queryKey='tagsFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: collectionId, userId: user?.Id,
}); parentId: collectionId,
return response.data.Tags || []; });
}} return response.data.Tags || [];
set={setSelectedTags} }}
values={selectedTags} set={setSelectedTags}
title={t("library.filters.tags")} values={selectedTags}
renderItemLabel={(item) => item.toString()} title={t("library.filters.tags")}
searchFilter={(item, search) => renderItemLabel={(item) => item.toString()}
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "sortBy", {
component: ( key: "sortBy",
<FilterButton component: (
className='mr-1' <FilterButton
id={collectionId} className='mr-1'
queryKey='sortBy' id={collectionId}
queryFn={async () => sortOptions.map((s) => s.key)} queryKey='sortBy'
set={setSortBy} queryFn={async () => sortOptions.map((s) => s.key)}
values={sortBy} set={setSortBy}
title={t("library.filters.sort_by")} values={sortBy}
renderItemLabel={(item) => title={t("library.filters.sort_by")}
sortOptions.find((i) => i.key === item)?.value || "" renderItemLabel={(item) =>
} sortOptions.find((i) => i.key === item)?.value || ""
searchFilter={(item, search) => }
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "sortOrder", {
component: ( key: "sortOrder",
<FilterButton component: (
className='mr-1' <FilterButton
id={collectionId} className='mr-1'
queryKey='sortOrder' id={collectionId}
queryFn={async () => sortOrderOptions.map((s) => s.key)} queryKey='sortOrder'
set={setSortOrder} queryFn={async () => sortOrderOptions.map((s) => s.key)}
values={sortOrder} set={setSortOrder}
title={t("library.filters.sort_order")} values={sortOrder}
renderItemLabel={(item) => title={t("library.filters.sort_order")}
sortOrderOptions.find((i) => i.key === item)?.value || "" renderItemLabel={(item) =>
} sortOrderOptions.find((i) => i.key === item)?.value || ""
searchFilter={(item, search) => }
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
]} },
renderItem={({ item }) => item.component} ]}
keyExtractor={(item) => item.key} renderItem={({ item }) => item.component}
/> keyExtractor={(item) => item.key}
/>
</View>
), ),
[ [
collectionId, collectionId,

View File

@@ -63,7 +63,6 @@ const Page: React.FC = () => {
const [issueType, setIssueType] = useState<IssueType>(); const [issueType, setIssueType] = useState<IssueType>();
const [issueMessage, setIssueMessage] = useState<string>(); const [issueMessage, setIssueMessage] = useState<string>();
const [requestBody, _setRequestBody] = useState<MediaRequestBody>(); const [requestBody, _setRequestBody] = useState<MediaRequestBody>();
const [issueTypeDropdownOpen, setIssueTypeDropdownOpen] = useState(false);
const advancedReqModalRef = useRef<BottomSheetModal>(null); const advancedReqModalRef = useRef<BottomSheetModal>(null);
const bottomSheetModalRef = useRef<BottomSheetModal>(null); const bottomSheetModalRef = useRef<BottomSheetModal>(null);
@@ -114,10 +113,6 @@ const Page: React.FC = () => {
} }
}, [jellyseerrApi, details, result, issueType, issueMessage]); }, [jellyseerrApi, details, result, issueType, issueMessage]);
const handleIssueModalDismiss = useCallback(() => {
setIssueTypeDropdownOpen(false);
}, []);
const setRequestBody = useCallback( const setRequestBody = useCallback(
(body: MediaRequestBody) => { (body: MediaRequestBody) => {
_setRequestBody(body); _setRequestBody(body);
@@ -131,11 +126,9 @@ const Page: React.FC = () => {
mediaId: Number(result.id!), mediaId: Number(result.id!),
mediaType: mediaType!, mediaType: mediaType!,
tvdbId: details?.externalIds?.tvdbId, tvdbId: details?.externalIds?.tvdbId,
...(mediaType === MediaType.TV && { seasons: (details as TvDetails)?.seasons
seasons: (details as TvDetails)?.seasons ?.filter?.((s) => s.seasonNumber !== 0)
?.filter?.((s) => s.seasonNumber !== 0) ?.map?.((s) => s.seasonNumber),
?.map?.((s) => s.seasonNumber),
}),
}; };
if (hasAdvancedRequestPermission) { if (hasAdvancedRequestPermission) {
@@ -183,9 +176,7 @@ const Page: React.FC = () => {
if (details) { if (details) {
navigation.setOptions({ navigation.setOptions({
headerRight: () => ( headerRight: () => (
<TouchableOpacity <TouchableOpacity className='rounded-full p-2 bg-neutral-800/80'>
className={`rounded-full pl-1.5 ${Platform.OS === "android" ? "" : "bg-neutral-800/80"}`}
>
<ItemActions item={details} /> <ItemActions item={details} />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -380,8 +371,6 @@ const Page: React.FC = () => {
backgroundColor: "#171717", backgroundColor: "#171717",
}} }}
backdropComponent={renderBackdrop} backdropComponent={renderBackdrop}
stackBehavior='push'
onDismiss={handleIssueModalDismiss}
> >
<BottomSheetView> <BottomSheetView>
<View className='flex flex-col space-y-4 px-4 pb-8 pt-2'> <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>
@@ -407,8 +396,6 @@ const Page: React.FC = () => {
</View> </View>
} }
title={t("jellyseerr.types")} title={t("jellyseerr.types")}
open={issueTypeDropdownOpen}
onOpenChange={setIssueTypeDropdownOpen}
/> />
</View> </View>

View File

@@ -87,15 +87,14 @@ export default function page() {
<Text className='font-bold text-2xl mb-1'>{data?.details?.name}</Text> <Text className='font-bold text-2xl mb-1'>{data?.details?.name}</Text>
<Text className='opacity-50'> <Text className='opacity-50'>
{t("jellyseerr.born")}{" "} {t("jellyseerr.born")}{" "}
{data?.details?.birthday && {new Date(data?.details?.birthday!).toLocaleDateString(
new Date(data.details.birthday).toLocaleDateString( `${locale}-${region}`,
`${locale}-${region}`, {
{ year: "numeric",
year: "numeric", month: "long",
month: "long", day: "numeric",
day: "numeric", },
}, )}{" "}
)}{" "}
| {data?.details?.placeOfBirth} | {data?.details?.placeOfBirth}
</Text> </Text>
</> </>

View File

@@ -33,6 +33,7 @@ export default function page() {
<View className='flex flex-1'> <View className='flex flex-1'>
<FlashList <FlashList
data={channels?.Items} data={channels?.Items}
estimatedItemSize={76}
renderItem={({ item }) => ( renderItem={({ item }) => (
<View className='flex flex-row items-center px-4 mb-2'> <View className='flex flex-row items-center px-4 mb-2'>
<View className='w-22 mr-4 rounded-lg overflow-hidden'> <View className='w-22 mr-4 rounded-lg overflow-hidden'>

View File

@@ -65,11 +65,9 @@ const page: React.FC = () => {
const { data: allEpisodes, isLoading } = useQuery({ const { data: allEpisodes, isLoading } = useQuery({
queryKey: ["AllEpisodes", item?.Id], queryKey: ["AllEpisodes", item?.Id],
queryFn: async () => { queryFn: async () => {
if (!api || !user?.Id || !item?.Id) return []; const res = await getTvShowsApi(api!).getEpisodes({
seriesId: item?.Id!,
const res = await getTvShowsApi(api).getEpisodes({ userId: user?.Id!,
seriesId: item.Id,
userId: user.Id,
enableUserData: true, enableUserData: true,
// Note: Including trick play is necessary to enable trick play downloads // Note: Including trick play is necessary to enable trick play downloads
fields: ["MediaSources", "MediaStreams", "Overview", "Trickplay"], fields: ["MediaSources", "MediaStreams", "Overview", "Trickplay"],

View File

@@ -271,143 +271,145 @@ const Page = () => {
const ListHeaderComponent = useCallback( const ListHeaderComponent = useCallback(
() => ( () => (
<FlatList <View className=''>
horizontal <FlatList
showsHorizontalScrollIndicator={false} horizontal
contentContainerStyle={{ showsHorizontalScrollIndicator={false}
display: "flex", contentContainerStyle={{
paddingHorizontal: 15, display: "flex",
paddingVertical: 16, paddingHorizontal: 15,
flexDirection: "row", paddingVertical: 16,
}} flexDirection: "row",
data={[ }}
{ data={[
key: "reset", {
component: <ResetFiltersButton />, key: "reset",
}, component: <ResetFiltersButton />,
{ },
key: "genre", {
component: ( key: "genre",
<FilterButton component: (
className='mr-1' <FilterButton
id={libraryId} className='mr-1'
queryKey='genreFilter' id={libraryId}
queryFn={async () => { queryKey='genreFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: libraryId, userId: user?.Id,
}); parentId: libraryId,
return response.data.Genres || []; });
}} return response.data.Genres || [];
set={setSelectedGenres} }}
values={selectedGenres} set={setSelectedGenres}
title={t("library.filters.genres")} values={selectedGenres}
renderItemLabel={(item) => item.toString()} title={t("library.filters.genres")}
searchFilter={(item, search) => renderItemLabel={(item) => item.toString()}
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "year", {
component: ( key: "year",
<FilterButton component: (
className='mr-1' <FilterButton
id={libraryId} className='mr-1'
queryKey='yearFilter' id={libraryId}
queryFn={async () => { queryKey='yearFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: libraryId, userId: user?.Id,
}); parentId: libraryId,
return response.data.Years || []; });
}} return response.data.Years || [];
set={setSelectedYears} }}
values={selectedYears} set={setSelectedYears}
title={t("library.filters.years")} values={selectedYears}
renderItemLabel={(item) => item.toString()} title={t("library.filters.years")}
searchFilter={(item, search) => item.includes(search)} renderItemLabel={(item) => item.toString()}
/> searchFilter={(item, search) => item.includes(search)}
), />
}, ),
{ },
key: "tags", {
component: ( key: "tags",
<FilterButton component: (
className='mr-1' <FilterButton
id={libraryId} className='mr-1'
queryKey='tagsFilter' id={libraryId}
queryFn={async () => { queryKey='tagsFilter'
if (!api) return null; queryFn={async () => {
const response = await getFilterApi( if (!api) return null;
api, const response = await getFilterApi(
).getQueryFiltersLegacy({ api,
userId: user?.Id, ).getQueryFiltersLegacy({
parentId: libraryId, userId: user?.Id,
}); parentId: libraryId,
return response.data.Tags || []; });
}} return response.data.Tags || [];
set={setSelectedTags} }}
values={selectedTags} set={setSelectedTags}
title={t("library.filters.tags")} values={selectedTags}
renderItemLabel={(item) => item.toString()} title={t("library.filters.tags")}
searchFilter={(item, search) => renderItemLabel={(item) => item.toString()}
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "sortBy", {
component: ( key: "sortBy",
<FilterButton component: (
className='mr-1' <FilterButton
id={libraryId} className='mr-1'
queryKey='sortBy' id={libraryId}
queryFn={async () => sortOptions.map((s) => s.key)} queryKey='sortBy'
set={setSortBy} queryFn={async () => sortOptions.map((s) => s.key)}
values={sortBy} set={setSortBy}
title={t("library.filters.sort_by")} values={sortBy}
renderItemLabel={(item) => title={t("library.filters.sort_by")}
sortOptions.find((i) => i.key === item)?.value || "" renderItemLabel={(item) =>
} sortOptions.find((i) => i.key === item)?.value || ""
searchFilter={(item, search) => }
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
{ },
key: "sortOrder", {
component: ( key: "sortOrder",
<FilterButton component: (
className='mr-1' <FilterButton
id={libraryId} className='mr-1'
queryKey='sortOrder' id={libraryId}
queryFn={async () => sortOrderOptions.map((s) => s.key)} queryKey='sortOrder'
set={setSortOrder} queryFn={async () => sortOrderOptions.map((s) => s.key)}
values={sortOrder} set={setSortOrder}
title={t("library.filters.sort_order")} values={sortOrder}
renderItemLabel={(item) => title={t("library.filters.sort_order")}
sortOrderOptions.find((i) => i.key === item)?.value || "" renderItemLabel={(item) =>
} sortOrderOptions.find((i) => i.key === item)?.value || ""
searchFilter={(item, search) => }
item.toLowerCase().includes(search.toLowerCase()) searchFilter={(item, search) =>
} item.toLowerCase().includes(search.toLowerCase())
/> }
), />
}, ),
]} },
renderItem={({ item }) => item.component} ]}
keyExtractor={(item) => item.key} renderItem={({ item }) => item.component}
/> keyExtractor={(item) => item.key}
/>
</View>
), ),
[ [
libraryId, libraryId,
@@ -451,6 +453,7 @@ const Page = () => {
renderItem={renderItem} renderItem={renderItem}
extraData={[orientation, nrOfCols]} extraData={[orientation, nrOfCols]}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}
estimatedItemSize={244}
numColumns={nrOfCols} numColumns={nrOfCols}
onEndReached={() => { onEndReached={() => {
if (hasNextPage) { if (hasNextPage) {

View File

@@ -1,152 +1,16 @@
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { Stack } from "expo-router"; import { Stack } from "expo-router";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, View } from "react-native"; import { Platform } from "react-native";
import { PlatformDropdown } from "@/components/PlatformDropdown"; import { PlatformDropdown } from "@/components/PlatformDropdown";
import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack"; import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
export default function IndexLayout() { export default function IndexLayout() {
const { settings, updateSettings, pluginSettings } = useSettings(); const { settings, updateSettings, pluginSettings } = useSettings();
const [dropdownOpen, setDropdownOpen] = useState(false);
const { t } = useTranslation(); const { t } = useTranslation();
// Reset dropdown state when component unmounts or navigates away
useEffect(() => {
return () => {
setDropdownOpen(false);
};
}, []);
// Memoize callbacks to prevent recreating on every render
const handleDisplayRow = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
display: "row",
},
});
}, [settings.libraryOptions, updateSettings]);
const handleDisplayList = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
display: "list",
},
});
}, [settings.libraryOptions, updateSettings]);
const handleImageStylePoster = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
imageStyle: "poster",
},
});
}, [settings.libraryOptions, updateSettings]);
const handleImageStyleCover = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
imageStyle: "cover",
},
});
}, [settings.libraryOptions, updateSettings]);
const handleToggleTitles = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
showTitles: !settings.libraryOptions.showTitles,
},
});
}, [settings.libraryOptions, updateSettings]);
const handleToggleStats = useCallback(() => {
updateSettings({
libraryOptions: {
...settings.libraryOptions,
showStats: !settings.libraryOptions.showStats,
},
});
}, [settings.libraryOptions, updateSettings]);
// Memoize groups to prevent recreating the array on every render
const dropdownGroups = useMemo(
() => [
{
title: t("library.options.display"),
options: [
{
type: "radio" as const,
label: t("library.options.row"),
value: "row",
selected: settings.libraryOptions.display === "row",
onPress: handleDisplayRow,
},
{
type: "radio" as const,
label: t("library.options.list"),
value: "list",
selected: settings.libraryOptions.display === "list",
onPress: handleDisplayList,
},
],
},
{
title: t("library.options.image_style"),
options: [
{
type: "radio" as const,
label: t("library.options.poster"),
value: "poster",
selected: settings.libraryOptions.imageStyle === "poster",
onPress: handleImageStylePoster,
},
{
type: "radio" as const,
label: t("library.options.cover"),
value: "cover",
selected: settings.libraryOptions.imageStyle === "cover",
onPress: handleImageStyleCover,
},
],
},
{
title: "Options",
options: [
{
type: "toggle" as const,
label: t("library.options.show_titles"),
value: settings.libraryOptions.showTitles,
onToggle: handleToggleTitles,
disabled: settings.libraryOptions.imageStyle === "poster",
},
{
type: "toggle" as const,
label: t("library.options.show_stats"),
value: settings.libraryOptions.showStats,
onToggle: handleToggleStats,
},
],
},
],
[
t,
settings.libraryOptions,
handleDisplayRow,
handleDisplayList,
handleImageStylePoster,
handleImageStyleCover,
handleToggleTitles,
handleToggleStats,
],
);
if (!settings?.libraryOptions) return null; if (!settings?.libraryOptions) return null;
return ( return (
@@ -163,19 +27,111 @@ export default function IndexLayout() {
!pluginSettings?.libraryOptions?.locked && !pluginSettings?.libraryOptions?.locked &&
!Platform.isTV && ( !Platform.isTV && (
<PlatformDropdown <PlatformDropdown
open={dropdownOpen}
onOpenChange={setDropdownOpen}
trigger={ trigger={
<View className='pl-1.5'> <Ionicons
<Ionicons name='ellipsis-horizontal-outline'
name='ellipsis-horizontal-outline' size={24}
size={24} color='white'
color='white' />
/>
</View>
} }
title={t("library.options.display")} title={t("library.options.display")}
groups={dropdownGroups} groups={[
{
title: t("library.options.display"),
options: [
{
type: "radio",
label: t("library.options.row"),
value: "row",
selected: settings.libraryOptions.display === "row",
onPress: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
display: "row",
},
}),
},
{
type: "radio",
label: t("library.options.list"),
value: "list",
selected: settings.libraryOptions.display === "list",
onPress: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
display: "list",
},
}),
},
],
},
{
title: t("library.options.image_style"),
options: [
{
type: "radio",
label: t("library.options.poster"),
value: "poster",
selected:
settings.libraryOptions.imageStyle === "poster",
onPress: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
imageStyle: "poster",
},
}),
},
{
type: "radio",
label: t("library.options.cover"),
value: "cover",
selected:
settings.libraryOptions.imageStyle === "cover",
onPress: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
imageStyle: "cover",
},
}),
},
],
},
{
title: "Options",
options: [
{
type: "toggle",
label: t("library.options.show_titles"),
value: settings.libraryOptions.showTitles,
onToggle: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
showTitles: !settings.libraryOptions.showTitles,
},
}),
disabled:
settings.libraryOptions.imageStyle === "poster",
},
{
type: "toggle",
label: t("library.options.show_stats"),
value: settings.libraryOptions.showStats,
onToggle: () =>
updateSettings({
libraryOptions: {
...settings.libraryOptions,
showStats: !settings.libraryOptions.showStats,
},
}),
},
],
},
]}
/> />
), ),
}} }}

View File

@@ -7,7 +7,7 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useEffect, useMemo } from "react"; import { useEffect, useMemo } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, StyleSheet, View } from "react-native"; import { StyleSheet, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { Loader } from "@/components/Loader"; import { Loader } from "@/components/Loader";
@@ -84,7 +84,7 @@ export default function index() {
extraData={settings} extraData={settings}
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{ contentContainerStyle={{
paddingTop: Platform.OS === "android" ? 17 : 0, paddingTop: 17,
paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17, paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17,
paddingBottom: 150, paddingBottom: 150,
paddingLeft: insets.left + 17, paddingLeft: insets.left + 17,

View File

@@ -28,7 +28,7 @@ export default function SearchLayout() {
options={{ options={{
title: "", title: "",
headerShown: !Platform.isTV, headerShown: !Platform.isTV,
headerBlurEffect: "none", headerBlurEffect: "prominent",
headerTransparent: Platform.OS === "ios", headerTransparent: Platform.OS === "ios",
headerShadowVisible: false, headerShadowVisible: false,
}} }}

View File

@@ -282,12 +282,9 @@ export default function search() {
maxLength={500} maxLength={500}
/> />
)} )}
<View <View className='flex flex-col'>
className='flex flex-col'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
{jellyseerrApi && ( {jellyseerrApi && (
<View className='pl-4 pr-4 flex flex-row'> <View className='pl-4 pr-4 pt-2 flex flex-row'>
<SearchTabButtons <SearchTabButtons
searchType={searchType} searchType={searchType}
setSearchType={setSearchType} setSearchType={setSearchType}

View File

@@ -55,7 +55,6 @@ export default function TabLayout() {
backgroundColor: "#121212", backgroundColor: "#121212",
}} }}
tabBarActiveTintColor={Colors.primary} tabBarActiveTintColor={Colors.primary}
activeIndicatorColor={"#392c3b"}
scrollEdgeAppearance='default' scrollEdgeAppearance='default'
> >
<NativeTabs.Screen redirect name='index' /> <NativeTabs.Screen redirect name='index' />
@@ -71,7 +70,10 @@ export default function TabLayout() {
tabBarIcon: tabBarIcon:
Platform.OS === "android" Platform.OS === "android"
? (_e) => require("@/assets/icons/house.fill.png") ? (_e) => require("@/assets/icons/house.fill.png")
: (_e) => ({ sfSymbol: "house.fill" }), : ({ focused }) =>
focused
? { sfSymbol: "house.fill" }
: { sfSymbol: "house" },
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
@@ -82,12 +84,14 @@ export default function TabLayout() {
})} })}
name='(search)' name='(search)'
options={{ options={{
role: "search",
title: t("tabs.search"), title: t("tabs.search"),
tabBarIcon: tabBarIcon:
Platform.OS === "android" Platform.OS === "android"
? (_e) => require("@/assets/icons/magnifyingglass.png") ? (_e) => require("@/assets/icons/magnifyingglass.png")
: (_e) => ({ sfSymbol: "magnifyingglass" }), : ({ focused }) =>
focused
? { sfSymbol: "magnifyingglass" }
: { sfSymbol: "magnifyingglass" },
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
@@ -96,8 +100,14 @@ export default function TabLayout() {
title: t("tabs.favorites"), title: t("tabs.favorites"),
tabBarIcon: tabBarIcon:
Platform.OS === "android" Platform.OS === "android"
? (_e) => require("@/assets/icons/heart.fill.png") ? ({ focused }) =>
: (_e) => ({ sfSymbol: "heart.fill" }), focused
? require("@/assets/icons/heart.fill.png")
: require("@/assets/icons/heart.png")
: ({ focused }) =>
focused
? { sfSymbol: "heart.fill" }
: { sfSymbol: "heart" },
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
@@ -107,7 +117,10 @@ export default function TabLayout() {
tabBarIcon: tabBarIcon:
Platform.OS === "android" Platform.OS === "android"
? (_e) => require("@/assets/icons/server.rack.png") ? (_e) => require("@/assets/icons/server.rack.png")
: (_e) => ({ sfSymbol: "rectangle.stack.fill" }), : ({ focused }) =>
focused
? { sfSymbol: "rectangle.stack.fill" }
: { sfSymbol: "rectangle.stack" },
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
@@ -118,7 +131,10 @@ export default function TabLayout() {
tabBarIcon: tabBarIcon:
Platform.OS === "android" Platform.OS === "android"
? (_e) => require("@/assets/icons/list.png") ? (_e) => require("@/assets/icons/list.png")
: (_e) => ({ sfSymbol: "list.dash.fill" }), : ({ focused }) =>
focused
? { sfSymbol: "list.dash.fill" }
: { sfSymbol: "list.dash" },
}} }}
/> />
</NativeTabs> </NativeTabs>

View File

@@ -29,7 +29,6 @@ import {
VLCColor, VLCColor,
} from "@/constants/SubtitleConstants"; } from "@/constants/SubtitleConstants";
import { useHaptic } from "@/hooks/useHaptic"; import { useHaptic } from "@/hooks/useHaptic";
import { useOrientation } from "@/hooks/useOrientation";
import { usePlaybackManager } from "@/hooks/usePlaybackManager"; import { usePlaybackManager } from "@/hooks/usePlaybackManager";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache"; import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useWebSocket } from "@/hooks/useWebsockets"; import { useWebSocket } from "@/hooks/useWebsockets";
@@ -57,7 +56,6 @@ export default function page() {
const [isPlaybackStopped, setIsPlaybackStopped] = useState(false); const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
const [showControls, _setShowControls] = useState(true); const [showControls, _setShowControls] = useState(true);
const [isPipMode, setIsPipMode] = useState(false);
const [aspectRatio, setAspectRatio] = useState< const [aspectRatio, setAspectRatio] = useState<
"default" | "16:9" | "4:3" | "1:1" | "21:9" "default" | "16:9" | "4:3" | "1:1" | "21:9"
>("default"); >("default");
@@ -110,7 +108,6 @@ export default function page() {
playbackPosition?: string; playbackPosition?: string;
}>(); }>();
const { settings } = useSettings(); const { settings } = useSettings();
const { lockOrientation, unlockOrientation } = useOrientation();
const offline = offlineStr === "true"; const offline = offlineStr === "true";
const playbackManager = usePlaybackManager(); const playbackManager = usePlaybackManager();
@@ -173,16 +170,6 @@ export default function page() {
} }
}, [itemId, offline, api, user?.Id]); }, [itemId, offline, api, user?.Id]);
useEffect(() => {
if (settings?.defaultVideoOrientation) {
lockOrientation(settings.defaultVideoOrientation);
}
return () => {
unlockOrientation();
};
}, [settings?.defaultVideoOrientation]);
interface Stream { interface Stream {
mediaSource: MediaSourceInfo; mediaSource: MediaSourceInfo;
sessionId: string; sessionId: string;
@@ -298,14 +285,12 @@ export default function page() {
}; };
const reportPlaybackStopped = useCallback(async () => { const reportPlaybackStopped = useCallback(async () => {
if (!item?.Id || !stream?.sessionId) return;
const currentTimeInTicks = msToTicks(progress.get()); const currentTimeInTicks = msToTicks(progress.get());
await getPlaystateApi(api!).onPlaybackStopped({ await getPlaystateApi(api!).onPlaybackStopped({
itemId: item.Id, itemId: item?.Id!,
mediaSourceId: mediaSourceId, mediaSourceId: mediaSourceId,
positionTicks: currentTimeInTicks, positionTicks: currentTimeInTicks,
playSessionId: stream.sessionId, playSessionId: stream?.sessionId!,
}); });
}, [ }, [
api, api,
@@ -336,9 +321,9 @@ export default function page() {
}, [navigation, stop]); }, [navigation, stop]);
const currentPlayStateInfo = useCallback(() => { const currentPlayStateInfo = useCallback(() => {
if (!stream || !item?.Id) return; if (!stream) return;
return { return {
itemId: item.Id, itemId: item?.Id!,
audioStreamIndex: audioIndex ? audioIndex : undefined, audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined, subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId, mediaSourceId: mediaSourceId,
@@ -745,12 +730,9 @@ export default function page() {
); );
writeToLog("ERROR", "Video Error", e.nativeEvent); writeToLog("ERROR", "Video Error", e.nativeEvent);
}} }}
onPipStarted={(e) => {
setIsPipMode(e.nativeEvent.pipStarted);
}}
/> />
</View> </View>
{isMounted === true && item && !isPipMode && ( {isMounted === true && item && (
<Controls <Controls
mediaSource={stream?.mediaSource} mediaSource={stream?.mediaSource}
item={item} item={item}
@@ -782,7 +764,6 @@ export default function page() {
setAspectRatio={setAspectRatio} setAspectRatio={setAspectRatio}
setScaleFactor={setScaleFactor} setScaleFactor={setScaleFactor}
isVlc isVlc
api={api}
downloadedFiles={downloadedFiles} downloadedFiles={downloadedFiles}
/> />
)} )}

View File

@@ -1,10 +1,6 @@
import "@/augmentations"; import "@/augmentations";
import { ActionSheetProvider } from "@expo/react-native-action-sheet"; import { ActionSheetProvider } from "@expo/react-native-action-sheet";
import { BottomSheetModalProvider } from "@gorhom/bottom-sheet"; import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
import { DarkTheme, ThemeProvider } from "@react-navigation/native";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import * as BackgroundTask from "expo-background-task";
import * as Device from "expo-device";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { GlobalModal } from "@/components/GlobalModal"; import { GlobalModal } from "@/components/GlobalModal";
import i18n from "@/i18n"; import i18n from "@/i18n";
@@ -13,12 +9,12 @@ import { GlobalModalProvider } from "@/providers/GlobalModalProvider";
import { import {
apiAtom, apiAtom,
getOrSetDeviceId, getOrSetDeviceId,
getTokenFromStorage,
JellyfinProvider, JellyfinProvider,
} from "@/providers/JellyfinProvider"; } from "@/providers/JellyfinProvider";
import { NetworkStatusProvider } from "@/providers/NetworkStatusProvider";
import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider"; import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
import { WebSocketProvider } from "@/providers/WebSocketProvider"; import { WebSocketProvider } from "@/providers/WebSocketProvider";
import { useSettings } from "@/utils/atoms/settings"; import { type Settings, useSettings } from "@/utils/atoms/settings";
import { import {
BACKGROUND_FETCH_TASK, BACKGROUND_FETCH_TASK,
BACKGROUND_FETCH_TASK_SESSIONS, BACKGROUND_FETCH_TASK_SESSIONS,
@@ -32,29 +28,44 @@ import {
} from "@/utils/log"; } from "@/utils/log";
import { storage } from "@/utils/mmkv"; import { storage } from "@/utils/mmkv";
const BackGroundDownloader = !Platform.isTV
? require("@kesha-antonov/react-native-background-downloader")
: null;
import { DarkTheme, ThemeProvider } from "@react-navigation/native";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import * as BackgroundTask from "expo-background-task";
import * as Device from "expo-device";
import { Paths } from "expo-file-system";
const Notifications = !Platform.isTV ? require("expo-notifications") : null; const Notifications = !Platform.isTV ? require("expo-notifications") : null;
import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
import { getLocales } from "expo-localization"; import { getLocales } from "expo-localization";
import { router, Stack, useSegments } from "expo-router";
import * as SplashScreen from "expo-splash-screen";
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"; import type { EventSubscription } from "expo-modules-core";
import type { import type {
Notification, Notification,
NotificationResponse, NotificationResponse,
} from "expo-notifications/build/Notifications.types"; } from "expo-notifications/build/Notifications.types";
import type { ExpoPushToken } from "expo-notifications/build/Tokens.types"; import type { ExpoPushToken } from "expo-notifications/build/Tokens.types";
import { router, Stack, useSegments } from "expo-router"; import { useAtom } from "jotai";
import * as SplashScreen from "expo-splash-screen"; import { Toaster } from "sonner-native";
import * as TaskManager from "expo-task-manager";
import { Provider as JotaiProvider, useAtom } from "jotai";
import { useCallback, useEffect, useRef, useState } from "react";
import { I18nextProvider } from "react-i18next";
import { Appearance } from "react-native";
import { SystemBars } from "react-native-edge-to-edge";
import { GestureHandlerRootView } from "react-native-gesture-handler";
import { userAtom } from "@/providers/JellyfinProvider"; import { userAtom } from "@/providers/JellyfinProvider";
import { store } from "@/utils/store"; import { store } from "@/utils/store";
import "react-native-reanimated";
import { Toaster } from "sonner-native";
if (!Platform.isTV) { if (!Platform.isTV) {
Notifications.setNotificationHandler({ Notifications.setNotificationHandler({
@@ -122,7 +133,24 @@ if (!Platform.isTV) {
TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => { TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
console.log("TaskManager ~ trigger"); console.log("TaskManager ~ trigger");
// Background fetch task placeholder - currently unused
const settingsData = storage.getString("settings");
if (!settingsData) return BackgroundTask.BackgroundTaskResult.Failed;
const settings: Partial<Settings> = JSON.parse(settingsData);
if (!settings?.autoDownload)
return BackgroundTask.BackgroundTaskResult.Failed;
const token = getTokenFromStorage();
const deviceId = getOrSetDeviceId();
const baseDirectory = Paths.document.uri;
if (!token || !deviceId || !baseDirectory)
return BackgroundTask.BackgroundTaskResult.Failed;
// Be sure to return the successful result type!
return BackgroundTask.BackgroundTaskResult.Success; return BackgroundTask.BackgroundTaskResult.Success;
}); });
} }
@@ -187,7 +215,11 @@ export default function RootLayout() {
const queryClient = new QueryClient({ const queryClient = new QueryClient({
defaultOptions: { defaultOptions: {
queries: { queries: {
staleTime: 30000, staleTime: 0,
refetchOnMount: true,
refetchOnReconnect: true,
refetchOnWindowFocus: true,
retryOnMount: true,
}, },
}, },
}); });
@@ -196,7 +228,8 @@ function Layout() {
const { settings } = useSettings(); const { settings } = useSettings();
const [user] = useAtom(userAtom); const [user] = useAtom(userAtom);
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
const _segments = useSegments(); const appState = useRef(AppState.currentState);
const segments = useSegments();
useEffect(() => { useEffect(() => {
i18n.changeLanguage( i18n.changeLanguage(
@@ -225,7 +258,7 @@ function Layout() {
} else console.log("No token available"); } else console.log("No token available");
}, [api, expoPushToken, user]); }, [api, expoPushToken, user]);
const registerNotifications = useCallback(async () => { async function registerNotifications() {
if (Platform.OS === "android") { if (Platform.OS === "android") {
console.log("Setting android notification channel 'default'"); console.log("Setting android notification channel 'default'");
await Notifications?.setNotificationChannelAsync("default", { await Notifications?.setNotificationChannelAsync("default", {
@@ -256,21 +289,11 @@ function Layout() {
// only create push token for real devices (pointless for emulators) // only create push token for real devices (pointless for emulators)
if (Device.isDevice) { if (Device.isDevice) {
Notifications?.getExpoPushTokenAsync({ Notifications?.getExpoPushTokenAsync()
projectId: "e79219d1-797f-4fbe-9fa1-cfd360690a68", .then((token: ExpoPushToken) => token && setExpoPushToken(token))
}) .catch((reason: any) => console.log("Failed to get token", reason));
.then((token: ExpoPushToken) => {
if (token) {
console.log("Expo push token obtained:", token.data);
setExpoPushToken(token);
}
})
.catch((reason: any) => {
console.error("Failed to get push token:", reason);
writeErrorLog("Failed to get Expo push token", reason);
});
} }
}, [user]); }
useEffect(() => { useEffect(() => {
if (!Platform.isTV) { if (!Platform.isTV) {
@@ -334,70 +357,124 @@ function Layout() {
responseListener.current?.remove(); responseListener.current?.remove();
}; };
} }
}, [user]); }, [user, api]);
useEffect(() => {
if (Platform.isTV) {
return;
}
if (segments.includes("direct-player" as never)) {
if (
!settings.followDeviceOrientation &&
settings.defaultVideoOrientation
) {
ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
}
return;
}
if (settings.followDeviceOrientation === true) {
ScreenOrientation.unlockAsync();
} else {
ScreenOrientation.lockAsync(
ScreenOrientation.OrientationLock.PORTRAIT_UP,
);
}
}, [
settings.followDeviceOrientation,
settings.defaultVideoOrientation,
segments,
]);
useEffect(() => {
if (Platform.isTV || !BackGroundDownloader) {
return;
}
const subscription = AppState.addEventListener("change", (nextAppState) => {
if (
appState.current.match(/inactive|background/) &&
nextAppState === "active"
) {
BackGroundDownloader?.checkForExistingDownloads().catch(
(error: unknown) => {
writeErrorLog("Failed to resume background downloads", error);
},
);
}
});
BackGroundDownloader?.checkForExistingDownloads().catch(
(error: unknown) => {
writeErrorLog("Failed to resume background downloads", error);
},
);
return () => {
subscription.remove();
};
}, []);
return ( return (
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<JellyfinProvider> <JellyfinProvider>
<NetworkStatusProvider> <PlaySettingsProvider>
<PlaySettingsProvider> <LogProvider>
<LogProvider> <WebSocketProvider>
<WebSocketProvider> <DownloadProvider>
<DownloadProvider> <GlobalModalProvider>
<GlobalModalProvider> <BottomSheetModalProvider>
<BottomSheetModalProvider> <ThemeProvider value={DarkTheme}>
<ThemeProvider value={DarkTheme}> <SystemBars style='light' hidden={false} />
<SystemBars style='light' hidden={false} /> <Stack initialRouteName='(auth)/(tabs)'>
<Stack initialRouteName='(auth)/(tabs)'> <Stack.Screen
<Stack.Screen name='(auth)/(tabs)'
name='(auth)/(tabs)' options={{
options={{ headerShown: false,
headerShown: false, title: "",
title: "", header: () => null,
header: () => null,
}}
/>
<Stack.Screen
name='(auth)/player'
options={{
headerShown: false,
title: "",
header: () => null,
}}
/>
<Stack.Screen
name='login'
options={{
headerShown: true,
title: "",
headerTransparent: Platform.OS === "ios",
}}
/>
<Stack.Screen name='+not-found' />
</Stack>
<Toaster
duration={4000}
toastOptions={{
style: {
backgroundColor: "#262626",
borderColor: "#363639",
borderWidth: 1,
},
titleStyle: {
color: "white",
},
}} }}
closeButton
/> />
<GlobalModal /> <Stack.Screen
</ThemeProvider> name='(auth)/player'
</BottomSheetModalProvider> options={{
</GlobalModalProvider> headerShown: false,
</DownloadProvider> title: "",
</WebSocketProvider> header: () => null,
</LogProvider> }}
</PlaySettingsProvider> />
</NetworkStatusProvider> <Stack.Screen
name='login'
options={{
headerShown: true,
title: "",
headerTransparent: true,
}}
/>
<Stack.Screen name='+not-found' />
</Stack>
<Toaster
duration={4000}
toastOptions={{
style: {
backgroundColor: "#262626",
borderColor: "#363639",
borderWidth: 1,
},
titleStyle: {
color: "white",
},
}}
closeButton
/>
<GlobalModal />
</ThemeProvider>
</BottomSheetModalProvider>
</GlobalModalProvider>
</DownloadProvider>
</WebSocketProvider>
</LogProvider>
</PlaySettingsProvider>
</JellyfinProvider> </JellyfinProvider>
</QueryClientProvider> </QueryClientProvider>
); );

View File

@@ -10,10 +10,10 @@ import {
Keyboard, Keyboard,
KeyboardAvoidingView, KeyboardAvoidingView,
Platform, Platform,
SafeAreaView,
TouchableOpacity, TouchableOpacity,
View, View,
} from "react-native"; } from "react-native";
import { SafeAreaView } from "react-native-safe-area-context";
import { z } from "zod"; import { z } from "zod";
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import { Input } from "@/components/common/Input"; import { Input } from "@/components/common/Input";
@@ -42,14 +42,14 @@ const Login: React.FC = () => {
const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false); const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
const [serverURL, setServerURL] = useState<string>(_apiUrl || ""); const [serverURL, setServerURL] = useState<string>(_apiUrl);
const [serverName, setServerName] = useState<string>(""); const [serverName, setServerName] = useState<string>("");
const [credentials, setCredentials] = useState<{ const [credentials, setCredentials] = useState<{
username: string; username: string;
password: string; password: string;
}>({ }>({
username: _username || "", username: _username,
password: _password || "", password: _password,
}); });
/** /**
@@ -62,13 +62,12 @@ const Login: React.FC = () => {
address: _apiUrl, address: _apiUrl,
}); });
// Wait for server setup and state updates to complete
setTimeout(() => { setTimeout(() => {
if (_username && _password) { if (_username && _password) {
setCredentials({ username: _username, password: _password }); setCredentials({ username: _username, password: _password });
login(_username, _password); login(_username, _password);
} }
}, 0); }, 300);
} }
})(); })();
}, [_apiUrl, _username, _password]); }, [_apiUrl, _username, _password]);
@@ -264,12 +263,6 @@ const Login: React.FC = () => {
onChangeText={(text: string) => onChangeText={(text: string) =>
setCredentials({ ...credentials, username: text }) setCredentials({ ...credentials, username: text })
} }
onEndEditing={(e) => {
const newValue = e.nativeEvent.text;
if (newValue && newValue !== credentials.username) {
setCredentials({ ...credentials, username: newValue });
}
}}
value={credentials.username} value={credentials.username}
keyboardType='default' keyboardType='default'
returnKeyType='done' returnKeyType='done'
@@ -278,8 +271,6 @@ const Login: React.FC = () => {
clearButtonMode='while-editing' clearButtonMode='while-editing'
maxLength={500} maxLength={500}
extraClassName='mb-4' extraClassName='mb-4'
autoFocus={false}
blurOnSubmit={true}
/> />
{/* Password */} {/* Password */}
@@ -288,12 +279,6 @@ const Login: React.FC = () => {
onChangeText={(text: string) => onChangeText={(text: string) =>
setCredentials({ ...credentials, password: text }) setCredentials({ ...credentials, password: text })
} }
onEndEditing={(e) => {
const newValue = e.nativeEvent.text;
if (newValue && newValue !== credentials.password) {
setCredentials({ ...credentials, password: newValue });
}
}}
value={credentials.password} value={credentials.password}
secureTextEntry secureTextEntry
keyboardType='default' keyboardType='default'
@@ -303,17 +288,10 @@ const Login: React.FC = () => {
clearButtonMode='while-editing' clearButtonMode='while-editing'
maxLength={500} maxLength={500}
extraClassName='mb-4' extraClassName='mb-4'
autoFocus={false}
blurOnSubmit={true}
/> />
<View className='mt-4'> <View className='mt-4'>
<Button <Button onPress={handleLogin}>{t("login.login_button")}</Button>
onPress={handleLogin}
disabled={!credentials.username.trim()}
>
{t("login.login_button")}
</Button>
</View> </View>
<View className='mt-3'> <View className='mt-3'>
<Button <Button
@@ -355,8 +333,6 @@ const Login: React.FC = () => {
autoCapitalize='none' autoCapitalize='none'
textContentType='URL' textContentType='URL'
maxLength={500} maxLength={500}
autoFocus={false}
blurOnSubmit={true}
/> />
{/* Full-width primary button */} {/* Full-width primary button */}
@@ -394,11 +370,10 @@ const Login: React.FC = () => {
// Mobile layout // Mobile layout
<SafeAreaView style={{ flex: 1, paddingBottom: 16 }}> <SafeAreaView style={{ flex: 1, paddingBottom: 16 }}>
<KeyboardAvoidingView <KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined} behavior={Platform.OS === "ios" ? "padding" : "height"}
style={{ flex: 1 }}
> >
{api?.basePath ? ( {api?.basePath ? (
<View className='flex flex-col flex-1 items-center justify-center'> <View className='flex flex-col h-full relative items-center justify-center'>
<View className='px-4 -mt-20 w-full'> <View className='px-4 -mt-20 w-full'>
<View className='flex flex-col space-y-2'> <View className='flex flex-col space-y-2'>
<Text className='text-2xl font-bold -mb-2'> <Text className='text-2xl font-bold -mb-2'>
@@ -417,12 +392,6 @@ const Login: React.FC = () => {
onChangeText={(text) => onChangeText={(text) =>
setCredentials({ ...credentials, username: text }) setCredentials({ ...credentials, username: text })
} }
onEndEditing={(e) => {
const newValue = e.nativeEvent.text;
if (newValue && newValue !== credentials.username) {
setCredentials({ ...credentials, username: newValue });
}
}}
value={credentials.username} value={credentials.username}
keyboardType='default' keyboardType='default'
returnKeyType='done' returnKeyType='done'
@@ -439,12 +408,6 @@ const Login: React.FC = () => {
onChangeText={(text) => onChangeText={(text) =>
setCredentials({ ...credentials, password: text }) setCredentials({ ...credentials, password: text })
} }
onEndEditing={(e) => {
const newValue = e.nativeEvent.text;
if (newValue && newValue !== credentials.password) {
setCredentials({ ...credentials, password: newValue });
}
}}
value={credentials.password} value={credentials.password}
secureTextEntry secureTextEntry
keyboardType='default' keyboardType='default'
@@ -458,7 +421,6 @@ const Login: React.FC = () => {
<Button <Button
onPress={handleLogin} onPress={handleLogin}
loading={loading} loading={loading}
disabled={!credentials.username.trim()}
className='flex-1 mr-2' className='flex-1 mr-2'
> >
{t("login.login_button")} {t("login.login_button")}
@@ -480,7 +442,7 @@ const Login: React.FC = () => {
<View className='absolute bottom-0 left-0 w-full px-4 mb-2' /> <View className='absolute bottom-0 left-0 w-full px-4 mb-2' />
</View> </View>
) : ( ) : (
<View className='flex flex-col flex-1 items-center justify-center w-full'> <View className='flex flex-col h-full items-center justify-center w-full'>
<View className='flex flex-col gap-y-2 px-4 w-full -mt-36'> <View className='flex flex-col gap-y-2 px-4 w-full -mt-36'>
<Image <Image
style={{ style={{

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

View File

@@ -115,4 +115,4 @@
<path id="path259-2-6-4-6-7-0-1-0-5-9-4-7-1-5-7-6-2" class="cls-11" d="M46.97,39.46c5.94,0,10.75,4.81,10.75,10.75s-4.81,10.75-10.75,10.75-10.75-4.81-10.75-10.75c0-1.1.16-2.16.47-3.17.84,1.87,2.72,3.17,4.9,3.17,2.97,0,5.37-2.41,5.37-5.37,0-2.18-1.3-4.06-3.17-4.9,1-.31,2.06-.47,3.17-.47h.01Z"/> <path id="path259-2-6-4-6-7-0-1-0-5-9-4-7-1-5-7-6-2" class="cls-11" d="M46.97,39.46c5.94,0,10.75,4.81,10.75,10.75s-4.81,10.75-10.75,10.75-10.75-4.81-10.75-10.75c0-1.1.16-2.16.47-3.17.84,1.87,2.72,3.17,4.9,3.17,2.97,0,5.37-2.41,5.37-5.37,0-2.18-1.3-4.06-3.17-4.9,1-.31,2.06-.47,3.17-.47h.01Z"/>
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 384 415" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.133333,0,0,-0.133333,-110.933,512.698)">
<g id="g10">
<path id="path88" d="M3547.01,1831.49C3493.38,1822.66 3262.53,1779.28 2992.01,1820.24C2424.16,1906.21 2154.85,2275.8 1882,2420.24C1473.31,2636.6 1060.97,2644.95 832,2592.03L832,1445.92C832,1321.76 863.078,1198.06 925.307,1090.27C1057.09,862.011 1323.38,718.405 1586.6,736.145C1695.48,743.482 1801.3,777.735 1895.64,832.199L3357.51,1676.21C3424.47,1714.87 3482.92,1761.76 3532.01,1815.41L3547.01,1831.49Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
</g>
</g>
<defs>
<linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2879.19,0,0,2879.19,832.651,2289.93)"><stop offset="0" style="stop-color:rgb(149,41,235);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(98,22,247);stop-opacity:1"/></linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 384 415" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.133333,0,0,-0.133333,-110.933,512.698)">
<g id="g10">
<path id="path66" d="M3357.51,2903.64L1895.64,3747.65C1670.29,3877.76 1412.33,3877.76 1186.98,3747.65C961.629,3617.55 832.648,3394.14 832.648,3133.93L832.648,1445.92C832.648,1185.71 961.629,962.305 1186.98,832.199C1412.33,702.094 1670.29,702.094 1895.64,832.199L3357.51,1676.21C3582.86,1806.31 3711.84,2029.71 3711.84,2289.93C3711.84,2550.14 3582.86,2773.54 3357.51,2903.64ZM1721.48,3213.68L3098.31,2454.7C3163.9,2418.55 3193.45,2364.85 3193.45,2289.93C3193.45,2215 3163.93,2161.32 3098.31,2125.15L1721.48,1366.18C1655.87,1330.01 1596.09,1328.72 1531.21,1366.18C1466.34,1403.63 1436.08,1456.03 1436.08,1530.96L1436.08,3048.89C1436.08,3123.77 1466.35,3176.23 1531.21,3213.68C1596.08,3251.11 1655.89,3249.83 1721.48,3213.68" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
</g>
</g>
<defs>
<linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2879.19,0,0,2879.19,832.651,2289.93)"><stop offset="0" style="stop-color:rgb(188,74,241);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(227,105,219);stop-opacity:1"/></linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 384 415" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g>
<g id="g10">
<path id="path88" d="M0,319.909L0,234C17.667,234.844 138.649,236.708 195,190C220.441,168.912 271.21,169.515 294.001,178.788C332.576,194.487 378.643,259.549 360,270.644C353.455,277.797 345.662,284.049 336.734,289.204L141.818,401.738C129.24,409 115.13,413.567 100.613,414.546C65.517,416.911 30.012,397.763 12.441,367.329C4.144,352.957 0,336.464 0,319.909Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
</g>
</g>
<defs>
<linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2879.19,0,0,2879.19,832.651,2289.93)"><stop offset="0" style="stop-color:rgb(225,102,222);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(204,88,233);stop-opacity:1"/></linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 384 415" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.133333,0,0,-0.133333,-110.933,512.698)">
<g id="g10">
<path id="path28" d="M1427.29,1523.37C1427.29,1447.7 1457.85,1394.77 1523.38,1356.94C1588.91,1319.11 1649.28,1320.41 1715.55,1356.94L3106.14,2123.5C3172.42,2160.03 3202.24,2214.25 3202.24,2289.93C3202.24,2365.6 3172.39,2419.83 3106.14,2456.35L1715.55,3222.91C1649.31,3259.43 1588.89,3260.73 1523.38,3222.91C1457.87,3185.1 1427.29,3132.11 1427.29,3056.48L1427.29,1523.37" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
</g>
</g>
<defs>
<linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.17673e-13,-1921.74,1921.74,1.17673e-13,2314.76,3250.79)"><stop offset="0" style="stop-color:rgb(93,17,250);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(143,40,236);stop-opacity:1"/></linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,184 +0,0 @@
{
"fill": {
"solid": "display-p3:0.18039,0.18039,0.18039,1.00000"
},
"groups": [
{
"blur-material": 0.3,
"layers": [
{
"fill-specializations": [
{
"value": "none"
},
{
"appearance": "tinted",
"value": {
"automatic-gradient": "display-p3:0.76482,0.76482,0.76482,0.84903"
}
}
],
"glass": true,
"hidden": false,
"image-name": "streamyfin_logo_layer1.svg",
"name": "streamyfin_logo_layer1"
}
],
"opacity": 1,
"position": {
"scale": 1.7,
"translation-in-points": [30, 0]
},
"shadow": {
"kind": "none",
"opacity": 1
},
"specular": true,
"translucency": {
"enabled": true,
"value": 0.6
}
},
{
"blend-mode": "normal",
"blur-material": 0.8,
"hidden": false,
"layers": [
{
"blend-mode": "normal",
"fill-specializations": [
{
"value": "none"
},
{
"appearance": "tinted",
"value": {
"automatic-gradient": "gray:0.75000,1.00000"
}
}
],
"hidden": false,
"image-name": "streamyfin_logo_layer2.svg",
"name": "streamyfin_logo_layer2",
"opacity": 1,
"position": {
"scale": 1,
"translation-in-points": [0, 0]
}
}
],
"lighting": "individual",
"name": "Group",
"opacity": 1,
"position": {
"scale": 1.7,
"translation-in-points": [30, -0.01613253252572302]
},
"shadow": {
"kind": "layer-color",
"opacity": 0.35
},
"specular": true,
"translucency-specializations": [
{
"value": {
"enabled": true,
"value": 0.5
}
},
{
"appearance": "tinted",
"value": {
"enabled": true,
"value": 0.8
}
}
]
},
{
"blend-mode": "normal",
"blur-material": 0.5,
"layers": [
{
"fill-specializations": [
{
"appearance": "tinted",
"value": {
"automatic-gradient": "gray:0.29000,1.00000"
}
}
],
"glass": true,
"hidden": false,
"image-name": "streamyfin_logo_layer3.svg",
"name": "streamyfin_logo_layer3",
"opacity": 0.9
}
],
"name": "Group",
"opacity": 0.8,
"position": {
"scale": 1.7,
"translation-in-points": [30, 0]
},
"shadow": {
"kind": "none",
"opacity": 0.5
},
"specular": true,
"translucency": {
"enabled": true,
"value": 0.7
}
},
{
"blur-material": 0.5,
"hidden": false,
"layers": [
{
"glass": true,
"hidden-specializations": [
{
"value": false
},
{
"appearance": "tinted",
"value": true
}
],
"image-name": "streamyfin_logo_layer4.svg",
"name": "streamyfin_logo_layer4",
"opacity-specializations": [
{
"value": 1
},
{
"appearance": "tinted",
"value": 0
}
]
}
],
"lighting": "combined",
"name": "Group",
"opacity": 0.9,
"position": {
"scale": 1.7,
"translation-in-points": [30, 0]
},
"shadow": {
"kind": "neutral",
"opacity": 0.5
},
"specular": false,
"translucency": {
"enabled": true,
"value": 0.5
}
}
],
"supported-platforms": {
"circles": ["watchOS"],
"squares": "shared"
}
}

View File

@@ -1,5 +1,5 @@
{ {
"$schema": "https://biomejs.dev/schemas/2.3.5/schema.json", "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
"files": { "files": {
"includes": [ "includes": [
"**/*", "**/*",

549
bun.lock

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import type { FC } from "react"; import type { FC } from "react";
import { View, type ViewProps } from "react-native"; import { Platform, View, type ViewProps } from "react-native";
import { RoundButton } from "@/components/RoundButton"; import { RoundButton } from "@/components/RoundButton";
import { useFavorite } from "@/hooks/useFavorite"; import { useFavorite } from "@/hooks/useFavorite";
@@ -11,11 +11,24 @@ interface Props extends ViewProps {
export const AddToFavorites: FC<Props> = ({ item, ...props }) => { export const AddToFavorites: FC<Props> = ({ item, ...props }) => {
const { isFavorite, toggleFavorite } = useFavorite(item); const { isFavorite, toggleFavorite } = useFavorite(item);
if (Platform.OS === "ios") {
return (
<View {...props}>
<RoundButton
size='large'
icon={isFavorite ? "heart" : "heart-outline"}
onPress={toggleFavorite}
/>
</View>
);
}
return ( return (
<View {...props}> <View {...props}>
<RoundButton <RoundButton
size='large' size='large'
icon={isFavorite ? "heart" : "heart-outline"} icon={isFavorite ? "heart" : "heart-outline"}
fillColor={isFavorite ? "primary" : undefined}
onPress={toggleFavorite} onPress={toggleFavorite}
/> />
</View> </View>

View File

@@ -64,8 +64,12 @@ export const DownloadItems: React.FC<DownloadProps> = ({
const { settings } = useSettings(); const { settings } = useSettings();
const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false); const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false);
const { processes, startBackgroundDownload, downloadedItems } = useDownload(); const { processes, startBackgroundDownload, getDownloadedItems } =
const downloadedFiles = downloadedItems; useDownload();
const downloadedFiles = useMemo(
() => getDownloadedItems(),
[getDownloadedItems],
);
const [selectedOptions, setSelectedOptions] = useState< const [selectedOptions, setSelectedOptions] = useState<
SelectedOptions | undefined SelectedOptions | undefined
@@ -89,8 +93,11 @@ export const DownloadItems: React.FC<DownloadProps> = ({
bottomSheetModalRef.current?.present(); bottomSheetModalRef.current?.present();
}, []); }, []);
const handleSheetChanges = useCallback((_index: number) => { const handleSheetChanges = useCallback((index: number) => {
// Modal state tracking handled by BottomSheetModal // Ensure modal is fully dismissed when index is -1
if (index === -1) {
// Modal is fully closed
}
}, []); }, []);
const closeModal = useCallback(() => { const closeModal = useCallback(() => {
@@ -132,15 +139,13 @@ export const DownloadItems: React.FC<DownloadProps> = ({
return itemsNotDownloaded.length === 0; return itemsNotDownloaded.length === 0;
}, [items, itemsNotDownloaded]); }, [items, itemsNotDownloaded]);
const itemsProcesses = useMemo( const itemsProcesses = useMemo(
() => () => processes?.filter((p) => itemIds.includes(p.item.Id)),
processes?.filter((p) => p?.item?.Id && itemIds.includes(p.item.Id)) ||
[],
[processes, itemIds], [processes, itemIds],
); );
const progress = useMemo(() => { const progress = useMemo(() => {
if (itemIds.length === 1) if (itemIds.length === 1)
return itemsProcesses.reduce((acc, p) => acc + (p.progress || 0), 0); return itemsProcesses.reduce((acc, p) => acc + p.progress, 0);
return ( return (
((itemIds.length - ((itemIds.length -
queue.filter((q) => itemIds.includes(q.item.Id)).length) / queue.filter((q) => itemIds.includes(q.item.Id)).length) /
@@ -155,13 +160,6 @@ export const DownloadItems: React.FC<DownloadProps> = ({
itemsNotDownloaded.every((p) => queue.some((q) => p.Id === q.item.Id)) itemsNotDownloaded.every((p) => queue.some((q) => p.Id === q.item.Id))
); );
}, [queue, itemsNotDownloaded]); }, [queue, itemsNotDownloaded]);
const itemsInProgressOrQueued = useMemo(() => {
const inProgress = itemsProcesses.length;
const inQueue = queue.filter((q) => itemIds.includes(q.item.Id)).length;
return inProgress + inQueue;
}, [itemsProcesses, queue, itemIds]);
const navigateToDownloads = () => router.push("/downloads"); const navigateToDownloads = () => router.push("/downloads");
const onDownloadedPress = () => { const onDownloadedPress = () => {
@@ -261,12 +259,13 @@ export const DownloadItems: React.FC<DownloadProps> = ({
throw new Error("No item id"); throw new Error("No item id");
} }
closeModal(); // Ensure modal is dismissed before starting download
await closeModal();
// Wait for modal dismiss animation to complete // Small delay to ensure modal is fully dismissed
setTimeout(() => { setTimeout(() => {
initiateDownload(...itemsToDownload); initiateDownload(...itemsToDownload);
}, 300); }, 100);
} else { } else {
toast.error( toast.error(
t("home.downloads.toasts.you_are_not_allowed_to_download_files"), t("home.downloads.toasts.you_are_not_allowed_to_download_files"),
@@ -286,14 +285,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
); );
const renderButtonContent = () => { const renderButtonContent = () => {
// For single item downloads, show progress if item is being processed if (processes.length > 0 && itemsProcesses.length > 0) {
// For multi-item downloads (season/series), show progress only if 2+ items are in progress or queued
const shouldShowProgress =
itemIds.length === 1
? itemsProcesses.length > 0
: itemsInProgressOrQueued > 1;
if (processes.length > 0 && shouldShowProgress) {
return progress === 0 ? ( return progress === 0 ? (
<Loader /> <Loader />
) : ( ) : (
@@ -347,6 +339,9 @@ export const DownloadItems: React.FC<DownloadProps> = ({
backgroundColor: "#171717", backgroundColor: "#171717",
}} }}
onChange={handleSheetChanges} onChange={handleSheetChanges}
onDismiss={() => {
// Ensure any pending state is cleared when modal is dismissed
}}
backdropComponent={renderBackdrop} backdropComponent={renderBackdrop}
enablePanDownToClose enablePanDownToClose
enableDismissOnClose enableDismissOnClose

View File

@@ -64,8 +64,6 @@ export const GlobalModal = () => {
backgroundStyle={modalOptions.backgroundStyle} backgroundStyle={modalOptions.backgroundStyle}
enablePanDownToClose={modalOptions.enablePanDownToClose} enablePanDownToClose={modalOptions.enablePanDownToClose}
enableDismissOnClose enableDismissOnClose
stackBehavior='push'
style={{ zIndex: 1000 }}
> >
{modalState.content} {modalState.content}
</BottomSheetModal> </BottomSheetModal>

View File

@@ -204,7 +204,7 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
<View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'> <View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'>
<ItemHeader item={item} className='mb-2' /> <ItemHeader item={item} className='mb-2' />
{item.Type !== "Program" && !Platform.isTV && !isOffline && ( {item.Type !== "Program" && !Platform.isTV && !isOffline && (
<View className='flex flex-row items-center justify-start w-full h-16 mb-2'> <View className='flex flex-row items-center justify-start w-full h-16'>
<BitrateSheet <BitrateSheet
className='mr-1' className='mr-1'
onChange={(val) => onChange={(val) =>

View File

@@ -99,7 +99,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
style={{ style={{
top: -50, top: -50,
}} }}
className='relative flex-1 bg-transparent pb-4' className='relative flex-1 bg-transparent pb-24'
> >
<LinearGradient <LinearGradient
// Background Linear Gradient // Background Linear Gradient

View File

@@ -127,8 +127,7 @@ const BottomSheetContent: React.FC<{
title?: string; title?: string;
groups: OptionGroup[]; groups: OptionGroup[];
onOptionSelect?: (value?: any) => void; onOptionSelect?: (value?: any) => void;
onClose?: () => void; }> = ({ title, groups, onOptionSelect }) => {
}> = ({ title, groups, onOptionSelect, onClose }) => {
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
// Wrap the groups to call onOptionSelect when an option is pressed // Wrap the groups to call onOptionSelect when an option is pressed
@@ -141,7 +140,6 @@ const BottomSheetContent: React.FC<{
onPress: () => { onPress: () => {
option.onPress(); option.onPress();
onOptionSelect?.(option.value); onOptionSelect?.(option.value);
onClose?.();
}, },
}; };
} }
@@ -178,26 +176,22 @@ const PlatformDropdownComponent = ({
trigger, trigger,
title, title,
groups, groups,
open: controlledOpen, open,
onOpenChange: controlledOnOpenChange, onOpenChange,
onOptionSelect, onOptionSelect,
expoUIConfig, expoUIConfig,
bottomSheetConfig, bottomSheetConfig,
}: PlatformDropdownProps) => { }: PlatformDropdownProps) => {
const { showModal, hideModal } = useGlobalModal(); const { showModal, hideModal } = useGlobalModal();
// Handle controlled open state for Android const handlePress = () => {
useEffect(() => { if (Platform.OS === "android") {
if (Platform.OS === "android" && controlledOpen === true) { onOpenChange?.(true);
showModal( showModal(
<BottomSheetContent <BottomSheetContent
title={title} title={title}
groups={groups} groups={groups}
onOptionSelect={onOptionSelect} onOptionSelect={onOptionSelect}
onClose={() => {
hideModal();
controlledOnOpenChange?.(false);
}}
/>, />,
{ {
snapPoints: ["90%"], snapPoints: ["90%"],
@@ -205,7 +199,14 @@ const PlatformDropdownComponent = ({
}, },
); );
} }
}, [controlledOpen]); };
// Close modal when open prop changes to false
useEffect(() => {
if (Platform.OS === "android" && open === false) {
hideModal();
}
}, [open, hideModal]);
if (Platform.OS === "ios") { if (Platform.OS === "ios") {
return ( return (
@@ -299,24 +300,9 @@ const PlatformDropdownComponent = ({
); );
} }
// Android: Direct modal trigger // Android: Trigger button for bottom modal
const handlePress = () => {
showModal(
<BottomSheetContent
title={title}
groups={groups}
onOptionSelect={onOptionSelect}
onClose={hideModal}
/>,
{
snapPoints: ["90%"],
enablePanDownToClose: bottomSheetConfig?.enablePanDownToClose ?? true,
},
);
};
return ( return (
<TouchableOpacity onPress={handlePress} activeOpacity={0.7}> <TouchableOpacity onPress={handlePress}>
{trigger || <Text className='text-white'>Open Menu</Text>} {trigger || <Text className='text-white'>Open Menu</Text>}
</TouchableOpacity> </TouchableOpacity>
); );

View File

@@ -1,11 +1,12 @@
import { useActionSheet } from "@expo/react-native-action-sheet"; import { useActionSheet } from "@expo/react-native-action-sheet";
import { Button, Host } from "@expo/ui/swift-ui";
import { Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { useRouter } from "expo-router"; import { useRouter } from "expo-router";
import { useAtom, useAtomValue } from "jotai"; import { useAtom, useAtomValue } from "jotai";
import { useCallback, useEffect } from "react"; import { useCallback, useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Alert, TouchableOpacity, View } from "react-native"; import { Alert, Platform, TouchableOpacity, View } from "react-native";
import CastContext, { import CastContext, {
CastButton, CastButton,
PlayServicesState, PlayServicesState,
@@ -50,6 +51,7 @@ export const PlayButton: React.FC<Props> = ({
selectedOptions, selectedOptions,
isOffline, isOffline,
colors, colors,
...props
}: Props) => { }: Props) => {
const { showActionSheetWithOptions } = useActionSheet(); const { showActionSheetWithOptions } = useActionSheet();
const client = useRemoteMediaClient(); const client = useRemoteMediaClient();
@@ -163,7 +165,7 @@ export const PlayButton: React.FC<Props> = ({
api, api,
item, item,
deviceProfile: enableH265 ? chromecasth265 : chromecast, deviceProfile: enableH265 ? chromecasth265 : chromecast,
startTimeTicks: item?.UserData?.PlaybackPositionTicks ?? 0, startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
userId: user.Id, userId: user.Id,
audioStreamIndex: selectedOptions.audioIndex, audioStreamIndex: selectedOptions.audioIndex,
maxStreamingBitrate: selectedOptions.bitrate?.value, maxStreamingBitrate: selectedOptions.bitrate?.value,
@@ -362,51 +364,45 @@ export const PlayButton: React.FC<Props> = ({
* ********************* * *********************
*/ */
// if (Platform.OS === "ios") if (Platform.OS === "ios")
// return ( return (
// <Host <Host
// style={{ style={{
// height: 50, height: 50,
// flex: 1, flex: 1,
// flexShrink: 0, }}
// }} >
// > <Button
// <Button variant='glassProminent'
// variant='glassProminent' onPress={onPress}
// onPress={onPress} color={effectiveColors.primary}
// color={effectiveColors.primary} >
// modifiers={[fixedSize()]} <View className='flex flex-row items-center space-x-2 h-full w-full justify-center -mb-3.5 '>
// > <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
// <View className='flex flex-row items-center space-x-2 h-full w-full justify-center -mb-3.5 '> {runtimeTicksToMinutes(item?.RunTimeTicks)}
// <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}> </Animated.Text>
// {runtimeTicksToMinutes( <Animated.Text style={animatedTextStyle}>
// (item?.RunTimeTicks || 0) - <Ionicons name='play-circle' size={24} />
// (item?.UserData?.PlaybackPositionTicks || 0), </Animated.Text>
// )} {client && (
// {(item?.UserData?.PlaybackPositionTicks || 0) > 0 && " left"} <Animated.Text style={animatedTextStyle}>
// </Animated.Text> <Feather name='cast' size={22} />
// <Animated.Text style={animatedTextStyle}> <CastButton tintColor='transparent' />
// <Ionicons name='play-circle' size={24} /> </Animated.Text>
// </Animated.Text> )}
// {client && ( {!client && settings?.openInVLC && (
// <Animated.Text style={animatedTextStyle}> <Animated.Text style={animatedTextStyle}>
// <Feather name='cast' size={22} /> <MaterialCommunityIcons
// <CastButton tintColor='transparent' /> name='vlc'
// </Animated.Text> size={18}
// )} color={animatedTextStyle.color}
// {!client && settings?.openInVLC && ( />
// <Animated.Text style={animatedTextStyle}> </Animated.Text>
// <MaterialCommunityIcons )}
// name='vlc' </View>
// size={18} </Button>
// color={animatedTextStyle.color} </Host>
// /> );
// </Animated.Text>
// )}
// </View>
// </Button>
// </Host>
// );
return ( return (
<TouchableOpacity <TouchableOpacity
@@ -415,6 +411,7 @@ export const PlayButton: React.FC<Props> = ({
accessibilityHint='Tap to play the media' accessibilityHint='Tap to play the media'
onPress={onPress} onPress={onPress}
className={"relative"} className={"relative"}
{...props}
> >
<View className='absolute w-full h-full top-0 left-0 rounded-full z-10 overflow-hidden'> <View className='absolute w-full h-full top-0 left-0 rounded-full z-10 overflow-hidden'>
<Animated.View <Animated.View
@@ -442,11 +439,7 @@ export const PlayButton: React.FC<Props> = ({
> >
<View className='flex flex-row items-center space-x-2'> <View className='flex flex-row items-center space-x-2'>
<Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}> <Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
{runtimeTicksToMinutes( {runtimeTicksToMinutes(item?.RunTimeTicks)}
(item?.RunTimeTicks || 0) -
(item?.UserData?.PlaybackPositionTicks || 0),
)}
{(item?.UserData?.PlaybackPositionTicks || 0) > 0 && " left"}
</Animated.Text> </Animated.Text>
<Animated.Text style={animatedTextStyle}> <Animated.Text style={animatedTextStyle}>
<Ionicons name='play-circle' size={24} /> <Ionicons name='play-circle' size={24} />

View File

@@ -1,6 +1,6 @@
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import type React from "react"; import type React from "react";
import { View, type ViewProps } from "react-native"; import { Platform, View, type ViewProps } from "react-native";
import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed"; import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
import { RoundButton } from "./RoundButton"; import { RoundButton } from "./RoundButton";
@@ -14,10 +14,25 @@ export const PlayedStatus: React.FC<Props> = ({ items, ...props }) => {
const allPlayed = items.every((item) => item.UserData?.Played); const allPlayed = items.every((item) => item.UserData?.Played);
const toggle = useMarkAsPlayed(items); const toggle = useMarkAsPlayed(items);
if (Platform.OS === "ios") {
return (
<View {...props}>
<RoundButton
color={allPlayed ? "purple" : "white"}
icon={allPlayed ? "checkmark" : "checkmark"}
onPress={async () => {
await toggle(!allPlayed);
}}
size={props.size}
/>
</View>
);
}
return ( return (
<View {...props}> <View {...props}>
<RoundButton <RoundButton
color={allPlayed ? "purple" : "white"} fillColor={allPlayed ? "primary" : undefined}
icon={allPlayed ? "checkmark" : "checkmark"} icon={allPlayed ? "checkmark" : "checkmark"}
onPress={async () => { onPress={async () => {
await toggle(!allPlayed); await toggle(!allPlayed);

View File

@@ -96,7 +96,7 @@ export const RoundButton: React.FC<PropsWithChildren<Props>> = ({
<TouchableOpacity <TouchableOpacity
onPress={handlePress} onPress={handlePress}
className={`rounded-full ${buttonSize} flex items-center justify-center ${ className={`rounded-full ${buttonSize} flex items-center justify-center ${
fillColor ? fillColorClass : "bg-transparent" fillColor ? fillColorClass : "bg-neutral-800/80"
}`} }`}
{...(viewProps as any)} {...(viewProps as any)}
> >

View File

@@ -33,27 +33,12 @@ export const TrackSheet: React.FC<Props> = ({
() => streams?.find((x) => x.Index === selected), () => streams?.find((x) => x.Index === selected),
[streams, selected], [streams, selected],
); );
const noneOption = useMemo(
() => ({ Index: -1, DisplayTitle: t("common.none") }),
[t],
);
// Creates a modified data array that includes a "None" option for subtitles
// We might want to possibly do this for other places, like audio?
const addNoneToSubtitles = useMemo(() => {
if (streamType === "Subtitle") {
const result = streams ? [noneOption, ...streams] : [noneOption];
return result;
}
return streams;
}, [streams, streamType, noneOption]);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
if (isTv || (streams && streams.length === 0)) return null; if (isTv || (streams && streams.length === 0)) return null;
return ( return (
<View className='flex shrink' style={{ minWidth: 60 }} {...props}> <View className='flex shrink' style={{ minWidth: 25 }} {...props}>
<View className='flex flex-col'> <View className='flex flex-col'>
<Text className='opacity-50 mb-1 text-xs'>{title}</Text> <Text className='opacity-50 mb-1 text-xs'>{title}</Text>
<TouchableOpacity <TouchableOpacity
@@ -61,9 +46,7 @@ export const TrackSheet: React.FC<Props> = ({
onPress={() => setOpen(true)} onPress={() => setOpen(true)}
> >
<Text numberOfLines={1}> <Text numberOfLines={1}>
{selected === -1 && streamType === "Subtitle" {selectedSteam?.DisplayTitle || t("common.select", "Select")}
? t("common.none")
: selectedSteam?.DisplayTitle || t("common.select", "Select")}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
@@ -71,14 +54,8 @@ export const TrackSheet: React.FC<Props> = ({
open={open} open={open}
setOpen={setOpen} setOpen={setOpen}
title={title} title={title}
data={addNoneToSubtitles || []} data={streams || []}
values={ values={selectedSteam ? [selectedSteam] : []}
selected === -1 && streamType === "Subtitle"
? [{ Index: -1, DisplayTitle: t("common.none") }]
: selectedSteam
? [selectedSteam]
: []
}
multiple={false} multiple={false}
searchFilter={(item, query) => { searchFilter={(item, query) => {
const label = (item as any).DisplayTitle || ""; const label = (item as any).DisplayTitle || "";

12
components/_template.tsx Normal file
View File

@@ -0,0 +1,12 @@
import { View, type ViewProps } from "react-native";
import { Text } from "@/components/common/Text";
interface Props extends ViewProps {}
export const TitleHeader: React.FC<Props> = ({ ...props }) => {
return (
<View {...props}>
<Text />
</View>
);
};

View File

@@ -10,18 +10,11 @@ import { LinearGradient } from "expo-linear-gradient";
import { useRouter } from "expo-router"; import { useRouter } from "expo-router";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import { useCallback, useEffect, useMemo, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import { import { Dimensions, Pressable, TouchableOpacity, View } from "react-native";
Pressable,
TouchableOpacity,
useWindowDimensions,
View,
} from "react-native";
import { Gesture, GestureDetector } from "react-native-gesture-handler"; import { Gesture, GestureDetector } from "react-native-gesture-handler";
import Animated, { import Animated, {
Easing, Easing,
interpolate,
runOnJS, runOnJS,
type SharedValue,
useAnimatedStyle, useAnimatedStyle,
useSharedValue, useSharedValue,
withTiming, withTiming,
@@ -42,10 +35,12 @@ import { MarkAsPlayedLargeButton } from "./MarkAsPlayedLargeButton";
interface AppleTVCarouselProps { interface AppleTVCarouselProps {
initialIndex?: number; initialIndex?: number;
onItemChange?: (index: number) => void; onItemChange?: (index: number) => void;
scrollOffset?: SharedValue<number>;
} }
const { width: screenWidth, height: screenHeight } = Dimensions.get("window");
// Layout Constants // Layout Constants
const CAROUSEL_HEIGHT = screenHeight / 1.45;
const GRADIENT_HEIGHT_TOP = 150; const GRADIENT_HEIGHT_TOP = 150;
const GRADIENT_HEIGHT_BOTTOM = 150; const GRADIENT_HEIGHT_BOTTOM = 150;
const LOGO_HEIGHT = 80; const LOGO_HEIGHT = 80;
@@ -159,21 +154,14 @@ const DotIndicator = ({
export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
initialIndex = 0, initialIndex = 0,
onItemChange, onItemChange,
scrollOffset,
}) => { }) => {
const { settings } = useSettings(); const { settings } = useSettings();
const api = useAtomValue(apiAtom); const api = useAtomValue(apiAtom);
const user = useAtomValue(userAtom); const user = useAtomValue(userAtom);
const { isConnected, serverConnected } = useNetworkStatus(); const { isConnected, serverConnected } = useNetworkStatus();
const router = useRouter(); const router = useRouter();
const { width: screenWidth, height: screenHeight } = useWindowDimensions();
const isLandscape = screenWidth >= screenHeight;
const carouselHeight = useMemo(
() => (isLandscape ? screenHeight * 0.9 : screenHeight / 1.45),
[isLandscape, screenHeight],
);
const [currentIndex, setCurrentIndex] = useState(initialIndex); const [currentIndex, setCurrentIndex] = useState(initialIndex);
const translateX = useSharedValue(-initialIndex * screenWidth); const translateX = useSharedValue(-currentIndex * screenWidth);
const isQueryEnabled = const isQueryEnabled =
!!api && !!user?.Id && isConnected && serverConnected === true; !!api && !!user?.Id && isConnected && serverConnected === true;
@@ -237,21 +225,11 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
const nextItems = nextUpData ?? []; const nextItems = nextUpData ?? [];
const recentItems = recentlyAddedData ?? []; const recentItems = recentlyAddedData ?? [];
const allItems = [ return [
...continueItems.slice(0, 2), ...continueItems.slice(0, 2),
...nextItems.slice(0, 2), ...nextItems.slice(0, 2),
...recentItems.slice(0, 2), ...recentItems.slice(0, 2),
]; ];
// Deduplicate by item ID to prevent duplicate keys
const seen = new Set<string>();
return allItems.filter((item) => {
if (item.Id && !seen.has(item.Id)) {
seen.add(item.Id);
return true;
}
return false;
});
}, [continueWatchingData, nextUpData, recentlyAddedData]); }, [continueWatchingData, nextUpData, recentlyAddedData]);
const isLoading = const isLoading =
@@ -310,11 +288,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
translateX.value = -newIndex * screenWidth; translateX.value = -newIndex * screenWidth;
return newIndex; return newIndex;
}); });
}, [hasItems, items, initialIndex, screenWidth, translateX]); }, [hasItems, items, initialIndex, translateX]);
useEffect(() => {
translateX.value = -currentIndex * screenWidth;
}, [currentIndex, screenWidth, translateX]);
useEffect(() => { useEffect(() => {
if (hasItems) { if (hasItems) {
@@ -334,7 +308,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
setCurrentIndex(index); setCurrentIndex(index);
onItemChange?.(index); onItemChange?.(index);
}, },
[hasItems, items, onItemChange, screenWidth, translateX], [hasItems, items, onItemChange, translateX],
); );
const navigateToItem = useCallback( const navigateToItem = useCallback(
@@ -383,28 +357,6 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
const togglePlayedStatus = useMarkAsPlayed(items); const togglePlayedStatus = useMarkAsPlayed(items);
const headerAnimatedStyle = useAnimatedStyle(() => {
if (!scrollOffset) return {};
return {
transform: [
{
translateY: interpolate(
scrollOffset.value,
[-carouselHeight, 0, carouselHeight],
[-carouselHeight / 2, 0, carouselHeight * 0.75],
),
},
{
scale: interpolate(
scrollOffset.value,
[-carouselHeight, 0, carouselHeight],
[2, 1, 1],
),
},
],
};
});
const renderDots = () => { const renderDots = () => {
if (!hasItems || items.length <= 1) return null; if (!hasItems || items.length <= 1) return null;
@@ -438,7 +390,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
<View <View
style={{ style={{
width: screenWidth, width: screenWidth,
height: carouselHeight, height: CAROUSEL_HEIGHT,
backgroundColor: "#000", backgroundColor: "#000",
}} }}
> >
@@ -636,30 +588,20 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
key={item.Id} key={item.Id}
style={{ style={{
width: screenWidth, width: screenWidth,
height: carouselHeight, height: CAROUSEL_HEIGHT,
position: "relative", position: "relative",
}} }}
> >
{/* Background Backdrop */} {/* Background Backdrop */}
<Animated.View <ItemImage
style={[ item={item}
{ variant='Backdrop'
width: "100%", style={{
height: "100%", width: "100%",
position: "absolute", height: "100%",
}, position: "absolute",
headerAnimatedStyle, }}
]} />
>
<ItemImage
item={item}
variant='Backdrop'
style={{
width: "100%",
height: "100%",
}}
/>
</Animated.View>
{/* Dark Overlay */} {/* Dark Overlay */}
<View <View
@@ -864,7 +806,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
return ( return (
<View <View
style={{ style={{
height: carouselHeight, height: CAROUSEL_HEIGHT,
backgroundColor: "#000", backgroundColor: "#000",
overflow: "hidden", overflow: "hidden",
}} }}
@@ -882,7 +824,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
return ( return (
<View <View
style={{ style={{
height: carouselHeight, // Fixed height instead of flex: 1 height: CAROUSEL_HEIGHT, // Fixed height instead of flex: 1
backgroundColor: "#000", backgroundColor: "#000",
overflow: "hidden", overflow: "hidden",
}} }}
@@ -891,7 +833,7 @@ export const AppleTVCarousel: React.FC<AppleTVCarouselProps> = ({
<Animated.View <Animated.View
style={[ style={[
{ {
height: carouselHeight, // Fixed height instead of flex: 1 height: CAROUSEL_HEIGHT, // Fixed height instead of flex: 1
flexDirection: "row", flexDirection: "row",
width: screenWidth * items.length, width: screenWidth * items.length,
}, },

View File

@@ -55,7 +55,7 @@ export const HeaderBackButton: React.FC<Props> = ({
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={() => router.back()} onPress={() => router.back()}
className=' rounded-full p-2' className=' bg-neutral-800/80 rounded-full p-2'
{...touchableOpacityProps} {...touchableOpacityProps}
> >
<Ionicons <Ionicons

View File

@@ -3,12 +3,17 @@ import React, { useImperativeHandle, useRef } from "react";
import { View, type ViewStyle } from "react-native"; import { View, type ViewStyle } from "react-native";
import { Text } from "./Text"; import { Text } from "./Text";
type PartialExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
export interface HorizontalScrollRef { export interface HorizontalScrollRef {
scrollToIndex: (index: number, viewOffset: number) => void; scrollToIndex: (index: number, viewOffset: number) => void;
} }
interface HorizontalScrollProps<T> interface HorizontalScrollProps<T>
extends Omit<FlashListProps<T>, "renderItem" | "estimatedItemSize" | "data"> { extends PartialExcept<
Omit<FlashListProps<T>, "renderItem">,
"estimatedItemSize"
> {
data?: T[] | null; data?: T[] | null;
renderItem: (item: T, index: number) => React.ReactNode; renderItem: (item: T, index: number) => React.ReactNode;
keyExtractor?: (item: T, index: number) => string; keyExtractor?: (item: T, index: number) => string;
@@ -39,7 +44,7 @@ export const HorizontalScroll = <T,>(
...restProps ...restProps
} = props; } = props;
const flashListRef = useRef<React.ComponentRef<typeof FlashList<T>>>(null); const flashListRef = useRef<FlashList<T>>(null);
useImperativeHandle(ref!, () => ({ useImperativeHandle(ref!, () => ({
scrollToIndex: (index: number, viewOffset: number) => { scrollToIndex: (index: number, viewOffset: number) => {
@@ -73,6 +78,7 @@ export const HorizontalScroll = <T,>(
extraData={extraData} extraData={extraData}
renderItem={renderFlashListItem} renderItem={renderFlashListItem}
horizontal horizontal
estimatedItemSize={200}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
contentContainerStyle={{ contentContainerStyle={{
paddingHorizontal: 16, paddingHorizontal: 16,

View File

@@ -59,7 +59,6 @@ export function InfiniteHorizontalScroll({
const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({ const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
queryKey, queryKey,
queryFn, queryFn,
staleTime: 60 * 1000, // 1 minute
getNextPageParam: (lastPage, pages) => { getNextPageParam: (lastPage, pages) => {
if ( if (
!lastPage?.Items || !lastPage?.Items ||
@@ -120,6 +119,7 @@ export function InfiniteHorizontalScroll({
renderItem={({ item, index }) => ( renderItem={({ item, index }) => (
<View className='mr-2'>{renderItem(item, index)}</View> <View className='mr-2'>{renderItem(item, index)}</View>
)} )}
estimatedItemSize={height}
horizontal horizontal
onEndReached={() => { onEndReached={() => {
if (hasNextPage) { if (hasNextPage) {

View File

@@ -16,10 +16,7 @@ export function Input(props: InputProps) {
const [isFocused, setIsFocused] = useState(false); const [isFocused, setIsFocused] = useState(false);
return Platform.isTV ? ( return Platform.isTV ? (
<TouchableOpacity <TouchableOpacity onFocus={() => inputRef?.current?.focus?.()}>
onPress={() => inputRef?.current?.focus?.()}
activeOpacity={1}
>
<TextInput <TextInput
ref={inputRef} ref={inputRef}
className={` className={`

View File

@@ -9,11 +9,7 @@ interface ActiveDownloadsProps extends ViewProps {}
export default function ActiveDownloads({ ...props }: ActiveDownloadsProps) { export default function ActiveDownloads({ ...props }: ActiveDownloadsProps) {
const { processes } = useDownload(); const { processes } = useDownload();
if (processes?.length === 0)
// Filter out any invalid processes before rendering
const validProcesses = processes?.filter((p) => p?.item?.Id) || [];
if (validProcesses.length === 0)
return ( return (
<View {...props} className='bg-neutral-900 p-4 rounded-2xl'> <View {...props} className='bg-neutral-900 p-4 rounded-2xl'>
<Text className='text-lg font-bold'> <Text className='text-lg font-bold'>
@@ -30,9 +26,9 @@ export default function ActiveDownloads({ ...props }: ActiveDownloadsProps) {
<Text className='text-lg font-bold mb-2'> <Text className='text-lg font-bold mb-2'>
{t("home.downloads.active_downloads")} {t("home.downloads.active_downloads")}
</Text> </Text>
<View className='gap-y-2'> <View className='space-y-2'>
{validProcesses.map((p: JobStatus) => ( {processes?.map((p: JobStatus) => (
<DownloadCard key={p.id} process={p} /> <DownloadCard key={p.item.Id} process={p} />
))} ))}
</View> </View>
</View> </View>

View File

@@ -6,6 +6,7 @@ import { t } from "i18next";
import { useMemo } from "react"; import { useMemo } from "react";
import { import {
ActivityIndicator, ActivityIndicator,
Platform,
TouchableOpacity, TouchableOpacity,
type TouchableOpacityProps, type TouchableOpacityProps,
View, View,
@@ -13,36 +14,49 @@ import {
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { useDownload } from "@/providers/DownloadProvider"; import { useDownload } from "@/providers/DownloadProvider";
import { calculateSmoothedETA } from "@/providers/Downloads/hooks/useDownloadSpeedCalculator";
import { JobStatus } from "@/providers/Downloads/types"; import { JobStatus } from "@/providers/Downloads/types";
import { estimateDownloadSize } from "@/utils/download";
import { storage } from "@/utils/mmkv"; import { storage } from "@/utils/mmkv";
import { formatTimeString } from "@/utils/time"; import { formatTimeString } from "@/utils/time";
import { Button } from "../Button";
const bytesToMB = (bytes: number) => { const bytesToMB = (bytes: number) => {
return bytes / 1024 / 1024; return bytes / 1024 / 1024;
}; };
const formatBytes = (bytes: number): string => {
if (bytes >= 1024 * 1024 * 1024) {
return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`;
}
return `${(bytes / (1024 * 1024)).toFixed(0)} MB`;
};
interface DownloadCardProps extends TouchableOpacityProps { interface DownloadCardProps extends TouchableOpacityProps {
process: JobStatus; process: JobStatus;
} }
export const DownloadCard = ({ process, ...props }: DownloadCardProps) => { export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
const { cancelDownload } = useDownload(); const { startDownload, pauseDownload, resumeDownload, removeProcess } =
useDownload();
const router = useRouter(); const router = useRouter();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
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) => { const handleDelete = async (id: string) => {
try { try {
await cancelDownload(id); await removeProcess(id);
// cancelDownload already shows a toast, so don't show another one toast.success(t("home.downloads.toasts.download_deleted"));
queryClient.invalidateQueries({ queryKey: ["downloads"] }); queryClient.invalidateQueries({ queryKey: ["downloads"] });
} catch (error) { } catch (error) {
console.error("Error deleting download:", error); console.error("Error deleting download:", error);
@@ -50,75 +64,31 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
} }
}; };
const eta = useMemo(() => { const eta = (p: JobStatus) => {
if (!process?.estimatedTotalSizeBytes || !process?.bytesDownloaded) { if (!p.speed || p.speed <= 0 || !p.estimatedTotalSizeBytes) return null;
return null;
}
const secondsRemaining = calculateSmoothedETA( const bytesRemaining = p.estimatedTotalSizeBytes - (p.bytesDownloaded || 0);
process.id, if (bytesRemaining <= 0) return null;
process.bytesDownloaded,
process.estimatedTotalSizeBytes,
);
if (!secondsRemaining || secondsRemaining <= 0) { const secondsRemaining = bytesRemaining / p.speed;
return null;
}
return formatTimeString(secondsRemaining, "s"); return formatTimeString(secondsRemaining, "s");
}, [process?.id, process?.bytesDownloaded, process?.estimatedTotalSizeBytes]); };
const estimatedSize = useMemo(() => {
if (process?.estimatedTotalSizeBytes)
return process.estimatedTotalSizeBytes;
// Calculate from bitrate + duration (only if bitrate value is defined)
if (process?.maxBitrate?.value && process?.item?.RunTimeTicks) {
return estimateDownloadSize(
process.maxBitrate.value,
process.item.RunTimeTicks,
);
}
return undefined;
}, [
process?.maxBitrate?.value,
process?.item?.RunTimeTicks,
process?.estimatedTotalSizeBytes,
]);
const isTranscoding = process?.isTranscoding || false;
const downloadedAmount = useMemo(() => {
if (!process?.bytesDownloaded) return null;
return formatBytes(process.bytesDownloaded);
}, [process?.bytesDownloaded]);
const base64Image = useMemo(() => { const base64Image = useMemo(() => {
try { return storage.getString(process.item.Id!);
const itemId = process?.item?.Id; }, []);
if (!itemId) return undefined;
return storage.getString(itemId);
} catch {
return undefined;
}
}, [process?.item?.Id]);
// Sanitize progress to ensure it's within valid bounds // Sanitize progress to ensure it's within valid bounds
const sanitizedProgress = useMemo(() => { const sanitizedProgress = useMemo(() => {
if ( if (
typeof process?.progress !== "number" || typeof process.progress !== "number" ||
Number.isNaN(process.progress) Number.isNaN(process.progress)
) { ) {
return 0; return 0;
} }
return Math.max(0, Math.min(100, process.progress)); return Math.max(0, Math.min(100, process.progress));
}, [process?.progress]); }, [process.progress]);
// Return null after all hooks have been called
if (!process || !process.item || !process.item.Id) {
return null;
}
return ( return (
<TouchableOpacity <TouchableOpacity
@@ -128,7 +98,9 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
> >
{process.status === "downloading" && ( {process.status === "downloading" && (
<View <View
className={`bg-purple-600 h-1 absolute bottom-0 left-0 ${isTranscoding ? "animate-pulse" : ""}`} className={`
bg-purple-600 h-1 absolute bottom-0 left-0
`}
style={{ style={{
width: width:
sanitizedProgress > 0 sanitizedProgress > 0
@@ -139,10 +111,26 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
)} )}
{/* Action buttons in bottom right corner */} {/* Action buttons in bottom right corner */}
<View className='absolute bottom-2 right-2 flex flex-row items-center z-10'> <View className='absolute bottom-2 right-2 flex flex-row items-center space-x-2 z-10'>
{process.status === "downloading" && Platform.OS !== "ios" && (
<TouchableOpacity
onPress={() => handlePause(process.id)}
className='p-1'
>
<Ionicons name='pause' size={20} color='white' />
</TouchableOpacity>
)}
{process.status === "paused" && Platform.OS !== "ios" && (
<TouchableOpacity
onPress={() => handleResume(process.id)}
className='p-1'
>
<Ionicons name='play' size={20} color='white' />
</TouchableOpacity>
)}
<TouchableOpacity <TouchableOpacity
onPress={() => handleDelete(process.id)} onPress={() => handleDelete(process.id)}
className='p-2 bg-neutral-800 rounded-full' className='p-1'
> >
<Ionicons name='close' size={20} color='red' /> <Ionicons name='close' size={20} color='red' />
</TouchableOpacity> </TouchableOpacity>
@@ -164,53 +152,47 @@ export const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
/> />
</View> </View>
)} )}
<View className='shrink mb-1 flex-1 pr-12'> <View className='shrink mb-1 flex-1'>
<Text className='text-xs opacity-50'>{process.item.Type}</Text> <Text className='text-xs opacity-50'>{process.item.Type}</Text>
<Text className='font-semibold shrink'>{process.item.Name}</Text> <Text className='font-semibold shrink'>{process.item.Name}</Text>
<Text className='text-xs opacity-50'> <Text className='text-xs opacity-50'>
{process.item.ProductionYear} {process.item.ProductionYear}
</Text> </Text>
<View className='flex flex-row items-center space-x-2 mt-1 text-purple-600'>
{isTranscoding && (
<View className='bg-purple-600/20 px-2 py-0.5 rounded-md mt-1 self-start'>
<Text className='text-xs text-purple-400'>Transcoding</Text>
</View>
)}
{/* Row 1: Progress + Downloaded/Total */}
<View className='flex flex-row items-center gap-x-2 mt-1.5'>
{sanitizedProgress === 0 ? ( {sanitizedProgress === 0 ? (
<ActivityIndicator size={"small"} color={"white"} /> <ActivityIndicator size={"small"} color={"white"} />
) : ( ) : (
<Text className='text-xs font-semibold'> <Text className='text-xs'>{sanitizedProgress.toFixed(0)}%</Text>
{sanitizedProgress.toFixed(0)}% )}
{process.speed && process.speed > 0 && (
<Text className='text-xs'>
{bytesToMB(process.speed).toFixed(2)} MB/s
</Text> </Text>
)} )}
{downloadedAmount && ( {eta(process) && (
<Text className='text-xs opacity-75'> <Text className='text-xs'>
{downloadedAmount} {t("home.downloads.eta", { eta: eta(process) })}
{estimatedSize
? ` / ${isTranscoding ? "~" : ""}${formatBytes(estimatedSize)}`
: ""}
</Text> </Text>
)} )}
</View> </View>
{/* Row 2: Speed + ETA */} <View className='flex flex-row items-center space-x-2 mt-1 text-purple-600'>
<View className='flex flex-row items-center gap-x-2 mt-0.5'> <Text className='text-xs capitalize'>{process.status}</Text>
{process.speed && process.speed > 0 && (
<Text className='text-xs text-purple-400'>
{bytesToMB(process.speed).toFixed(2)} MB/s
</Text>
)}
{eta && (
<Text className='text-xs text-green-400'>
{t("home.downloads.eta", { eta: eta })}
</Text>
)}
</View> </View>
</View> </View>
</View> </View>
{process.status === "completed" && (
<View className='flex flex-row mt-4 space-x-4'>
<Button
onPress={() => {
startDownload(process);
}}
className='w-full'
>
Download now
</Button>
</View>
)}
</View> </View>
</TouchableOpacity> </TouchableOpacity>
); );

View File

@@ -13,13 +13,17 @@ export const DownloadSize: React.FC<DownloadSizeProps> = ({
items, items,
...props ...props
}) => { }) => {
const { getDownloadedItemSize, downloadedItems } = useDownload(); const { getDownloadedItemSize, getDownloadedItems } = useDownload();
const downloadedFiles = useMemo(
() => getDownloadedItems(),
[getDownloadedItems],
);
const [size, setSize] = useState<string | undefined>(); const [size, setSize] = useState<string | undefined>();
const itemIds = useMemo(() => items.map((i) => i.Id), [items]); const itemIds = useMemo(() => items.map((i) => i.Id), [items]);
useEffect(() => { useEffect(() => {
if (!downloadedItems) return; if (!downloadedFiles) return;
let s = 0; let s = 0;
@@ -31,7 +35,7 @@ export const DownloadSize: React.FC<DownloadSizeProps> = ({
} }
} }
setSize(s.bytesToReadable()); setSize(s.bytesToReadable());
}, [itemIds, downloadedItems, getDownloadedItemSize]); }, [itemIds]);
const sizeText = useMemo(() => { const sizeText = useMemo(() => {
if (!size) return "..."; if (!size) return "...";

View File

@@ -28,7 +28,7 @@ export const EpisodeCard: React.FC<EpisodeCardProps> = ({ item }) => {
*/ */
const handleDeleteFile = useCallback(() => { const handleDeleteFile = useCallback(() => {
if (item.Id) { if (item.Id) {
deleteFile(item.Id); deleteFile(item.Id, "Episode");
successHapticFeedback(); successHapticFeedback();
} }
}, [deleteFile, item.Id]); }, [deleteFile, item.Id]);

View File

@@ -29,15 +29,15 @@ export const MovieCard: React.FC<MovieCardProps> = ({ item }) => {
const { showActionSheetWithOptions } = useActionSheet(); const { showActionSheetWithOptions } = useActionSheet();
const base64Image = useMemo(() => { const base64Image = useMemo(() => {
return item?.Id ? storage.getString(item.Id) : undefined; return storage.getString(item?.Id!);
}, [item?.Id]); }, []);
/** /**
* Handles deleting the file with haptic feedback. * Handles deleting the file with haptic feedback.
*/ */
const handleDeleteFile = useCallback(() => { const handleDeleteFile = useCallback(() => {
if (item.Id) { if (item.Id) {
deleteFile(item.Id); deleteFile(item.Id, item.Type);
} }
}, [deleteFile, item.Id]); }, [deleteFile, item.Id]);

View File

@@ -19,13 +19,7 @@ export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
return storage.getString(items[0].SeriesId!); return storage.getString(items[0].SeriesId!);
}, []); }, []);
const deleteSeries = useCallback( const deleteSeries = useCallback(async () => deleteItems(items), [items]);
async () =>
deleteItems(
items.map((item) => item.Id).filter((id) => id !== undefined),
),
[items],
);
const showActionSheet = useCallback(() => { const showActionSheet = useCallback(() => {
const options = ["Delete", "Cancel"]; const options = ["Delete", "Cancel"];

View File

@@ -109,22 +109,11 @@ export const FilterSheet = <T,>({
// to implement efficient "load more" functionality // to implement efficient "load more" functionality
useEffect(() => { useEffect(() => {
if (!_data || _data.length === 0) return; if (!_data || _data.length === 0) return;
const tmp = new Set(data);
const newData = [...data];
for (let i = offset; i < Math.min(_data.length, offset + LIMIT); i++) { for (let i = offset; i < Math.min(_data.length, offset + LIMIT); i++) {
const item = _data[i]; tmp.add(_data[i]);
// Check if this item already exists in our data array
// some dups happened with re-renders during testing
const exists = newData.some((existingItem) =>
isEqual(existingItem, item),
);
if (!exists) {
newData.push(item);
}
} }
setData(Array.from(tmp));
setData(newData);
}, [offset, _data]); }, [offset, _data]);
useEffect(() => { useEffect(() => {
@@ -244,7 +233,7 @@ export const FilterSheet = <T,>({
{data.length < (_data?.length || 0) && ( {data.length < (_data?.length || 0) && (
<Button <Button
onPress={() => { onPress={() => {
setOffset(offset + LIMIT); setOffset(offset + 100);
}} }}
> >
Load more Load more

View File

@@ -1,506 +0,0 @@
import { Feather, Ionicons } from "@expo/vector-icons";
import type {
BaseItemDto,
BaseItemDtoQueryResult,
BaseItemKind,
} from "@jellyfin/sdk/lib/generated-client/models";
import {
getItemsApi,
getSuggestionsApi,
getTvShowsApi,
getUserLibraryApi,
getUserViewsApi,
} from "@jellyfin/sdk/lib/utils/api";
import { type QueryFunction, useQuery } from "@tanstack/react-query";
import { useNavigation, useRouter, useSegments } from "expo-router";
import { useAtomValue } from "jotai";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import {
ActivityIndicator,
Platform,
RefreshControl,
ScrollView,
TouchableOpacity,
View,
} from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text";
import { InfiniteScrollingCollectionList } from "@/components/home/InfiniteScrollingCollectionList";
import { Loader } from "@/components/Loader";
import { MediaListSection } from "@/components/medialists/MediaListSection";
import { Colors } from "@/constants/Colors";
import { useNetworkStatus } from "@/hooks/useNetworkStatus";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useDownload } from "@/providers/DownloadProvider";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings";
import { eventBus } from "@/utils/eventBus";
type InfiniteScrollingCollectionListSection = {
type: "InfiniteScrollingCollectionList";
title?: string;
queryKey: (string | undefined | null)[];
queryFn: QueryFunction<BaseItemDto[], any, number>;
orientation?: "horizontal" | "vertical";
pageSize?: number;
};
type MediaListSectionType = {
type: "MediaListSection";
queryKey: (string | undefined)[];
queryFn: QueryFunction<BaseItemDto>;
};
type Section = InfiniteScrollingCollectionListSection | MediaListSectionType;
export const Home = () => {
const router = useRouter();
const { t } = useTranslation();
const api = useAtomValue(apiAtom);
const user = useAtomValue(userAtom);
const insets = useSafeAreaInsets();
const [loading, setLoading] = useState(false);
const { settings, refreshStreamyfinPluginSettings } = useSettings();
const navigation = useNavigation();
const scrollRef = useRef<ScrollView>(null);
const { downloadedItems, cleanCacheDirectory } = useDownload();
const prevIsConnected = useRef<boolean | null>(false);
const {
isConnected,
serverConnected,
loading: retryLoading,
retryCheck,
} = useNetworkStatus();
const invalidateCache = useInvalidatePlaybackProgressCache();
const [scrollY, setScrollY] = useState(0);
useEffect(() => {
if (isConnected && !prevIsConnected.current) {
invalidateCache();
}
prevIsConnected.current = isConnected;
}, [isConnected, invalidateCache]);
const hasDownloads = useMemo(() => {
if (Platform.isTV) return false;
return downloadedItems.length > 0;
}, [downloadedItems]);
useEffect(() => {
if (Platform.isTV) {
navigation.setOptions({
headerLeft: () => null,
});
return;
}
navigation.setOptions({
headerLeft: () => (
<TouchableOpacity
onPress={() => {
router.push("/(auth)/downloads");
}}
className='ml-1.5'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
>
<Feather
name='download'
color={hasDownloads ? Colors.primary : "white"}
size={24}
/>
</TouchableOpacity>
),
});
}, [navigation, router, hasDownloads]);
useEffect(() => {
cleanCacheDirectory().catch((_e) =>
console.error("Something went wrong cleaning cache directory"),
);
}, []);
const segments = useSegments();
useEffect(() => {
const unsubscribe = eventBus.on("scrollToTop", () => {
if ((segments as string[])[2] === "(home)")
scrollRef.current?.scrollTo({
y: Platform.isTV ? -152 : -100,
animated: true,
});
});
return () => {
unsubscribe();
};
}, [segments]);
const {
data,
isError: e1,
isLoading: l1,
} = useQuery({
queryKey: ["home", "userViews", user?.Id],
queryFn: async () => {
if (!api || !user?.Id) {
return null;
}
const response = await getUserViewsApi(api).getUserViews({
userId: user.Id,
});
return response.data.Items || null;
},
enabled: !!api && !!user?.Id,
staleTime: 60 * 1000,
});
const userViews = useMemo(
() => data?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)),
[data, settings?.hiddenLibraries],
);
const collections = useMemo(() => {
const allow = ["movies", "tvshows"];
return (
userViews?.filter(
(c) => c.CollectionType && allow.includes(c.CollectionType),
) || []
);
}, [userViews]);
const refetch = async () => {
setLoading(true);
await refreshStreamyfinPluginSettings();
await invalidateCache();
setLoading(false);
};
const createCollectionConfig = useCallback(
(
title: string,
queryKey: string[],
includeItemTypes: BaseItemKind[],
parentId: string | undefined,
pageSize: number = 10,
): InfiniteScrollingCollectionListSection => ({
title,
queryKey,
queryFn: async ({ pageParam = 0 }) => {
if (!api) return [];
// getLatestMedia doesn't support startIndex, so we fetch all and slice client-side
const allData =
(
await getUserLibraryApi(api).getLatestMedia({
userId: user?.Id,
limit: 100, // Fetch a larger set for pagination
fields: ["PrimaryImageAspectRatio", "Path", "Genres"],
imageTypeLimit: 1,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
includeItemTypes,
parentId,
})
).data || [];
// Simulate pagination by slicing
return allData.slice(pageParam, pageParam + pageSize);
},
type: "InfiniteScrollingCollectionList",
pageSize,
}),
[api, user?.Id],
);
const defaultSections = useMemo(() => {
if (!api || !user?.Id) return [];
const latestMediaViews = collections.map((c) => {
const includeItemTypes: BaseItemKind[] =
c.CollectionType === "tvshows" || c.CollectionType === "movies"
? []
: ["Movie"];
const title = t("home.recently_added_in", { libraryName: c.Name });
const queryKey: string[] = [
"home",
`recentlyAddedIn${c.CollectionType}`,
user.Id!,
c.Id!,
];
return createCollectionConfig(
title || "",
queryKey,
includeItemTypes,
c.Id,
10,
);
});
const ss: Section[] = [
{
title: t("home.continue_watching"),
queryKey: ["home", "resumeItems"],
queryFn: async ({ pageParam = 0 }) =>
(
await getItemsApi(api).getResumeItems({
userId: user.Id,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
includeItemTypes: ["Movie", "Series", "Episode"],
fields: ["Genres"],
startIndex: pageParam,
limit: 10,
})
).data.Items || [],
type: "InfiniteScrollingCollectionList",
orientation: "horizontal",
pageSize: 10,
},
{
title: t("home.next_up"),
queryKey: ["home", "nextUp-all"],
queryFn: async ({ pageParam = 0 }) =>
(
await getTvShowsApi(api).getNextUp({
userId: user?.Id,
fields: ["MediaSourceCount", "Genres"],
startIndex: pageParam,
limit: 10,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
enableResumable: false,
})
).data.Items || [],
type: "InfiniteScrollingCollectionList",
orientation: "horizontal",
pageSize: 10,
},
...latestMediaViews,
{
title: t("home.suggested_movies"),
queryKey: ["home", "suggestedMovies", user?.Id],
queryFn: async ({ pageParam = 0 }) =>
(
await getSuggestionsApi(api).getSuggestions({
userId: user?.Id,
startIndex: pageParam,
limit: 10,
mediaType: ["Video"],
type: ["Movie"],
})
).data.Items || [],
type: "InfiniteScrollingCollectionList",
orientation: "vertical",
pageSize: 10,
},
];
return ss;
}, [api, user?.Id, collections, t, createCollectionConfig]);
const customSections = useMemo(() => {
if (!api || !user?.Id || !settings?.home?.sections) return [];
const ss: Section[] = [];
settings.home.sections.forEach((section, index) => {
const id = section.title || `section-${index}`;
const pageSize = 10;
ss.push({
title: t(`${id}`),
queryKey: ["home", "custom", String(index), section.title ?? null],
queryFn: async ({ pageParam = 0 }) => {
if (section.items) {
const response = await getItemsApi(api).getItems({
userId: user?.Id,
startIndex: pageParam,
limit: section.items?.limit || pageSize,
recursive: true,
includeItemTypes: section.items?.includeItemTypes,
sortBy: section.items?.sortBy,
sortOrder: section.items?.sortOrder,
filters: section.items?.filters,
parentId: section.items?.parentId,
});
return response.data.Items || [];
}
if (section.nextUp) {
const response = await getTvShowsApi(api).getNextUp({
userId: user?.Id,
fields: ["MediaSourceCount", "Genres"],
startIndex: pageParam,
limit: section.nextUp?.limit || pageSize,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
enableResumable: section.nextUp?.enableResumable,
enableRewatching: section.nextUp?.enableRewatching,
});
return response.data.Items || [];
}
if (section.latest) {
// getLatestMedia doesn't support startIndex, so we fetch all and slice client-side
const allData =
(
await getUserLibraryApi(api).getLatestMedia({
userId: user?.Id,
includeItemTypes: section.latest?.includeItemTypes,
limit: section.latest?.limit || 100, // Fetch larger set
isPlayed: section.latest?.isPlayed,
groupItems: section.latest?.groupItems,
})
).data || [];
// Simulate pagination by slicing
return allData.slice(pageParam, pageParam + pageSize);
}
if (section.custom) {
const response = await api.get<BaseItemDtoQueryResult>(
section.custom.endpoint,
{
params: {
...(section.custom.query || {}),
userId: user?.Id,
startIndex: pageParam,
limit: pageSize,
},
headers: section.custom.headers || {},
},
);
return response.data.Items || [];
}
return [];
},
type: "InfiniteScrollingCollectionList",
orientation: section?.orientation || "vertical",
pageSize,
});
});
return ss;
}, [api, user?.Id, settings?.home?.sections, t]);
const sections = settings?.home?.sections ? customSections : defaultSections;
if (!isConnected || serverConnected !== true) {
let title = "";
let subtitle = "";
if (!isConnected) {
title = t("home.no_internet");
subtitle = t("home.no_internet_message");
} else if (serverConnected === null) {
title = t("home.checking_server_connection");
subtitle = t("home.checking_server_connection_message");
} else if (!serverConnected) {
title = t("home.server_unreachable");
subtitle = t("home.server_unreachable_message");
}
return (
<View className='flex flex-col items-center justify-center h-full -mt-6 px-8'>
<Text className='text-3xl font-bold mb-2'>{title}</Text>
<Text className='text-center opacity-70'>{subtitle}</Text>
<View className='mt-4'>
{!Platform.isTV && (
<Button
color='purple'
onPress={() => router.push("/(auth)/downloads")}
justify='center'
iconRight={
<Ionicons name='arrow-forward' size={20} color='white' />
}
>
{t("home.go_to_downloads")}
</Button>
)}
<Button
color='black'
onPress={retryCheck}
justify='center'
className='mt-2'
iconRight={
retryLoading ? null : (
<Ionicons name='refresh' size={20} color='white' />
)
}
>
{retryLoading ? (
<ActivityIndicator size='small' color='white' />
) : (
t("home.retry")
)}
</Button>
</View>
</View>
);
}
if (e1)
return (
<View className='flex flex-col items-center justify-center h-full -mt-6'>
<Text className='text-3xl font-bold mb-2'>{t("home.oops")}</Text>
<Text className='text-center opacity-70'>
{t("home.error_message")}
</Text>
</View>
);
if (l1)
return (
<View className='justify-center items-center h-full'>
<Loader />
</View>
);
return (
<ScrollView
ref={scrollRef}
nestedScrollEnabled
contentInsetAdjustmentBehavior='automatic'
onScroll={(event) => {
setScrollY(event.nativeEvent.contentOffset.y - 500);
}}
scrollEventThrottle={16}
refreshControl={
<RefreshControl
refreshing={loading}
onRefresh={refetch}
tintColor='white'
colors={["white"]}
/>
}
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
paddingBottom: 16,
}}
>
<View
className='flex flex-col space-y-4'
style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
>
{sections.map((section, index) => {
if (section.type === "InfiniteScrollingCollectionList") {
return (
<InfiniteScrollingCollectionList
key={index}
title={section.title}
queryKey={section.queryKey}
queryFn={section.queryFn}
orientation={section.orientation}
hideIfEmpty
pageSize={section.pageSize}
/>
);
}
if (section.type === "MediaListSection") {
return (
<MediaListSection
key={index}
queryKey={section.queryKey}
queryFn={section.queryFn}
scrollY={scrollY}
enableLazyLoading={true}
/>
);
}
return null;
})}
</View>
</ScrollView>
);
};

View File

@@ -1,7 +1,7 @@
import { Feather, Ionicons } from "@expo/vector-icons"; import { Feather, Ionicons } from "@expo/vector-icons";
import type { Api } from "@jellyfin/sdk";
import type { import type {
BaseItemDto, BaseItemDto,
BaseItemDtoQueryResult,
BaseItemKind, BaseItemKind,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { import {
@@ -19,17 +19,15 @@ import { useTranslation } from "react-i18next";
import { import {
ActivityIndicator, ActivityIndicator,
Platform, Platform,
RefreshControl,
ScrollView,
TouchableOpacity, TouchableOpacity,
View, View,
} from "react-native"; } from "react-native";
import Animated, {
useAnimatedRef,
useScrollViewOffset,
} from "react-native-reanimated";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { InfiniteScrollingCollectionList } from "@/components/home/InfiniteScrollingCollectionList"; import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
import { Loader } from "@/components/Loader"; import { Loader } from "@/components/Loader";
import { MediaListSection } from "@/components/medialists/MediaListSection"; import { MediaListSection } from "@/components/medialists/MediaListSection";
import { Colors } from "@/constants/Colors"; import { Colors } from "@/constants/Colors";
@@ -41,13 +39,12 @@ import { useSettings } from "@/utils/atoms/settings";
import { eventBus } from "@/utils/eventBus"; import { eventBus } from "@/utils/eventBus";
import { AppleTVCarousel } from "../apple-tv-carousel/AppleTVCarousel"; import { AppleTVCarousel } from "../apple-tv-carousel/AppleTVCarousel";
type InfiniteScrollingCollectionListSection = { type ScrollingCollectionListSection = {
type: "InfiniteScrollingCollectionList"; type: "ScrollingCollectionList";
title?: string; title?: string;
queryKey: (string | undefined | null)[]; queryKey: (string | undefined | null)[];
queryFn: QueryFunction<BaseItemDto[], any, number>; queryFn: QueryFunction<BaseItemDto[]>;
orientation?: "horizontal" | "vertical"; orientation?: "horizontal" | "vertical";
pageSize?: number;
}; };
type MediaListSectionType = { type MediaListSectionType = {
@@ -56,21 +53,26 @@ type MediaListSectionType = {
queryFn: QueryFunction<BaseItemDto>; queryFn: QueryFunction<BaseItemDto>;
}; };
type Section = InfiniteScrollingCollectionListSection | MediaListSectionType; type Section = ScrollingCollectionListSection | MediaListSectionType;
export const HomeWithCarousel = () => { export const HomeIndex = () => {
const router = useRouter(); const router = useRouter();
const { t } = useTranslation(); const { t } = useTranslation();
const api = useAtomValue(apiAtom); const api = useAtomValue(apiAtom);
const user = useAtomValue(userAtom); const user = useAtomValue(userAtom);
const insets = useSafeAreaInsets();
const [_loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { settings, refreshStreamyfinPluginSettings } = useSettings(); const { settings, refreshStreamyfinPluginSettings } = useSettings();
const headerOverlayOffset = Platform.isTV ? 0 : 60;
const navigation = useNavigation(); const navigation = useNavigation();
const animatedScrollRef = useAnimatedRef<Animated.ScrollView>();
const scrollOffset = useScrollViewOffset(animatedScrollRef); const insets = useSafeAreaInsets();
const { downloadedItems, cleanCacheDirectory } = useDownload();
const scrollViewRef = useRef<ScrollView>(null);
const { getDownloadedItems, cleanCacheDirectory } = useDownload();
const prevIsConnected = useRef<boolean | null>(false); const prevIsConnected = useRef<boolean | null>(false);
const { const {
isConnected, isConnected,
@@ -79,19 +81,19 @@ export const HomeWithCarousel = () => {
retryCheck, retryCheck,
} = useNetworkStatus(); } = useNetworkStatus();
const invalidateCache = useInvalidatePlaybackProgressCache(); const invalidateCache = useInvalidatePlaybackProgressCache();
const [scrollY, setScrollY] = useState(0);
useEffect(() => { useEffect(() => {
// Only invalidate cache when transitioning from offline to online
if (isConnected && !prevIsConnected.current) { if (isConnected && !prevIsConnected.current) {
invalidateCache(); invalidateCache();
} }
// Update the ref to the current state for the next render
prevIsConnected.current = isConnected; prevIsConnected.current = isConnected;
}, [isConnected, invalidateCache]); }, [isConnected, invalidateCache]);
const hasDownloads = useMemo(() => { const hasDownloads = useMemo(() => {
if (Platform.isTV) return false; if (Platform.isTV) return false;
return downloadedItems.length > 0; return getDownloadedItems().length > 0;
}, [downloadedItems]); }, [getDownloadedItems]);
useEffect(() => { useEffect(() => {
if (Platform.isTV) { if (Platform.isTV) {
@@ -106,13 +108,12 @@ export const HomeWithCarousel = () => {
onPress={() => { onPress={() => {
router.push("/(auth)/downloads"); router.push("/(auth)/downloads");
}} }}
className='ml-1.5' className='p-2'
style={{ marginRight: Platform.OS === "android" ? 16 : 0 }}
> >
<Feather <Feather
name='download' name='download'
color={hasDownloads ? Colors.primary : "white"} color={hasDownloads ? Colors.primary : "white"}
size={24} size={22}
/> />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -129,7 +130,7 @@ export const HomeWithCarousel = () => {
useEffect(() => { useEffect(() => {
const unsubscribe = eventBus.on("scrollToTop", () => { const unsubscribe = eventBus.on("scrollToTop", () => {
if ((segments as string[])[2] === "(home)") if ((segments as string[])[2] === "(home)")
animatedScrollRef.current?.scrollTo({ scrollViewRef.current?.scrollTo({
y: Platform.isTV ? -152 : -100, y: Platform.isTV ? -152 : -100,
animated: true, animated: true,
}); });
@@ -175,7 +176,7 @@ export const HomeWithCarousel = () => {
); );
}, [userViews]); }, [userViews]);
const _refetch = async () => { const refetch = async () => {
setLoading(true); setLoading(true);
await refreshStreamyfinPluginSettings(); await refreshStreamyfinPluginSettings();
await invalidateCache(); await invalidateCache();
@@ -188,48 +189,42 @@ export const HomeWithCarousel = () => {
queryKey: string[], queryKey: string[],
includeItemTypes: BaseItemKind[], includeItemTypes: BaseItemKind[],
parentId: string | undefined, parentId: string | undefined,
pageSize: number = 10, ): ScrollingCollectionListSection => ({
): InfiniteScrollingCollectionListSection => ({
title, title,
queryKey, queryKey,
queryFn: async ({ pageParam = 0 }) => { queryFn: async () => {
if (!api) return []; if (!api) return [];
// getLatestMedia doesn't support startIndex, so we fetch all and slice client-side return (
const allData =
( (
await getUserLibraryApi(api).getLatestMedia({ await getUserLibraryApi(api).getLatestMedia({
userId: user?.Id, userId: user?.Id,
limit: 100, // Fetch a larger set for pagination limit: 20,
fields: ["PrimaryImageAspectRatio", "Path", "Genres"], fields: ["PrimaryImageAspectRatio", "Path", "Genres"],
imageTypeLimit: 1, imageTypeLimit: 1,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"], enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
includeItemTypes, includeItemTypes,
parentId, parentId,
}) })
).data || []; ).data || []
);
// Simulate pagination by slicing
return allData.slice(pageParam, pageParam + pageSize);
}, },
type: "InfiniteScrollingCollectionList", type: "ScrollingCollectionList",
pageSize,
}), }),
[api, user?.Id], [api, user?.Id],
); );
// Always call useMemo() at the top-level, using computed dependencies for both "default"/custom sections
const defaultSections = useMemo(() => { const defaultSections = useMemo(() => {
if (!api || !user?.Id) return []; if (!api || !user?.Id) return [];
const latestMediaViews = collections.map((c) => { const latestMediaViews = collections.map((c) => {
const includeItemTypes: BaseItemKind[] = const includeItemTypes: BaseItemKind[] =
c.CollectionType === "tvshows" || c.CollectionType === "movies" c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
? []
: ["Movie"];
const title = t("home.recently_added_in", { libraryName: c.Name }); const title = t("home.recently_added_in", { libraryName: c.Name });
const queryKey: string[] = [ const queryKey = [
"home", "home",
`recentlyAddedIn${c.CollectionType}`, `recentlyAddedIn${c.CollectionType}`,
user.Id!, user?.Id!,
c.Id!, c.Id!,
]; ];
return createCollectionConfig( return createCollectionConfig(
@@ -237,7 +232,6 @@ export const HomeWithCarousel = () => {
queryKey, queryKey,
includeItemTypes, includeItemTypes,
c.Id, c.Id,
10,
); );
}); });
@@ -245,56 +239,79 @@ export const HomeWithCarousel = () => {
{ {
title: t("home.continue_watching"), title: t("home.continue_watching"),
queryKey: ["home", "resumeItems"], queryKey: ["home", "resumeItems"],
queryFn: async ({ pageParam = 0 }) => queryFn: async () =>
( (
await getItemsApi(api).getResumeItems({ await getItemsApi(api).getResumeItems({
userId: user.Id, userId: user.Id,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"], enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
includeItemTypes: ["Movie", "Series", "Episode"], includeItemTypes: ["Movie", "Series", "Episode"],
fields: ["Genres"], fields: ["Genres"],
startIndex: pageParam,
limit: 10,
}) })
).data.Items || [], ).data.Items || [],
type: "InfiniteScrollingCollectionList", type: "ScrollingCollectionList",
orientation: "horizontal", orientation: "horizontal",
pageSize: 10,
}, },
{ {
title: t("home.next_up"), title: t("home.next_up"),
queryKey: ["home", "nextUp-all"], queryKey: ["home", "nextUp-all"],
queryFn: async ({ pageParam = 0 }) => queryFn: async () =>
( (
await getTvShowsApi(api).getNextUp({ await getTvShowsApi(api).getNextUp({
userId: user?.Id, userId: user?.Id,
fields: ["MediaSourceCount", "Genres"], fields: ["MediaSourceCount", "Genres"],
startIndex: pageParam, limit: 20,
limit: 10,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"], enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
enableResumable: false, enableResumable: false,
}) })
).data.Items || [], ).data.Items || [],
type: "InfiniteScrollingCollectionList", type: "ScrollingCollectionList",
orientation: "horizontal", orientation: "horizontal",
pageSize: 10,
}, },
...latestMediaViews, ...latestMediaViews,
// ...(mediaListCollections?.map(
// (ml) =>
// ({
// title: ml.Name,
// queryKey: ["home", "mediaList", ml.Id!],
// queryFn: async () => ml,
// type: "MediaListSection",
// orientation: "vertical",
// } as Section)
// ) || []),
{ {
title: t("home.suggested_movies"), title: t("home.suggested_movies"),
queryKey: ["home", "suggestedMovies", user?.Id], queryKey: ["home", "suggestedMovies", user?.Id],
queryFn: async ({ pageParam = 0 }) => queryFn: async () =>
( (
await getSuggestionsApi(api).getSuggestions({ await getSuggestionsApi(api).getSuggestions({
userId: user?.Id, userId: user?.Id,
startIndex: pageParam,
limit: 10, limit: 10,
mediaType: ["Video"], mediaType: ["Video"],
type: ["Movie"], type: ["Movie"],
}) })
).data.Items || [], ).data.Items || [],
type: "InfiniteScrollingCollectionList", type: "ScrollingCollectionList",
orientation: "vertical", orientation: "vertical",
pageSize: 10, },
{
title: t("home.suggested_episodes"),
queryKey: ["home", "suggestedEpisodes", user?.Id],
queryFn: async () => {
try {
const suggestions = await getSuggestions(api, user.Id);
const nextUpPromises = suggestions.map((series) =>
getNextUp(api, user.Id, series.Id),
);
const nextUpResults = await Promise.all(nextUpPromises);
return nextUpResults.filter((item) => item !== null) || [];
} catch (error) {
console.error("Error fetching data:", error);
return [];
}
},
type: "ScrollingCollectionList",
orientation: "horizontal",
}, },
]; ];
return ss; return ss;
@@ -303,18 +320,16 @@ export const HomeWithCarousel = () => {
const customSections = useMemo(() => { const customSections = useMemo(() => {
if (!api || !user?.Id || !settings?.home?.sections) return []; if (!api || !user?.Id || !settings?.home?.sections) return [];
const ss: Section[] = []; const ss: Section[] = [];
settings.home.sections.forEach((section, index) => { for (const [index, section] of settings.home.sections.entries()) {
const id = section.title || `section-${index}`; const id = section.title || `section-${index}`;
const pageSize = 10;
ss.push({ ss.push({
title: t(`${id}`), title: t(`${id}`),
queryKey: ["home", "custom", String(index), section.title ?? null], queryKey: ["home", "custom", String(index), section.title ?? null],
queryFn: async ({ pageParam = 0 }) => { queryFn: async () => {
if (section.items) { if (section.items) {
const response = await getItemsApi(api).getItems({ const response = await getItemsApi(api).getItems({
userId: user?.Id, userId: user?.Id,
startIndex: pageParam, limit: section.items?.limit || 25,
limit: section.items?.limit || pageSize,
recursive: true, recursive: true,
includeItemTypes: section.items?.includeItemTypes, includeItemTypes: section.items?.includeItemTypes,
sortBy: section.items?.sortBy, sortBy: section.items?.sortBy,
@@ -328,8 +343,7 @@ export const HomeWithCarousel = () => {
const response = await getTvShowsApi(api).getNextUp({ const response = await getTvShowsApi(api).getNextUp({
userId: user?.Id, userId: user?.Id,
fields: ["MediaSourceCount", "Genres"], fields: ["MediaSourceCount", "Genres"],
startIndex: pageParam, limit: section.nextUp?.limit || 25,
limit: section.nextUp?.limit || pageSize,
enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"], enableImageTypes: ["Primary", "Backdrop", "Thumb", "Logo"],
enableResumable: section.nextUp?.enableResumable, enableResumable: section.nextUp?.enableResumable,
enableRewatching: section.nextUp?.enableRewatching, enableRewatching: section.nextUp?.enableRewatching,
@@ -337,45 +351,23 @@ export const HomeWithCarousel = () => {
return response.data.Items || []; return response.data.Items || [];
} }
if (section.latest) { if (section.latest) {
// getLatestMedia doesn't support startIndex, so we fetch all and slice client-side const response = await getUserLibraryApi(api).getLatestMedia({
const allData = userId: user?.Id,
( includeItemTypes: section.latest?.includeItemTypes,
await getUserLibraryApi(api).getLatestMedia({ limit: section.latest?.limit || 25,
userId: user?.Id, isPlayed: section.latest?.isPlayed,
includeItemTypes: section.latest?.includeItemTypes, groupItems: section.latest?.groupItems,
limit: section.latest?.limit || 100, // Fetch larger set });
isPlayed: section.latest?.isPlayed, return response.data || [];
groupItems: section.latest?.groupItems,
})
).data || [];
// Simulate pagination by slicing
return allData.slice(pageParam, pageParam + pageSize);
}
if (section.custom) {
const response = await api.get<BaseItemDtoQueryResult>(
section.custom.endpoint,
{
params: {
...(section.custom.query || {}),
userId: user?.Id,
startIndex: pageParam,
limit: pageSize,
},
headers: section.custom.headers || {},
},
);
return response.data.Items || [];
} }
return []; return [];
}, },
type: "InfiniteScrollingCollectionList", type: "ScrollingCollectionList",
orientation: section?.orientation || "vertical", orientation: section?.orientation || "vertical",
pageSize,
}); });
}); }
return ss; return ss;
}, [api, user?.Id, settings?.home?.sections, t]); }, [api, user?.Id, settings?.home?.sections]);
const sections = settings?.home?.sections ? customSections : defaultSections; const sections = settings?.home?.sections ? customSections : defaultSections;
@@ -384,12 +376,15 @@ export const HomeWithCarousel = () => {
let subtitle = ""; let subtitle = "";
if (!isConnected) { if (!isConnected) {
// No network connection
title = t("home.no_internet"); title = t("home.no_internet");
subtitle = t("home.no_internet_message"); subtitle = t("home.no_internet_message");
} else if (serverConnected === null) { } else if (serverConnected === null) {
// Network is up, but server is being checked
title = t("home.checking_server_connection"); title = t("home.checking_server_connection");
subtitle = t("home.checking_server_connection_message"); subtitle = t("home.checking_server_connection_message");
} else if (!serverConnected) { } else if (!serverConnected) {
// Network is up, but server is unreachable
title = t("home.server_unreachable"); title = t("home.server_unreachable");
subtitle = t("home.server_unreachable_message"); subtitle = t("home.server_unreachable_message");
} }
@@ -452,41 +447,42 @@ export const HomeWithCarousel = () => {
); );
return ( return (
<Animated.ScrollView <ScrollView
scrollToOverflowEnabled={true} scrollToOverflowEnabled={true}
ref={animatedScrollRef} ref={scrollViewRef}
nestedScrollEnabled nestedScrollEnabled
contentInsetAdjustmentBehavior='never' contentInsetAdjustmentBehavior='never'
scrollEventThrottle={16} refreshControl={
bounces={false} <RefreshControl
overScrollMode='never' refreshing={loading}
style={{ marginTop: -headerOverlayOffset }} onRefresh={refetch}
contentContainerStyle={{ paddingTop: headerOverlayOffset }} tintColor='white' // For iOS
onScroll={(event) => { colors={["white"]} // For Android
setScrollY(event.nativeEvent.contentOffset.y); progressViewOffset={200} // This offsets the refresh indicator to appear over the carousel
}} />
}
style={{ marginTop: Platform.isTV ? 0 : -100 }}
contentContainerStyle={{ paddingTop: Platform.isTV ? 0 : 100 }}
> >
<AppleTVCarousel initialIndex={0} scrollOffset={scrollOffset} /> <AppleTVCarousel initialIndex={0} />
<View <View
style={{ style={{
paddingLeft: insets.left, paddingLeft: insets.left,
paddingRight: insets.right, paddingRight: insets.right,
paddingBottom: 16, paddingBottom: 16,
paddingTop: 0,
}} }}
> >
<View className='flex flex-col space-y-4'> <View className='flex flex-col space-y-4'>
{sections.map((section, index) => { {sections.map((section, index) => {
if (section.type === "InfiniteScrollingCollectionList") { if (section.type === "ScrollingCollectionList") {
return ( return (
<InfiniteScrollingCollectionList <ScrollingCollectionList
key={index} key={index}
title={section.title} title={section.title}
queryKey={section.queryKey} queryKey={section.queryKey}
queryFn={section.queryFn} queryFn={section.queryFn}
orientation={section.orientation} orientation={section.orientation}
hideIfEmpty hideIfEmpty
pageSize={section.pageSize}
/> />
); );
} }
@@ -496,8 +492,6 @@ export const HomeWithCarousel = () => {
key={index} key={index}
queryKey={section.queryKey} queryKey={section.queryKey}
queryFn={section.queryFn} queryFn={section.queryFn}
scrollY={scrollY}
enableLazyLoading={true}
/> />
); );
} }
@@ -506,6 +500,33 @@ export const HomeWithCarousel = () => {
</View> </View>
</View> </View>
<View className='h-24' /> <View className='h-24' />
</Animated.ScrollView> </ScrollView>
); );
}; };
// Function to get suggestions
async function getSuggestions(api: Api, userId: string | undefined) {
if (!userId) return [];
const response = await getSuggestionsApi(api).getSuggestions({
userId,
limit: 10,
mediaType: ["Unknown"],
type: ["Series"],
});
return response.data.Items ?? [];
}
// Function to get the next up TV show for a series
async function getNextUp(
api: Api,
userId: string | undefined,
seriesId: string | undefined,
) {
if (!userId || !seriesId) return null;
const response = await getTvShowsApi(api).getNextUp({
userId,
seriesId,
limit: 1,
});
return response.data.Items?.[0] ?? null;
}

View File

@@ -13,7 +13,6 @@ import {
} from "react-native"; } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import MoviePoster from "@/components/posters/MoviePoster"; import MoviePoster from "@/components/posters/MoviePoster";
import { Colors } from "../../constants/Colors";
import ContinueWatchingPoster from "../ContinueWatchingPoster"; import ContinueWatchingPoster from "../ContinueWatchingPoster";
import { TouchableItemRouter } from "../common/TouchableItemRouter"; import { TouchableItemRouter } from "../common/TouchableItemRouter";
import { ItemCardText } from "../ItemCardText"; import { ItemCardText } from "../ItemCardText";
@@ -36,7 +35,7 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
queryFn, queryFn,
queryKey, queryKey,
hideIfEmpty = false, hideIfEmpty = false,
pageSize = 10, pageSize = 20,
...props ...props
}) => { }) => {
const { data, isLoading, isFetchingNextPage, hasNextPage, fetchNextPage } = const { data, isLoading, isFetchingNextPage, hasNextPage, fetchNextPage } =
@@ -53,9 +52,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
return allPages.length * pageSize; return allPages.length * pageSize;
}, },
initialPageParam: 0, initialPageParam: 0,
staleTime: 60 * 1000, // 1 minute staleTime: 0,
refetchOnMount: false, refetchOnMount: true,
refetchOnWindowFocus: false, refetchOnWindowFocus: true,
refetchOnReconnect: true, refetchOnReconnect: true,
}); });
@@ -180,13 +179,8 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
))} ))}
{/* Loading indicator for next page */} {/* Loading indicator for next page */}
{isFetchingNextPage && ( {isFetchingNextPage && (
<View <View className='justify-center items-center w-16'>
style={{ <ActivityIndicator size='small' color='#6366f1' />
marginLeft: 8,
marginTop: orientation === "horizontal" ? 37 : 70,
}}
>
<ActivityIndicator size='small' color={Colors.primary} />
</View> </View>
)} )}
</View> </View>

View File

@@ -8,7 +8,6 @@ import { useTranslation } from "react-i18next";
import { ScrollView, View, type ViewProps } from "react-native"; import { ScrollView, View, type ViewProps } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import MoviePoster from "@/components/posters/MoviePoster"; import MoviePoster from "@/components/posters/MoviePoster";
import { useInView } from "@/hooks/useInView";
import ContinueWatchingPoster from "../ContinueWatchingPoster"; import ContinueWatchingPoster from "../ContinueWatchingPoster";
import { TouchableItemRouter } from "../common/TouchableItemRouter"; import { TouchableItemRouter } from "../common/TouchableItemRouter";
import { ItemCardText } from "../ItemCardText"; import { ItemCardText } from "../ItemCardText";
@@ -22,8 +21,6 @@ interface Props extends ViewProps {
queryFn: QueryFunction<BaseItemDto[]>; queryFn: QueryFunction<BaseItemDto[]>;
hideIfEmpty?: boolean; hideIfEmpty?: boolean;
isOffline?: boolean; isOffline?: boolean;
scrollY?: number; // For lazy loading
enableLazyLoading?: boolean; // Enable/disable lazy loading
} }
export const ScrollingCollectionList: React.FC<Props> = ({ export const ScrollingCollectionList: React.FC<Props> = ({
@@ -34,44 +31,33 @@ export const ScrollingCollectionList: React.FC<Props> = ({
queryKey, queryKey,
hideIfEmpty = false, hideIfEmpty = false,
isOffline = false, isOffline = false,
scrollY = 0,
enableLazyLoading = false,
...props ...props
}) => { }) => {
const { ref, isInView, onLayout } = useInView(scrollY, {
enabled: enableLazyLoading,
});
const { data, isLoading } = useQuery({ const { data, isLoading } = useQuery({
queryKey: queryKey, queryKey: queryKey,
queryFn, queryFn,
staleTime: 60 * 1000, // 1 minute staleTime: 0,
refetchOnMount: false, refetchOnMount: true,
refetchOnWindowFocus: false, refetchOnWindowFocus: true,
refetchOnReconnect: true, refetchOnReconnect: true,
enabled: enableLazyLoading ? isInView : true,
}); });
const { t } = useTranslation(); const { t } = useTranslation();
// Show skeleton if loading OR if lazy loading is enabled and not in view yet if (hideIfEmpty === true && data?.length === 0) return null;
const shouldShowSkeleton = isLoading || (enableLazyLoading && !isInView);
if (hideIfEmpty === true && data?.length === 0 && !shouldShowSkeleton)
return null;
if (disabled || !title) return null; if (disabled || !title) return null;
return ( return (
<View ref={ref} onLayout={onLayout} {...props}> <View {...props}>
<Text className='px-4 text-lg font-bold mb-2 text-neutral-100'> <Text className='px-4 text-lg font-bold mb-2 text-neutral-100'>
{title} {title}
</Text> </Text>
{!shouldShowSkeleton && data?.length === 0 && ( {isLoading === false && data?.length === 0 && (
<View className='px-4'> <View className='px-4'>
<Text className='text-neutral-500'>{t("home.no_items")}</Text> <Text className='text-neutral-500'>{t("home.no_items")}</Text>
</View> </View>
)} )}
{shouldShowSkeleton ? ( {isLoading ? (
<View <View
className={` className={`
flex flex-row gap-2 px-4 flex flex-row gap-2 px-4

View File

@@ -23,6 +23,7 @@ const CastSlide: React.FC<
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
data={details?.credits.cast} data={details?.credits.cast}
ItemSeparatorComponent={() => <View className='w-2' />} ItemSeparatorComponent={() => <View className='w-2' />}
estimatedItemSize={15}
keyExtractor={(item) => item?.id?.toString()} keyExtractor={(item) => item?.id?.toString()}
contentContainerStyle={{ paddingHorizontal: 16 }} contentContainerStyle={{ paddingHorizontal: 16 }}
renderItem={({ item }) => ( renderItem={({ item }) => (

View File

@@ -143,6 +143,7 @@ const ParallaxSlideShow = <T,>({
renderItem={({ item, index }) => renderItem(item, index)} renderItem={({ item, index }) => renderItem(item, index)}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}
numColumns={3} numColumns={3}
estimatedItemSize={214}
ItemSeparatorComponent={() => <View className='h-2 w-2' />} ItemSeparatorComponent={() => <View className='h-2 w-2' />}
/> />
</View> </View>

View File

@@ -8,7 +8,7 @@ import type { BottomSheetModalMethods } from "@gorhom/bottom-sheet/lib/typescrip
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { forwardRef, useCallback, useMemo, useState } from "react"; import { forwardRef, useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { View, type ViewProps } from "react-native"; import { TouchableOpacity, View, type ViewProps } from "react-native";
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { PlatformDropdown } from "@/components/PlatformDropdown"; import { PlatformDropdown } from "@/components/PlatformDropdown";
@@ -48,22 +48,8 @@ const RequestModal = forwardRef<
userId: jellyseerrUser?.id, userId: jellyseerrUser?.id,
}); });
const [qualityProfileOpen, setQualityProfileOpen] = useState(false);
const [rootFolderOpen, setRootFolderOpen] = useState(false);
const [tagsOpen, setTagsOpen] = useState(false);
const [usersOpen, setUsersOpen] = useState(false);
const { t } = useTranslation(); const { t } = useTranslation();
// Reset all dropdown states when modal closes
const handleDismiss = useCallback(() => {
setQualityProfileOpen(false);
setRootFolderOpen(false);
setTagsOpen(false);
setUsersOpen(false);
onDismiss?.();
}, [onDismiss]);
const { data: serviceSettings } = useQuery({ const { data: serviceSettings } = useQuery({
queryKey: ["jellyseerr", "request", type, "service"], queryKey: ["jellyseerr", "request", type, "service"],
queryFn: async () => queryFn: async () =>
@@ -144,14 +130,11 @@ const RequestModal = forwardRef<
}, [defaultServiceDetails]); }, [defaultServiceDetails]);
const seasonTitle = useMemo(() => { const seasonTitle = useMemo(() => {
if (!requestBody?.seasons || requestBody.seasons.length === 0) { if (requestBody?.seasons && requestBody?.seasons?.length > 1) {
return undefined;
}
if (requestBody.seasons.length > 1) {
return t("jellyseerr.season_all"); return t("jellyseerr.season_all");
} }
return t("jellyseerr.season_number", { return t("jellyseerr.season_number", {
season_number: requestBody.seasons[0], season_number: requestBody?.seasons,
}); });
}, [requestBody?.seasons]); }, [requestBody?.seasons]);
@@ -161,6 +144,7 @@ const RequestModal = forwardRef<
const qualityProfileOptions = useMemo( const qualityProfileOptions = useMemo(
() => [ () => [
{ {
title: t("jellyseerr.quality_profile"),
options: options:
defaultServiceDetails?.profiles.map((profile) => ({ defaultServiceDetails?.profiles.map((profile) => ({
type: "radio" as const, type: "radio" as const,
@@ -181,12 +165,14 @@ const RequestModal = forwardRef<
defaultServiceDetails?.profiles, defaultServiceDetails?.profiles,
defaultProfile, defaultProfile,
requestOverrides.profileId, requestOverrides.profileId,
t,
], ],
); );
const rootFolderOptions = useMemo( const rootFolderOptions = useMemo(
() => [ () => [
{ {
title: t("jellyseerr.root_folder"),
options: options:
defaultServiceDetails?.rootFolders.map((folder) => ({ defaultServiceDetails?.rootFolders.map((folder) => ({
type: "radio" as const, type: "radio" as const,
@@ -207,12 +193,14 @@ const RequestModal = forwardRef<
defaultServiceDetails?.rootFolders, defaultServiceDetails?.rootFolders,
defaultFolder, defaultFolder,
requestOverrides.rootFolder, requestOverrides.rootFolder,
t,
], ],
); );
const tagsOptions = useMemo( const tagsOptions = useMemo(
() => [ () => [
{ {
title: t("jellyseerr.tags"),
options: options:
defaultServiceDetails?.tags.map((tag) => ({ defaultServiceDetails?.tags.map((tag) => ({
type: "toggle" as const, type: "toggle" as const,
@@ -234,12 +222,13 @@ const RequestModal = forwardRef<
})) || [], })) || [],
}, },
], ],
[defaultServiceDetails?.tags, defaultTags, requestOverrides.tags], [defaultServiceDetails?.tags, defaultTags, requestOverrides.tags, t],
); );
const usersOptions = useMemo( const usersOptions = useMemo(
() => [ () => [
{ {
title: t("jellyseerr.request_as"),
options: options:
users?.map((user) => ({ users?.map((user) => ({
type: "radio" as const, type: "radio" as const,
@@ -255,7 +244,7 @@ const RequestModal = forwardRef<
})) || [], })) || [],
}, },
], ],
[users, jellyseerrUser, requestOverrides.userId], [users, jellyseerrUser, requestOverrides.userId, t],
); );
const request = useCallback(() => { const request = useCallback(() => {
@@ -288,7 +277,7 @@ const RequestModal = forwardRef<
ref={ref} ref={ref}
enableDynamicSizing enableDynamicSizing
enableDismissOnClose enableDismissOnClose
onDismiss={handleDismiss} onDismiss={onDismiss}
handleIndicatorStyle={{ handleIndicatorStyle={{
backgroundColor: "white", backgroundColor: "white",
}} }}
@@ -302,7 +291,6 @@ const RequestModal = forwardRef<
appearsOnIndex={0} appearsOnIndex={0}
/> />
)} )}
stackBehavior='push'
> >
<BottomSheetView> <BottomSheetView>
<View className='flex flex-col space-y-4 px-4 pb-8 pt-2'> <View className='flex flex-col space-y-4 px-4 pb-8 pt-2'>
@@ -324,7 +312,7 @@ const RequestModal = forwardRef<
<PlatformDropdown <PlatformDropdown
groups={qualityProfileOptions} groups={qualityProfileOptions}
trigger={ trigger={
<View className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
<Text numberOfLines={1}> <Text numberOfLines={1}>
{defaultServiceDetails.profiles.find( {defaultServiceDetails.profiles.find(
(p) => (p) =>
@@ -333,11 +321,9 @@ const RequestModal = forwardRef<
defaultProfile?.id), defaultProfile?.id),
)?.name || defaultProfile?.name} )?.name || defaultProfile?.name}
</Text> </Text>
</View> </TouchableOpacity>
} }
title={t("jellyseerr.quality_profile")} title={t("jellyseerr.quality_profile")}
open={qualityProfileOpen}
onOpenChange={setQualityProfileOpen}
/> />
</View> </View>
@@ -348,7 +334,7 @@ const RequestModal = forwardRef<
<PlatformDropdown <PlatformDropdown
groups={rootFolderOptions} groups={rootFolderOptions}
trigger={ trigger={
<View className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
<Text numberOfLines={1}> <Text numberOfLines={1}>
{defaultServiceDetails.rootFolders.find( {defaultServiceDetails.rootFolders.find(
(f) => (f) =>
@@ -366,11 +352,9 @@ const RequestModal = forwardRef<
) )
: pathTitleExtractor(defaultFolder!)} : pathTitleExtractor(defaultFolder!)}
</Text> </Text>
</View> </TouchableOpacity>
} }
title={t("jellyseerr.root_folder")} title={t("jellyseerr.root_folder")}
open={rootFolderOpen}
onOpenChange={setRootFolderOpen}
/> />
</View> </View>
@@ -381,7 +365,7 @@ const RequestModal = forwardRef<
<PlatformDropdown <PlatformDropdown
groups={tagsOptions} groups={tagsOptions}
trigger={ trigger={
<View className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
<Text numberOfLines={1}> <Text numberOfLines={1}>
{requestOverrides.tags {requestOverrides.tags
? defaultServiceDetails.tags ? defaultServiceDetails.tags
@@ -393,11 +377,9 @@ const RequestModal = forwardRef<
defaultTags.map((t) => t.label).join(", ") defaultTags.map((t) => t.label).join(", ")
: defaultTags.map((t) => t.label).join(", ")} : defaultTags.map((t) => t.label).join(", ")}
</Text> </Text>
</View> </TouchableOpacity>
} }
title={t("jellyseerr.tags")} title={t("jellyseerr.tags")}
open={tagsOpen}
onOpenChange={setTagsOpen}
/> />
</View> </View>
@@ -408,7 +390,7 @@ const RequestModal = forwardRef<
<PlatformDropdown <PlatformDropdown
groups={usersOptions} groups={usersOptions}
trigger={ trigger={
<View className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'>
<Text numberOfLines={1}> <Text numberOfLines={1}>
{users.find( {users.find(
(u) => (u) =>
@@ -416,11 +398,9 @@ const RequestModal = forwardRef<
(requestOverrides.userId || jellyseerrUser?.id), (requestOverrides.userId || jellyseerrUser?.id),
)?.displayName || jellyseerrUser!.displayName} )?.displayName || jellyseerrUser!.displayName}
</Text> </Text>
</View> </TouchableOpacity>
} }
title={t("jellyseerr.request_as")} title={t("jellyseerr.request_as")}
open={usersOpen}
onOpenChange={setUsersOpen}
/> />
</View> </View>
</> </>

View File

@@ -1,15 +1,16 @@
import { FlashList } from "@shopify/flash-list"; import { FlashList } from "@shopify/flash-list";
import type { ContentStyle } from "@shopify/flash-list/src/FlashListProps";
import { t } from "i18next"; import { t } from "i18next";
import type React from "react"; import type React from "react";
import type { PropsWithChildren } from "react"; import type { PropsWithChildren } from "react";
import { View, type ViewProps, type ViewStyle } from "react-native"; import { View, type ViewProps } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover"; import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
import type DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider"; import type DiscoverSlider from "@/utils/jellyseerr/server/entity/DiscoverSlider";
export interface SlideProps { export interface SlideProps {
slide: DiscoverSlider; slide: DiscoverSlider;
contentContainerStyle?: ViewStyle; contentContainerStyle?: ContentStyle;
} }
interface Props<T> extends SlideProps { interface Props<T> extends SlideProps {
@@ -44,6 +45,7 @@ const Slide = <T,>({
}} }}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}
estimatedItemSize={250}
data={data} data={data}
onEndReachedThreshold={1} onEndReachedThreshold={1}
onEndReached={onEndReached} onEndReached={onEndReached}

View File

@@ -11,7 +11,6 @@ import {
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useCallback } from "react"; import { useCallback } from "react";
import { View, type ViewProps } from "react-native"; import { View, type ViewProps } from "react-native";
import { useInView } from "@/hooks/useInView";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { InfiniteHorizontalScroll } from "../common/InfiniteHorizontalScroll"; import { InfiniteHorizontalScroll } from "../common/InfiniteHorizontalScroll";
import { Text } from "../common/Text"; import { Text } from "../common/Text";
@@ -22,29 +21,20 @@ import MoviePoster from "../posters/MoviePoster";
interface Props extends ViewProps { interface Props extends ViewProps {
queryKey: QueryKey; queryKey: QueryKey;
queryFn: QueryFunction<BaseItemDto>; queryFn: QueryFunction<BaseItemDto>;
scrollY?: number; // For lazy loading
enableLazyLoading?: boolean; // Enable/disable lazy loading
} }
export const MediaListSection: React.FC<Props> = ({ export const MediaListSection: React.FC<Props> = ({
queryFn, queryFn,
queryKey, queryKey,
scrollY = 0,
enableLazyLoading = false,
...props ...props
}) => { }) => {
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom); const [user] = useAtom(userAtom);
const { ref, isInView, onLayout } = useInView(scrollY, {
enabled: enableLazyLoading,
});
const { data: collection } = useQuery({ const { data: collection } = useQuery({
queryKey, queryKey,
queryFn, queryFn,
staleTime: 60 * 1000, // 1 minute staleTime: 0,
enabled: enableLazyLoading ? isInView : true,
}); });
const fetchItems = useCallback( const fetchItems = useCallback(
@@ -70,7 +60,7 @@ export const MediaListSection: React.FC<Props> = ({
if (!collection) return null; if (!collection) return null;
return ( return (
<View ref={ref} onLayout={onLayout} {...props}> <View {...props}>
<Text className='px-4 text-lg font-bold mb-2 text-neutral-100'> <Text className='px-4 text-lg font-bold mb-2 text-neutral-100'>
{collection.Name} {collection.Name}
</Text> </Text>

View File

@@ -34,6 +34,7 @@ export const SearchItemWrapper = <T,>({
}} }}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
keyExtractor={(_, index) => index.toString()} keyExtractor={(_, index) => index.toString()}
estimatedItemSize={250}
data={items} data={items}
onEndReachedThreshold={1} onEndReachedThreshold={1}
onEndReached={onEndReached} onEndReached={onEndReached}

View File

@@ -47,6 +47,7 @@ const JellyseerrSeasonEpisodes: React.FC<{
horizontal horizontal
loading={isLoading} loading={isLoading}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
estimatedItemSize={50}
data={seasonWithEpisodes?.episodes} data={seasonWithEpisodes?.episodes}
keyExtractor={(item) => item.id.toString()} keyExtractor={(item) => item.id.toString()}
renderItem={(item, index) => ( renderItem={(item, index) => (
@@ -283,6 +284,7 @@ const JellyseerrSeasons: React.FC<{
</View> </View>
)} )}
ItemSeparatorComponent={() => <View className='h-2' />} ItemSeparatorComponent={() => <View className='h-2' />}
estimatedItemSize={250}
renderItem={({ item: season }) => ( renderItem={({ item: season }) => (
<> <>
<TouchableOpacity <TouchableOpacity

View File

@@ -49,6 +49,7 @@ export const NextUp: React.FC<{ seriesId: string }> = ({ seriesId }) => {
<FlashList <FlashList
contentContainerStyle={{ paddingLeft: 16 }} contentContainerStyle={{ paddingLeft: 16 }}
horizontal horizontal
estimatedItemSize={172}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
data={items} data={items}
renderItem={({ item, index }) => ( renderItem={({ item, index }) => (

View File

@@ -1,7 +1,7 @@
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { t } from "i18next"; import { t } from "i18next";
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo } from "react";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, View } from "react-native";
import { Text } from "../common/Text"; import { Text } from "../common/Text";
import { PlatformDropdown } from "../PlatformDropdown"; import { PlatformDropdown } from "../PlatformDropdown";
@@ -31,7 +31,6 @@ export const SeasonDropdown: React.FC<Props> = ({
onSelect, onSelect,
}) => { }) => {
const isTv = Platform.isTV; const isTv = Platform.isTV;
const [open, setOpen] = useState(false);
const keys = useMemo<SeasonKeys>( const keys = useMemo<SeasonKeys>(
() => () =>
@@ -60,6 +59,7 @@ export const SeasonDropdown: React.FC<Props> = ({
const optionGroups = useMemo( const optionGroups = useMemo(
() => [ () => [
{ {
title: t("item_card.seasons"),
options: options:
seasons?.sort(sortByIndex).map((season: any) => { seasons?.sort(sortByIndex).map((season: any) => {
const title = const title =
@@ -125,16 +125,12 @@ export const SeasonDropdown: React.FC<Props> = ({
return ( return (
<PlatformDropdown <PlatformDropdown
groups={optionGroups} groups={optionGroups}
open={open}
onOpenChange={setOpen}
trigger={ trigger={
<TouchableOpacity onPress={() => setOpen(true)}> <View className='bg-neutral-900 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between'>
<View className='bg-neutral-900 rounded-2xl border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between'> <Text>
<Text> {t("item_card.season")} {seasonIndex}
{t("item_card.season")} {seasonIndex} </Text>
</Text> </View>
</View>
</TouchableOpacity>
} }
title={t("item_card.seasons")} title={t("item_card.seasons")}
/> />

View File

@@ -4,7 +4,7 @@ import { useQuery } from "@tanstack/react-query";
import { router } from "expo-router"; import { router } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useEffect, useMemo, useRef } from "react"; import { useEffect, useMemo, useRef } from "react";
import { TouchableOpacity, type ViewStyle } from "react-native"; import { TouchableOpacity, type ViewProps } from "react-native";
import { useDownload } from "@/providers/DownloadProvider"; import { useDownload } from "@/providers/DownloadProvider";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import ContinueWatchingPoster from "../ContinueWatchingPoster"; import ContinueWatchingPoster from "../ContinueWatchingPoster";
@@ -14,20 +14,17 @@ import {
} from "../common/HorizontalScroll"; } from "../common/HorizontalScroll";
import { ItemCardText } from "../ItemCardText"; import { ItemCardText } from "../ItemCardText";
interface Props { interface Props extends ViewProps {
item?: BaseItemDto | null; item?: BaseItemDto | null;
loading?: boolean; loading?: boolean;
isOffline?: boolean; isOffline?: boolean;
style?: ViewStyle;
containerStyle?: ViewStyle;
} }
export const SeasonEpisodesCarousel: React.FC<Props> = ({ export const SeasonEpisodesCarousel: React.FC<Props> = ({
item, item,
loading, loading,
isOffline, isOffline,
style, ...props
containerStyle,
}) => { }) => {
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom); const [user] = useAtom(userAtom);
@@ -93,8 +90,6 @@ export const SeasonEpisodesCarousel: React.FC<Props> = ({
data={episodes} data={episodes}
extraData={item} extraData={item}
loading={loading || isPending} loading={loading || isPending}
style={style}
containerStyle={containerStyle}
renderItem={(_item, _idx) => ( renderItem={(_item, _idx) => (
<TouchableOpacity <TouchableOpacity
key={_item.Id} key={_item.Id}
@@ -109,6 +104,7 @@ export const SeasonEpisodesCarousel: React.FC<Props> = ({
<ItemCardText item={_item} /> <ItemCardText item={_item} />
</TouchableOpacity> </TouchableOpacity>
)} )}
{...props}
/> />
); );
}; };

View File

@@ -86,7 +86,7 @@ export const SeasonPicker: React.FC<Props> = ({ item }) => {
seasonId: selectedSeasonId, seasonId: selectedSeasonId,
enableUserData: true, enableUserData: true,
// Note: Including trick play is necessary to enable trick play downloads // Note: Including trick play is necessary to enable trick play downloads
fields: ["MediaSources", "MediaStreams", "Overview", "Trickplay"], fields: ["Overview", "Trickplay"],
}); });
if (res.data.TotalRecordCount === 0) if (res.data.TotalRecordCount === 0)

View File

@@ -1,4 +1,3 @@
import Ionicons from "@expo/vector-icons/Ionicons";
import { useMemo } from "react"; import { useMemo } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, View, type ViewProps } from "react-native"; import { Platform, View, type ViewProps } from "react-native";
@@ -51,17 +50,12 @@ export const AppLanguageSelector: React.FC<Props> = () => {
<PlatformDropdown <PlatformDropdown
groups={optionGroups} groups={optionGroups}
trigger={ trigger={
<View className='flex flex-row items-center justify-between py-1.5 pl-3'> <View className='bg-neutral-800 rounded-lg border-neutral-900 border px-3 py-2 flex flex-row items-center justify-between'>
<Text className='mr-2'> <Text>
{APP_LANGUAGES.find( {APP_LANGUAGES.find(
(l) => l.value === settings?.preferedLanguage, (l) => l.value === settings?.preferedLanguage,
)?.label || t("home.settings.languages.system")} )?.label || t("home.settings.languages.system")}
</Text> </Text>
<Ionicons
name='chevron-expand-sharp'
size={18}
color='#5A5960'
/>
</View> </View>
} }
title={t("home.settings.languages.title")} title={t("home.settings.languages.title")}

View File

@@ -1,63 +0,0 @@
import { useRouter } from "expo-router";
import type React from "react";
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { Linking, 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";
export const AppearanceSettings: React.FC = () => {
const router = useRouter();
const { settings, updateSettings, pluginSettings } = useSettings();
const { t } = useTranslation();
const disabled = useMemo(
() =>
pluginSettings?.showCustomMenuLinks?.locked === true &&
pluginSettings?.hiddenLibraries?.locked === true,
[pluginSettings],
);
if (!settings) return null;
return (
<DisabledSetting disabled={disabled}>
<ListGroup title={t("home.settings.appearance.title")} className=''>
<ListItem
title={t("home.settings.other.show_custom_menu_links")}
disabled={pluginSettings?.showCustomMenuLinks?.locked}
onPress={() =>
Linking.openURL(
"https://jellyfin.org/docs/general/clients/web-config/#custom-menu-links",
)
}
>
<Switch
value={settings.showCustomMenuLinks}
disabled={pluginSettings?.showCustomMenuLinks?.locked}
onValueChange={(value) =>
updateSettings({ showCustomMenuLinks: value })
}
/>
</ListItem>
<ListItem title={t("home.settings.other.show_large_home_carousel")}>
<Switch
value={settings.showLargeHomeCarousel}
onValueChange={(value) =>
updateSettings({ showLargeHomeCarousel: value })
}
/>
</ListItem>
<ListItem
onPress={() =>
router.push("/settings/appearance/hide-libraries/page")
}
title={t("home.settings.other.hide_libraries")}
showArrow
/>
</ListGroup>
</DisabledSetting>
);
};

Some files were not shown because too many files have changed in this diff Show More