Compare commits

..

3 Commits

Author SHA1 Message Date
Fredrik Burmester
09189e125e fix: change to yarn 2025-02-09 13:05:18 +01:00
Fredrik Burmester
1ac10d8f34 fix: expo doctor issues 2025-02-09 13:05:07 +01:00
sarendsen
d5fe354986 wip 2025-02-08 16:29:12 +01:00
323 changed files with 16168 additions and 15877 deletions

1
.gitattributes vendored
View File

@@ -1 +0,0 @@
.modules/vlc-player/Frameworks/*.xcframework filter=lfs diff=lfs merge=lfs -text

View File

@@ -43,9 +43,6 @@ body:
label: Version label: Version
description: What version of Streamyfin are you running? description: What version of Streamyfin are you running?
options: options:
- 0.27.0
- 0.26.1
- 0.26.0
- 0.25.0 - 0.25.0
- 0.24.0 - 0.24.0
- 0.23.0 - 0.23.0

View File

@@ -1,39 +0,0 @@
name: Handle Stale Issues
on:
schedule:
- cron: "30 1 * * *" # Runs at 1:30 UTC every day
jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
# Issue specific settings
days-before-issue-stale: 90
days-before-issue-close: 7
stale-issue-label: "stale"
stale-issue-message: |
This issue has been automatically marked as stale because it has had no activity in the last 30 days.
If this issue is still relevant, please leave a comment to keep it open.
Otherwise, it will be closed in 7 days if no further activity occurs.
Thank you for your contributions!
close-issue-message: |
This issue has been automatically closed because it has been inactive for 7 days since being marked as stale.
If you believe this issue is still relevant, please feel free to reopen it and add a comment explaining the current status.
# Pull request settings (disabled)
days-before-pr-stale: -1
days-before-pr-close: -1
# Other settings
repo-token: ${{ secrets.GITHUB_TOKEN }}
operations-per-run: 100
exempt-issue-labels: "Roadmap v1,help needed,enhancement"

5
.gitignore vendored
View File

@@ -10,8 +10,6 @@ npm-debug.*
*.orig.* *.orig.*
web-build/ web-build/
modules/vlc-player/android/build modules/vlc-player/android/build
modules/vlc-player/android/.gradle
bun.lockb
# macOS # macOS
.DS_Store .DS_Store
@@ -44,6 +42,3 @@ credentials.json
.vscode/ .vscode/
.idea/ .idea/
.ruby-lsp .ruby-lsp
modules/hls-downloader/android/build
streamyfin-4fec1-firebase-adminsdk.json
.env

View File

@@ -1 +0,0 @@
lint-staged

17
.vscode/settings.json vendored
View File

@@ -1,24 +1,15 @@
{ {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"[javascript]": { "[javascript]": {
"editor.defaultFormatter": "biomejs.biome", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true "editor.formatOnSave": true
}, },
"[typescriptreact]": { "[typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true "editor.formatOnSave": true
}, },
"prettier.printWidth": 120,
"[swift]": { "[swift]": {
"editor.defaultFormatter": "sswg.swift-lang" "editor.defaultFormatter": "sswg.swift-lang"
},
"editor.formatOnSave": true,
"editor.defaultFormatter": "biomejs.biome",
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
} }
} }

View File

@@ -1,6 +0,0 @@
e2e:
maestro start-device --platform android
maestro test login.yaml
e2e-setup:
curl -fsSL "https://get.maestro.mobile.dev" | bash

View File

@@ -18,7 +18,6 @@ Welcome to Streamyfin, a simple and user-friendly Jellyfin client built with Exp
- 🔊 **Background audio**: Stream music in the background, even when locking the phone. - 🔊 **Background audio**: Stream music in the background, even when locking the phone.
- 📥 **Download media** (Experimental): Save your media locally and watch it offline. - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
- 📡 **Chromecast** (Experimental): Cast your media to any Chromecast-enabled device. - 📡 **Chromecast** (Experimental): Cast your media to any Chromecast-enabled device.
- 📡 **Settings management** (Experimental): Manage app settings for all your users with a JF plugin.
- 🤖 **Jellyseerr integration**: Request media directly in the app. - 🤖 **Jellyseerr integration**: Request media directly in the app.
## 🧪 Experimental Features ## 🧪 Experimental Features
@@ -68,7 +67,7 @@ Or download the APKs [here on GitHub](https://github.com/streamyfin/streamyfin/r
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. 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. **Note**: Everyone who is actively contributing to the source code of Streamyfin will have automatic access to the betas.
## 🚀 Getting Started ## 🚀 Getting Started
@@ -85,9 +84,9 @@ We welcome any help to make Streamyfin better. If you'd like to contribute, plea
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.
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 `nom 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`.
@@ -123,85 +122,7 @@ Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmest
## ✨ Acknowledgements ## ✨ Acknowledgements
### Core Developers I'd like to thank the following people and projects for their contributions to Streamyfin:
Thanks to the following contributors for their significant contributions:
<table>
<tr
style="
display: flex;
justify-content: space-around;
align-items: center;
flex-wrap: wrap;
"
>
<td align="center">
<a href="https://github.com/Alexk2309">
<img src="https://github.com/Alexk2309.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@Alexk2309</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/herrrta">
<img src="https://github.com/herrrta.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@herrrta</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/lostb1t">
<img src="https://github.com/lostb1t.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@lostb1t</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Simon-Eklundh">
<img src="https://github.com/Simon-Eklundh.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@Simon-Eklundh</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/topiga">
<img src="https://github.com/topiga.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@topiga</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/simoncaron">
<img src="https://github.com/simoncaron.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@simoncaron</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/jakequade">
<img src="https://github.com/jakequade.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@jakequade</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Ryan0204">
<img src="https://github.com/Ryan0204.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@Ryan0204</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/retardgerman">
<img src="https://github.com/retardgerman.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@retardgerman</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/whoopsi-daisy">
<img src="https://github.com/whoopsi-daisy.png?size=80" width="80" style="border-radius: 50%;" />
<br /><sub><b>@whoopsi-daisy</b></sub>
</a>
</td>
</tr>
</table>
And all other developers who have contributed to Streamyfin, thank you for your contributions.
I'd also like to thank the following people and projects for their contributions to Streamyfin:
- [Reiverr](https://github.com/aleksilassila/reiverr) for great help with understanding the Jellyfin API. - [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. - [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for the TypeScript SDK.

View File

@@ -1,14 +1,11 @@
module.exports = ({ config }) => { module.exports = ({ config }) => {
if (process.env.EXPO_TV !== "1") { if (process.env.EXPO_TV != "1") {
config.plugins.push([ config.plugins.push([
"react-native-google-cast", "react-native-google-cast",
{ useDefaultExpandedMediaControls: true }, { useDefaultExpandedMediaControls: true },
]); ]);
} }
return { return {
android: {
googleServicesFile: process.env.GOOGLE_SERVICES_JSON,
},
...config, ...config,
}; };
}; };

View File

@@ -2,19 +2,28 @@
"expo": { "expo": {
"name": "Streamyfin", "name": "Streamyfin",
"slug": "streamyfin", "slug": "streamyfin",
"version": "0.27.0", "version": "0.25.0",
"orientation": "default", "orientation": "default",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",
"scheme": "streamyfin", "scheme": "streamyfin",
"userInterfaceStyle": "dark", "userInterfaceStyle": "dark",
"splash": {
"image": "./assets/images/splash.png",
"resizeMode": "contain"
},
"jsEngine": "hermes", "jsEngine": "hermes",
"assetBundlePatterns": ["**/*"], "assetBundlePatterns": [
"**/*"
],
"ios": { "ios": {
"requireFullScreen": true, "requireFullScreen": true,
"infoPlist": { "infoPlist": {
"NSCameraUsageDescription": "The app needs access to your camera to scan barcodes.", "NSCameraUsageDescription": "The app needs access to your camera to scan barcodes.",
"NSMicrophoneUsageDescription": "The app needs access to your microphone.", "NSMicrophoneUsageDescription": "The app needs access to your microphone.",
"UIBackgroundModes": ["audio", "fetch"], "UIBackgroundModes": [
"audio",
"fetch"
],
"NSLocalNetworkUsageDescription": "The app needs access to your local network to connect to your Jellyfin server.", "NSLocalNetworkUsageDescription": "The app needs access to your local network to connect to your Jellyfin server.",
"NSAppTransportSecurity": { "NSAppTransportSecurity": {
"NSAllowsArbitraryLoads": true "NSAllowsArbitraryLoads": true
@@ -31,18 +40,16 @@
}, },
"android": { "android": {
"jsEngine": "hermes", "jsEngine": "hermes",
"versionCode": 53, "versionCode": 50,
"adaptiveIcon": { "adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive_icon.png", "foregroundImage": "./assets/images/adaptive_icon.png"
"backgroundColor": "#464646"
}, },
"package": "com.fredrikburmester.streamyfin", "package": "com.fredrikburmester.streamyfin",
"permissions": [ "permissions": [
"android.permission.FOREGROUND_SERVICE", "android.permission.FOREGROUND_SERVICE",
"android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK", "android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK",
"android.permission.WRITE_SETTINGS" "android.permission.WRITE_SETTINGS"
], ]
"googleServicesFile": "./google-services.json"
}, },
"plugins": [ "plugins": [
"@react-native-tvos/config-tv", "@react-native-tvos/config-tv",
@@ -70,10 +77,11 @@
"useFrameworks": "static" "useFrameworks": "static"
}, },
"android": { "android": {
"compileSdkVersion": 35, "android": {
"targetSdkVersion": 35, "compileSdkVersion": 34,
"buildToolsVersion": "35.0.0", "targetSdkVersion": 34,
"kotlinVersion": "2.0.21", "buildToolsVersion": "34.0.0"
},
"minSdkVersion": 24, "minSdkVersion": 24,
"usesCleartextTraffic": true, "usesCleartextTraffic": true,
"packagingOptions": { "packagingOptions": {
@@ -108,25 +116,17 @@
} }
} }
], ],
["react-native-bottom-tabs"],
["./plugins/withChangeNativeAndroidTextToWhite.js"],
["./plugins/withAndroidManifest.js"],
["./plugins/withTrustLocalCerts.js"],
["./plugins/withGradleProperties.js"],
[ [
"expo-splash-screen", "react-native-bottom-tabs"
{
"backgroundColor": "#2e2e2e",
"image": "./assets/images/StreamyFinFinal.png",
"imageWidth": 100
}
], ],
[ [
"expo-notifications", "./plugins/withChangeNativeAndroidTextToWhite.js"
{ ],
"icon": "./assets/images/notification.png", [
"color": "#9333EA" "./plugins/withGoogleCastActivity.js"
} ],
[
"./plugins/withTrustLocalCerts.js"
] ]
], ],
"experiments": { "experiments": {
@@ -140,7 +140,7 @@
"projectId": "e79219d1-797f-4fbe-9fa1-cfd360690a68" "projectId": "e79219d1-797f-4fbe-9fa1-cfd360690a68"
} }
}, },
"owner": "streamyfin", "owner": "fredrikburmester",
"runtimeVersion": { "runtimeVersion": {
"policy": "appVersion" "policy": "appVersion"
}, },

View File

@@ -1,13 +1,13 @@
import { Stack } from "expo-router"; import {Stack} from "expo-router";
import { useTranslation } from "react-i18next";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { useTranslation } from "react-i18next";
export default function CustomMenuLayout() { export default function CustomMenuLayout() {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<Stack> <Stack>
<Stack.Screen <Stack.Screen
name='index' name="index"
options={{ options={{
headerShown: true, headerShown: true,
headerLargeTitle: true, headerLargeTitle: true,

View File

@@ -1,13 +1,13 @@
import { Text } from "@/components/common/Text";
import { ListItem } from "@/components/list/ListItem";
import { apiAtom } from "@/providers/JellyfinProvider";
import Ionicons from "@expo/vector-icons/Ionicons";
import { useAtom } from "jotai/index";
import React, { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { FlatList, TouchableOpacity, View } from "react-native"; import { FlatList, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import React, { useCallback, useEffect, useState } from "react";
import { useAtom } from "jotai/index";
import { apiAtom } from "@/providers/JellyfinProvider";
import { ListItem } from "@/components/list/ListItem";
import Ionicons from "@expo/vector-icons/Ionicons";
import { Text } from "@/components/common/Text";
import { useTranslation } from "react-i18next";
const WebBrowser = !Platform.isTV ? require("expo-web-browser") : null; const WebBrowser = !Platform.isTV ? require("expo-web-browser") : null;
@@ -26,7 +26,7 @@ export default function menuLinks() {
const getMenuLinks = useCallback(async () => { const getMenuLinks = useCallback(async () => {
try { try {
const response = await api?.axiosInstance.get( const response = await api?.axiosInstance.get(
api?.basePath + "/web/config.json", api?.basePath + "/web/config.json"
); );
const config = response?.data; const config = response?.data;
@@ -46,7 +46,7 @@ export default function menuLinks() {
}, []); }, []);
return ( return (
<FlatList <FlatList
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{ contentContainerStyle={{
paddingTop: 10, paddingTop: 10,
paddingLeft: insets.left, paddingLeft: insets.left,
@@ -63,7 +63,7 @@ export default function menuLinks() {
> >
<ListItem <ListItem
title={item.name} title={item.name}
iconAfter={<Ionicons name='link' size={24} color='white' />} iconAfter={<Ionicons name="link" size={24} color="white" />}
/> />
</TouchableOpacity> </TouchableOpacity>
)} )}
@@ -76,10 +76,8 @@ export default function menuLinks() {
/> />
)} )}
ListEmptyComponent={ ListEmptyComponent={
<View className='flex flex-col items-center justify-center h-full'> <View className="flex flex-col items-center justify-center h-full">
<Text className='font-bold text-xl text-neutral-500'> <Text className="font-bold text-xl text-neutral-500">{t("custom_links.no_links")}</Text>
{t("custom_links.no_links")}
</Text>
</View> </View>
} }
/> />

View File

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

View File

@@ -18,7 +18,7 @@ export default function favorites() {
return ( return (
<ScrollView <ScrollView
nestedScrollEnabled nestedScrollEnabled
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
refreshControl={ refreshControl={
<RefreshControl refreshing={loading} onRefresh={refetch} /> <RefreshControl refreshing={loading} onRefresh={refetch} />
} }
@@ -28,7 +28,7 @@ export default function favorites() {
paddingBottom: 16, paddingBottom: 16,
}} }}
> >
<View className='my-4'> <View className="my-4">
<Favorites /> <Favorites />
</View> </View>
</ScrollView> </ScrollView>

View File

@@ -1,22 +1,19 @@
import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack"; import { nestedTabPageScreenOptions } from "@/components/stacks/NestedTabPageStack";
import { Feather, Ionicons } from "@expo/vector-icons"; import { Feather } from "@expo/vector-icons";
import { Stack, useRouter } from "expo-router"; import { Stack, useRouter } from "expo-router";
import { useTranslation } from "react-i18next";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
const Chromecast = Platform.isTV ? null : require("@/components/Chromecast"); import { useTranslation } from "react-i18next";
import { useSessions, type useSessionsProps } from "@/hooks/useSessions"; import { lazy } from "react";
import { userAtom } from "@/providers/JellyfinProvider"; // const Chromecast = !Platform.isTV ? require("@/components/Chromecast") : null;
import { useAtom } from "jotai"; const Chromecast = lazy(() => import("@/components/Chromecast"));
export default function IndexLayout() { export default function IndexLayout() {
const router = useRouter(); const router = useRouter();
const [user] = useAtom(userAtom);
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<Stack> <Stack>
<Stack.Screen <Stack.Screen
name='index' name="index"
options={{ options={{
headerShown: true, headerShown: true,
headerLargeTitle: true, headerLargeTitle: true,
@@ -25,15 +22,20 @@ export default function IndexLayout() {
headerLargeStyle: { headerLargeStyle: {
backgroundColor: "black", backgroundColor: "black",
}, },
headerTransparent: Platform.OS === "ios", headerTransparent: Platform.OS === "ios" ? true : false,
headerShadowVisible: false, headerShadowVisible: false,
headerRight: () => ( headerRight: () => (
<View className='flex flex-row items-center space-x-2'> <View className="flex flex-row items-center space-x-2">
{!Platform.isTV && ( {!Platform.isTV && (
<> <>
<Chromecast.Chromecast /> <Chromecast />
{user && user.Policy?.IsAdministrator && <SessionsButton />} <TouchableOpacity
<SettingsButton /> onPress={() => {
router.push("/(auth)/settings");
}}
>
<Feather name="settings" color={"white"} size={22} />
</TouchableOpacity>
</> </>
)} )}
</View> </View>
@@ -41,61 +43,55 @@ export default function IndexLayout() {
}} }}
/> />
<Stack.Screen <Stack.Screen
name='downloads/index' name="downloads/index"
options={{ options={{
title: t("home.downloads.downloads_title"), title: t("home.downloads.downloads_title"),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='downloads/[seriesId]' name="downloads/[seriesId]"
options={{ options={{
title: t("home.downloads.tvseries"), title: t("home.downloads.tvseries"),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='sessions/index' name="settings"
options={{
title: t("home.sessions.title"),
}}
/>
<Stack.Screen
name='settings'
options={{ options={{
title: t("home.settings.settings_title"), title: t("home.settings.settings_title"),
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/optimized-server/page' name="settings/optimized-server/page"
options={{ options={{
title: "", title: "",
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/marlin-search/page' name="settings/marlin-search/page"
options={{ options={{
title: "", title: "",
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/jellyseerr/page' name="settings/jellyseerr/page"
options={{ options={{
title: "", title: "",
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/hide-libraries/page' name="settings/hide-libraries/page"
options={{ options={{
title: "", title: "",
}} }}
/> />
<Stack.Screen <Stack.Screen
name='settings/logs/page' name="settings/logs/page"
options={{ options={{
title: "", title: "",
}} }}
/> />
<Stack.Screen <Stack.Screen
name='intro/page' name="intro/page"
options={{ options={{
headerShown: false, headerShown: false,
title: "", title: "",
@@ -106,50 +102,15 @@ export default function IndexLayout() {
<Stack.Screen key={name} name={name} options={options} /> <Stack.Screen key={name} name={name} options={options} />
))} ))}
<Stack.Screen <Stack.Screen
name='collections/[collectionId]' name="collections/[collectionId]"
options={{ options={{
title: "", title: "",
headerShown: true, headerShown: true,
headerBlurEffect: "prominent", headerBlurEffect: "prominent",
headerTransparent: Platform.OS === "ios", headerTransparent: Platform.OS === "ios" ? true : false,
headerShadowVisible: false, headerShadowVisible: false,
}} }}
/> />
</Stack> </Stack>
); );
} }
const SettingsButton = () => {
const router = useRouter();
return (
<TouchableOpacity
onPress={() => {
router.push("/(auth)/settings");
}}
>
<Feather name='settings' color={"white"} size={22} />
</TouchableOpacity>
);
};
const SessionsButton = () => {
const router = useRouter();
const { sessions = [] } = useSessions({} as useSessionsProps);
return (
<TouchableOpacity
onPress={() => {
router.push("/(auth)/sessions");
}}
>
<View className='mr-4'>
<Ionicons
name='play-circle'
color={sessions.length === 0 ? "white" : "#9333ea"}
size={25}
/>
</View>
</TouchableOpacity>
);
};

View File

@@ -1,16 +1,16 @@
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { EpisodeCard } from "@/components/downloads/EpisodeCard";
import {
SeasonDropdown,
type SeasonIndexState,
} from "@/components/series/SeasonDropdown";
import { useDownload } from "@/providers/DownloadProvider"; import { useDownload } from "@/providers/DownloadProvider";
import { storage } from "@/utils/mmkv";
import { Ionicons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { router, useLocalSearchParams, useNavigation } from "expo-router"; import { router, useLocalSearchParams, useNavigation } from "expo-router";
import React, { useCallback, useEffect, useMemo, useState } from "react"; import React, { useCallback, useEffect, useMemo, useState } from "react";
import { Alert, ScrollView, TouchableOpacity, View } from "react-native"; import { ScrollView, TouchableOpacity, View, Alert } from "react-native";
import { EpisodeCard } from "@/components/downloads/EpisodeCard";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import {
SeasonDropdown,
SeasonIndexState,
} from "@/components/series/SeasonDropdown";
import { storage } from "@/utils/mmkv";
import { Ionicons } from "@expo/vector-icons";
export default function page() { export default function page() {
const navigation = useNavigation(); const navigation = useNavigation();
@@ -21,7 +21,7 @@ export default function page() {
}; };
const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>( const [seasonIndexState, setSeasonIndexState] = useState<SeasonIndexState>(
{}, {}
); );
const { downloadedFiles, deleteItems } = useDownload(); const { downloadedFiles, deleteItems } = useDownload();
@@ -31,7 +31,7 @@ export default function page() {
downloadedFiles downloadedFiles
?.filter((f) => f.item.SeriesId == seriesId) ?.filter((f) => f.item.SeriesId == seriesId)
?.sort( ?.sort(
(a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!, (a, b) => a?.item.ParentIndexNumber! - b.item.ParentIndexNumber!
) || [] ) || []
); );
} catch { } catch {
@@ -64,7 +64,7 @@ export default function page() {
() => () =>
Object.values(groupBySeason)?.[0]?.ParentIndexNumber ?? Object.values(groupBySeason)?.[0]?.ParentIndexNumber ??
series?.[0]?.item?.ParentIndexNumber, series?.[0]?.item?.ParentIndexNumber,
[groupBySeason], [groupBySeason]
); );
useEffect(() => { useEffect(() => {
@@ -92,14 +92,14 @@ export default function page() {
onPress: () => deleteItems(groupBySeason), onPress: () => deleteItems(groupBySeason),
style: "destructive", style: "destructive",
}, },
], ]
); );
}, [groupBySeason]); }, [groupBySeason]);
return ( return (
<View className='flex-1'> <View className="flex-1">
{series.length > 0 && ( {series.length > 0 && (
<View className='flex flex-row items-center justify-start my-2 px-4'> <View className="flex flex-row items-center justify-start my-2 px-4">
<SeasonDropdown <SeasonDropdown
item={series[0].item} item={series[0].item}
seasons={series.map((s) => s.item)} seasons={series.map((s) => s.item)}
@@ -112,17 +112,17 @@ export default function page() {
})); }));
}} }}
/> />
<View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center ml-2'> <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> <Text className="text-xs font-bold">{groupBySeason.length}</Text>
</View> </View>
<View className='bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto'> <View className="bg-neutral-800/80 rounded-full h-9 w-9 flex items-center justify-center ml-auto">
<TouchableOpacity onPress={deleteSeries}> <TouchableOpacity onPress={deleteSeries}>
<Ionicons name='trash' size={20} color='white' /> <Ionicons name="trash" size={20} color="white" />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
)} )}
<ScrollView key={seasonIndex} className='px-4'> <ScrollView key={seasonIndex} className="px-4">
{groupBySeason.map((episode, index) => ( {groupBySeason.map((episode, index) => (
<EpisodeCard key={index} item={episode} /> <EpisodeCard key={index} item={episode} />
))} ))}

View File

@@ -1,28 +1,28 @@
import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { ActiveDownloads } from "@/components/downloads/ActiveDownloads"; import { ActiveDownloads } from "@/components/downloads/ActiveDownloads";
import { DownloadSize } from "@/components/downloads/DownloadSize";
import { MovieCard } from "@/components/downloads/MovieCard"; import { MovieCard } from "@/components/downloads/MovieCard";
import { SeriesCard } from "@/components/downloads/SeriesCard"; import { SeriesCard } from "@/components/downloads/SeriesCard";
import { type DownloadedItem, useDownload } from "@/providers/DownloadProvider"; import { DownloadedItem, useDownload } from "@/providers/DownloadProvider";
import { queueAtom } from "@/utils/atoms/queue"; import { queueAtom } from "@/utils/atoms/queue";
import { DownloadMethod, useSettings } from "@/utils/atoms/settings"; import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
import { writeToLog } from "@/utils/log";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { useNavigation, useRouter } from "expo-router";
import { useAtom } from "jotai";
import React, { useEffect, useMemo, useRef } from "react";
import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
import { Button } from "@/components/Button";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useTranslation } from "react-i18next";
import { t } from 'i18next';
import { DownloadSize } from "@/components/downloads/DownloadSize";
import { import {
BottomSheetBackdrop, BottomSheetBackdrop,
type BottomSheetBackdropProps, BottomSheetBackdropProps,
BottomSheetModal, BottomSheetModal,
BottomSheetView, BottomSheetView,
} from "@gorhom/bottom-sheet"; } from "@gorhom/bottom-sheet";
import { useNavigation, useRouter } from "expo-router";
import { t } from "i18next";
import { useAtom } from "jotai";
import React, { useEffect, useMemo, useRef } from "react";
import { useTranslation } from "react-i18next";
import { Alert, ScrollView, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import { writeToLog } from "@/utils/log";
export default function page() { export default function page() {
const navigation = useNavigation(); const navigation = useNavigation();
@@ -45,7 +45,7 @@ export default function page() {
const groupedBySeries = useMemo(() => { const groupedBySeries = useMemo(() => {
try { try {
const episodes = downloadedFiles?.filter( const episodes = downloadedFiles?.filter(
(f) => f.item.Type === "Episode", (f) => f.item.Type === "Episode"
); );
const series: { [key: string]: DownloadedItem[] } = {}; const series: { [key: string]: DownloadedItem[] } = {};
episodes?.forEach((e) => { episodes?.forEach((e) => {
@@ -73,22 +73,14 @@ export default function page() {
const deleteMovies = () => const deleteMovies = () =>
deleteFileByType("Movie") deleteFileByType("Movie")
.then(() => .then(() => toast.success(t("home.downloads.toasts.deleted_all_movies_successfully")))
toast.success(
t("home.downloads.toasts.deleted_all_movies_successfully"),
),
)
.catch((reason) => { .catch((reason) => {
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(t("home.downloads.toasts.deleted_all_tvseries_successfully")))
toast.success(
t("home.downloads.toasts.deleted_all_tvseries_successfully"),
),
)
.catch((reason) => { .catch((reason) => {
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"));
@@ -105,28 +97,26 @@ export default function page() {
paddingBottom: 100, paddingBottom: 100,
}} }}
> >
<View className='py-4'> <View className="py-4">
<View className='mb-4 flex flex-col space-y-4 px-4'> <View className="mb-4 flex flex-col space-y-4 px-4">
{settings?.downloadMethod === DownloadMethod.Remux && ( {settings?.downloadMethod === DownloadMethod.Remux && (
<View className='bg-neutral-900 p-4 rounded-2xl'> <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")}</Text>
{t("home.downloads.queue")} <Text className="text-xs opacity-70 text-red-600">
</Text>
<Text className='text-xs opacity-70 text-red-600'>
{t("home.downloads.queue_hint")} {t("home.downloads.queue_hint")}
</Text> </Text>
<View className='flex flex-col space-y-2 mt-2'> <View className="flex flex-col space-y-2 mt-2">
{queue.map((q, index) => ( {queue.map((q, index) => (
<TouchableOpacity <TouchableOpacity
onPress={() => onPress={() =>
router.push(`/(auth)/items/page?id=${q.item.Id}`) router.push(`/(auth)/items/page?id=${q.item.Id}`)
} }
className='relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between' className="relative bg-neutral-900 border border-neutral-800 p-4 rounded-2xl overflow-hidden flex flex-row items-center justify-between"
key={index} key={index}
> >
<View> <View>
<Text className='font-semibold'>{q.item.Name}</Text> <Text className="font-semibold">{q.item.Name}</Text>
<Text className='text-xs opacity-50'> <Text className="text-xs opacity-50">
{q.item.Type} {q.item.Type}
</Text> </Text>
</View> </View>
@@ -139,16 +129,14 @@ export default function page() {
}); });
}} }}
> >
<Ionicons name='close' size={24} color='red' /> <Ionicons name="close" size={24} color="red" />
</TouchableOpacity> </TouchableOpacity>
</TouchableOpacity> </TouchableOpacity>
))} ))}
</View> </View>
{queue.length === 0 && ( {queue.length === 0 && (
<Text className='opacity-50'> <Text className="opacity-50">{t("home.downloads.no_items_in_queue")}</Text>
{t("home.downloads.no_items_in_queue")}
</Text>
)} )}
</View> </View>
)} )}
@@ -157,19 +145,17 @@ export default function page() {
</View> </View>
{movies.length > 0 && ( {movies.length > 0 && (
<View className='mb-4'> <View className="mb-4">
<View className='flex flex-row items-center justify-between mb-2 px-4'> <View className="flex flex-row items-center justify-between mb-2 px-4">
<Text className='text-lg font-bold'> <Text className="text-lg font-bold">{t("home.downloads.movies")}</Text>
{t("home.downloads.movies")} <View className="bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center">
</Text> <Text className="text-xs font-bold">{movies?.length}</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>
</View> </View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}> <ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'> <View className="px-4 flex flex-row">
{movies?.map((item) => ( {movies?.map((item) => (
<View className='mb-2 last:mb-0' key={item.item.Id}> <View className="mb-2 last:mb-0" key={item.item.Id}>
<MovieCard item={item.item} /> <MovieCard item={item.item} />
</View> </View>
))} ))}
@@ -178,22 +164,20 @@ export default function page() {
</View> </View>
)} )}
{groupedBySeries.length > 0 && ( {groupedBySeries.length > 0 && (
<View className='mb-4'> <View className="mb-4">
<View className='flex flex-row items-center justify-between mb-2 px-4'> <View className="flex flex-row items-center justify-between mb-2 px-4">
<Text className='text-lg font-bold'> <Text className="text-lg font-bold">{t("home.downloads.tvseries")}</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'>
<Text className='text-xs font-bold'>
{groupedBySeries?.length} {groupedBySeries?.length}
</Text> </Text>
</View> </View>
</View> </View>
<ScrollView horizontal showsHorizontalScrollIndicator={false}> <ScrollView horizontal showsHorizontalScrollIndicator={false}>
<View className='px-4 flex flex-row'> <View className="px-4 flex flex-row">
{groupedBySeries?.map((items) => ( {groupedBySeries?.map((items) => (
<View <View
className='mb-2 last:mb-0' className="mb-2 last:mb-0"
key={items[0].item.SeriesId} key={items[0].item.SeriesId}
> >
<SeriesCard <SeriesCard
@@ -207,10 +191,8 @@ export default function page() {
</View> </View>
)} )}
{downloadedFiles?.length === 0 && ( {downloadedFiles?.length === 0 && (
<View className='flex px-4'> <View className="flex px-4">
<Text className='opacity-50'> <Text className="opacity-50">{t("home.downloads.no_downloaded_items")}</Text>
{t("home.downloads.no_downloaded_items")}
</Text>
</View> </View>
)} )}
</View> </View>
@@ -233,14 +215,14 @@ export default function page() {
)} )}
> >
<BottomSheetView> <BottomSheetView>
<View className='p-4 space-y-4 mb-4'> <View className="p-4 space-y-4 mb-4">
<Button color='purple' onPress={deleteMovies}> <Button color="purple" onPress={deleteMovies}>
{t("home.downloads.delete_all_movies_button")} {t("home.downloads.delete_all_movies_button")}
</Button> </Button>
<Button color='purple' onPress={deleteShows}> <Button color="purple" onPress={deleteShows}>
{t("home.downloads.delete_all_tvseries_button")} {t("home.downloads.delete_all_tvseries_button")}
</Button> </Button>
<Button color='red' onPress={deleteAllMedia}> <Button color="red" onPress={deleteAllMedia}>
{t("home.downloads.delete_all_button")} {t("home.downloads.delete_all_button")}
</Button> </Button>
</View> </View>
@@ -266,6 +248,6 @@ function migration_20241124() {
style: "destructive", style: "destructive",
onPress: async () => await deleteAllFiles(), onPress: async () => await deleteAllFiles(),
}, },
], ]
); );
} }

View File

@@ -1,5 +1,498 @@
import { HomeIndex } from "@/components/settings/HomeIndex"; import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text";
import { LargeMovieCarousel } from "@/components/home/LargeMovieCarousel";
import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
import { Loader } from "@/components/Loader";
import { MediaListSection } from "@/components/medialists/MediaListSection";
import { Colors } from "@/constants/Colors";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useDownload } from "@/providers/DownloadProvider";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings";
import { Feather, Ionicons } from "@expo/vector-icons";
import { Api } from "@jellyfin/sdk";
import {
BaseItemDto,
BaseItemKind,
} from "@jellyfin/sdk/lib/generated-client/models";
import {
getItemsApi,
getSuggestionsApi,
getTvShowsApi,
getUserLibraryApi,
getUserViewsApi,
} from "@jellyfin/sdk/lib/utils/api";
import NetInfo from "@react-native-community/netinfo";
import { QueryFunction, useQuery } from "@tanstack/react-query";
import { useNavigation, useRouter } from "expo-router";
import { useAtomValue } from "jotai";
import { useCallback, useEffect, useMemo, useState } from "react";
import { Platform } from "react-native";
import { useTranslation } from "react-i18next";
import {
ActivityIndicator,
RefreshControl,
ScrollView,
TouchableOpacity,
View,
} from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import {
useSplashScreenLoading,
useSplashScreenVisible,
} from "@/providers/SplashScreenProvider";
export default function page() { type ScrollingCollectionListSection = {
return <HomeIndex />; type: "ScrollingCollectionList";
title?: string;
queryKey: (string | undefined | null)[];
queryFn: QueryFunction<BaseItemDto[]>;
orientation?: "horizontal" | "vertical";
};
type MediaListSection = {
type: "MediaListSection";
queryKey: (string | undefined)[];
queryFn: QueryFunction<BaseItemDto>;
};
type Section = ScrollingCollectionListSection | MediaListSection;
export default function index() {
const router = useRouter();
const { t } = useTranslation();
const api = useAtomValue(apiAtom);
const user = useAtomValue(userAtom);
const [loading, setLoading] = useState(false);
const [
settings,
updateSettings,
pluginSettings,
setPluginSettings,
refreshStreamyfinPluginSettings,
] = useSettings();
const [isConnected, setIsConnected] = useState<boolean | null>(null);
const [loadingRetry, setLoadingRetry] = useState(false);
const navigation = useNavigation();
const insets = useSafeAreaInsets();
if (!Platform.isTV) {
const { downloadedFiles, cleanCacheDirectory } = useDownload();
useEffect(() => {
const hasDownloads = downloadedFiles && downloadedFiles.length > 0;
navigation.setOptions({
headerLeft: () => (
<TouchableOpacity
onPress={() => {
router.push("/(auth)/downloads");
}}
className="p-2"
>
<Feather
name="download"
color={hasDownloads ? Colors.primary : "white"}
size={22}
/>
</TouchableOpacity>
),
});
}, [downloadedFiles, navigation, router]);
useEffect(() => {
cleanCacheDirectory().catch((e) =>
console.error("Something went wrong cleaning cache directory")
);
}, []);
}
const checkConnection = useCallback(async () => {
setLoadingRetry(true);
const state = await NetInfo.fetch();
setIsConnected(state.isConnected);
setLoadingRetry(false);
}, []);
useEffect(() => {
const unsubscribe = NetInfo.addEventListener((state) => {
if (state.isConnected == false || state.isInternetReachable === false)
setIsConnected(false);
else setIsConnected(true);
});
NetInfo.fetch().then((state) => {
setIsConnected(state.isConnected);
});
// cleanCacheDirectory().catch((e) =>
// console.error("Something went wrong cleaning cache directory")
// );
return () => {
unsubscribe();
};
}, []);
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,
});
// show splash screen until query loaded
useSplashScreenLoading(l1);
const splashScreenVisible = useSplashScreenVisible();
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 invalidateCache = useInvalidatePlaybackProgressCache();
const refetch = useCallback(async () => {
setLoading(true);
await refreshStreamyfinPluginSettings();
await invalidateCache();
setLoading(false);
}, []);
const createCollectionConfig = useCallback(
(
title: string,
queryKey: string[],
includeItemTypes: BaseItemKind[],
parentId: string | undefined
): ScrollingCollectionListSection => ({
title,
queryKey,
queryFn: async () => {
if (!api) return [];
return (
(
await getUserLibraryApi(api).getLatestMedia({
userId: user?.Id,
limit: 20,
fields: ["PrimaryImageAspectRatio", "Path"],
imageTypeLimit: 1,
enableImageTypes: ["Primary", "Backdrop", "Thumb"],
includeItemTypes,
parentId,
})
).data || []
);
},
type: "ScrollingCollectionList",
}),
[api, user?.Id]
);
let sections: Section[] = [];
if (!settings?.home || !settings?.home?.sections) {
sections = useMemo(() => {
if (!api || !user?.Id) return [];
const latestMediaViews = collections.map((c) => {
const includeItemTypes: BaseItemKind[] =
c.CollectionType === "tvshows" ? ["Series"] : ["Movie"];
const title = t("home.recently_added_in", { libraryName: c.Name });
const queryKey = [
"home",
"recentlyAddedIn" + c.CollectionType,
user?.Id!,
c.Id!,
];
return createCollectionConfig(
title || "",
queryKey,
includeItemTypes,
c.Id
);
});
const ss: Section[] = [
{
title: t("home.continue_watching"),
queryKey: ["home", "resumeItems"],
queryFn: async () =>
(
await getItemsApi(api).getResumeItems({
userId: user.Id,
enableImageTypes: ["Primary", "Backdrop", "Thumb"],
includeItemTypes: ["Movie", "Series", "Episode"],
})
).data.Items || [],
type: "ScrollingCollectionList",
orientation: "horizontal",
},
{
title: t("home.next_up"),
queryKey: ["home", "nextUp-all"],
queryFn: async () =>
(
await getTvShowsApi(api).getNextUp({
userId: user?.Id,
fields: ["MediaSourceCount"],
limit: 20,
enableImageTypes: ["Primary", "Backdrop", "Thumb"],
enableResumable: false,
})
).data.Items || [],
type: "ScrollingCollectionList",
orientation: "horizontal",
},
...latestMediaViews,
// ...(mediaListCollections?.map(
// (ml) =>
// ({
// title: ml.Name,
// queryKey: ["home", "mediaList", ml.Id!],
// queryFn: async () => ml,
// type: "MediaListSection",
// orientation: "vertical",
// } as Section)
// ) || []),
{
title: t("home.suggested_movies"),
queryKey: ["home", "suggestedMovies", user?.Id],
queryFn: async () =>
(
await getSuggestionsApi(api).getSuggestions({
userId: user?.Id,
limit: 10,
mediaType: ["Video"],
type: ["Movie"],
})
).data.Items || [],
type: "ScrollingCollectionList",
orientation: "vertical",
},
{
title: t("home.suggested_episodes"),
queryKey: ["home", "suggestedEpisodes", user?.Id],
queryFn: async () => {
try {
const suggestions = await getSuggestions(api, user.Id);
const nextUpPromises = suggestions.map((series) =>
getNextUp(api, user.Id, series.Id)
);
const nextUpResults = await Promise.all(nextUpPromises);
return nextUpResults.filter((item) => item !== null) || [];
} catch (error) {
console.error("Error fetching data:", error);
return [];
}
},
type: "ScrollingCollectionList",
orientation: "horizontal",
},
];
return ss;
}, [api, user?.Id, collections]);
} else {
sections = useMemo(() => {
if (!api || !user?.Id) return [];
const ss: Section[] = [];
for (const key in settings.home?.sections) {
// @ts-expect-error
const section = settings.home?.sections[key];
const id = section.title || key;
ss.push({
title: id,
queryKey: ["home", id],
queryFn: async () => {
if (section.items) {
const response = await getItemsApi(api).getItems({
userId: user?.Id,
limit: section.items?.limit || 25,
recursive: true,
includeItemTypes: section.items?.includeItemTypes,
sortBy: section.items?.sortBy,
sortOrder: section.items?.sortOrder,
filters: section.items?.filters,
parentId: section.items?.parentId,
});
return response.data.Items || [];
} else if (section.nextUp) {
const response = await getTvShowsApi(api).getNextUp({
userId: user?.Id,
fields: ["MediaSourceCount"],
limit: section.items?.limit || 25,
enableImageTypes: ["Primary", "Backdrop", "Thumb"],
enableResumable: section.items?.enableResumable || false,
enableRewatching: section.items?.enableRewatching || false,
});
return response.data.Items || [];
}
return [];
},
type: "ScrollingCollectionList",
orientation: section?.orientation || "vertical",
});
}
return ss;
}, [api, user?.Id, settings.home?.sections]);
}
if (isConnected === false) {
return (
<View className="flex flex-col items-center justify-center h-full -mt-6 px-8">
<Text className="text-3xl font-bold mb-2">{t("home.no_internet")}</Text>
<Text className="text-center opacity-70">
{t("home.no_internet_message")}
</Text>
<View className="mt-4">
<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={() => {
checkConnection();
}}
justify="center"
className="mt-2"
iconRight={
loadingRetry ? null : (
<Ionicons name="refresh" size={20} color="white" />
)
}
>
{loadingRetry ? (
<ActivityIndicator size={"small"} color={"white"} />
) : (
"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>
);
// this spinner should only show up, when user navigates here
// on launch the splash screen is used for loading
if (l1 && !splashScreenVisible)
return (
<View className="justify-center items-center h-full">
<Loader />
</View>
);
return (
<ScrollView
nestedScrollEnabled
contentInsetAdjustmentBehavior="automatic"
refreshControl={
<RefreshControl refreshing={loading} onRefresh={refetch} />
}
contentContainerStyle={{
paddingLeft: insets.left,
paddingRight: insets.right,
paddingBottom: 16,
}}
>
<View className="flex flex-col space-y-4">
<LargeMovieCarousel />
{sections.map((section, index) => {
if (section.type === "ScrollingCollectionList") {
return (
<ScrollingCollectionList
key={index}
title={section.title}
queryKey={section.queryKey}
queryFn={section.queryFn}
orientation={section.orientation}
hideIfEmpty
/>
);
} else if (section.type === "MediaListSection") {
return (
<MediaListSection
key={index}
queryKey={section.queryKey}
queryFn={section.queryFn}
/>
);
}
return null;
})}
</View>
</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

@@ -15,26 +15,26 @@ export default function page() {
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
storage.set("hasShownIntro", true); storage.set("hasShownIntro", true);
}, []), }, [])
); );
return ( return (
<View className='bg-neutral-900 h-full py-16 px-4 space-y-8'> <View className="bg-neutral-900 h-full py-16 px-4 space-y-8">
<View> <View>
<Text className='text-3xl font-bold text-center mb-2'> <Text className="text-3xl font-bold text-center mb-2">
{t("home.intro.welcome_to_streamyfin")} {t("home.intro.welcome_to_streamyfin")}
</Text> </Text>
<Text className='text-center'> <Text className="text-center">
{t("home.intro.a_free_and_open_source_client_for_jellyfin")} {t("home.intro.a_free_and_open_source_client_for_jellyfin")}
</Text> </Text>
</View> </View>
<View> <View>
<Text className='text-lg font-bold'> <Text className="text-lg font-bold">
{t("home.intro.features_title")} {t("home.intro.features_title")}
</Text> </Text>
<Text className='text-xs'>{t("home.intro.features_description")}</Text> <Text className="text-xs">{t("home.intro.features_description")}</Text>
<View className='flex flex-row items-center mt-4'> <View className="flex flex-row items-center mt-4">
<Image <Image
source={require("@/assets/icons/jellyseerr-logo.svg")} source={require("@/assets/icons/jellyseerr-logo.svg")}
style={{ style={{
@@ -42,70 +42,70 @@ export default function page() {
height: 50, height: 50,
}} }}
/> />
<View className='shrink ml-2'> <View className="shrink ml-2">
<Text className='font-bold mb-1'>Jellyseerr</Text> <Text className="font-bold mb-1">Jellyseerr</Text>
<Text className='shrink text-xs'> <Text className="shrink text-xs">
{t("home.intro.jellyseerr_feature_description")} {t("home.intro.jellyseerr_feature_description")}
</Text> </Text>
</View> </View>
</View> </View>
<View className='flex flex-row items-center mt-4'> <View className="flex flex-row items-center mt-4">
<View <View
style={{ style={{
width: 50, width: 50,
height: 50, height: 50,
}} }}
className='flex items-center justify-center' className="flex items-center justify-center"
> >
<Ionicons name='cloud-download-outline' size={32} color='white' /> <Ionicons name="cloud-download-outline" size={32} color="white" />
</View> </View>
<View className='shrink ml-2'> <View className="shrink ml-2">
<Text className='font-bold mb-1'> <Text className="font-bold mb-1">
{t("home.intro.downloads_feature_title")} {t("home.intro.downloads_feature_title")}
</Text> </Text>
<Text className='shrink text-xs'> <Text className="shrink text-xs">
{t("home.intro.downloads_feature_description")} {t("home.intro.downloads_feature_description")}
</Text> </Text>
</View> </View>
</View> </View>
<View className='flex flex-row items-center mt-4'> <View className="flex flex-row items-center mt-4">
<View <View
style={{ style={{
width: 50, width: 50,
height: 50, height: 50,
}} }}
className='flex items-center justify-center' className="flex items-center justify-center"
> >
<Feather name='cast' size={28} color={"white"} /> <Feather name="cast" size={28} color={"white"} />
</View> </View>
<View className='shrink ml-2'> <View className="shrink ml-2">
<Text className='font-bold mb-1'>Chromecast</Text> <Text className="font-bold mb-1">Chromecast</Text>
<Text className='shrink text-xs'> <Text className="shrink text-xs">
{t("home.intro.chromecast_feature_description")} {t("home.intro.chromecast_feature_description")}
</Text> </Text>
</View> </View>
</View> </View>
<View className='flex flex-row items-center mt-4'> <View className="flex flex-row items-center mt-4">
<View <View
style={{ style={{
width: 50, width: 50,
height: 50, height: 50,
}} }}
className='flex items-center justify-center' className="flex items-center justify-center"
> >
<Feather name='settings' size={28} color={"white"} /> <Feather name="settings" size={28} color={"white"} />
</View> </View>
<View className='shrink ml-2'> <View className="shrink ml-2">
<Text className='font-bold mb-1'> <Text className="font-bold mb-1">
{t("home.intro.centralised_settings_plugin_title")} {t("home.intro.centralised_settings_plugin_title")}
</Text> </Text>
<Text className='shrink text-xs'> <Text className="shrink text-xs">
{t("home.intro.centralised_settings_plugin_description")}{" "} {t("home.intro.centralised_settings_plugin_description")}{" "}
<Text <Text
className='text-purple-600' className="text-purple-600"
onPress={() => { onPress={() => {
Linking.openURL( Linking.openURL(
"https://github.com/streamyfin/jellyfin-plugin-streamyfin", "https://github.com/streamyfin/jellyfin-plugin-streamyfin"
); );
}} }}
> >
@@ -120,7 +120,7 @@ export default function page() {
onPress={() => { onPress={() => {
router.back(); router.back();
}} }}
className='mt-4' className="mt-4"
> >
{t("home.intro.done_button")} {t("home.intro.done_button")}
</Button> </Button>
@@ -129,9 +129,9 @@ export default function page() {
router.back(); router.back();
router.push("/settings"); router.push("/settings");
}} }}
className='mt-4' className="mt-4"
> >
<Text className='text-purple-600 text-center'> <Text className="text-purple-600 text-center">
{t("home.intro.go_to_settings_button")} {t("home.intro.go_to_settings_button")}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>

View File

@@ -1,384 +0,0 @@
import { Badge } from "@/components/Badge";
import { Loader } from "@/components/Loader";
import { Text } from "@/components/common/Text";
import Poster from "@/components/posters/Poster";
import { useInterval } from "@/hooks/useInterval";
import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
import { apiAtom } from "@/providers/JellyfinProvider";
import { formatBitrate } from "@/utils/bitrate";
import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
import { formatTimeString } from "@/utils/time";
import {
AntDesign,
Entypo,
Ionicons,
MaterialCommunityIcons,
} from "@expo/vector-icons";
import {
HardwareAccelerationType,
type SessionInfoDto,
} from "@jellyfin/sdk/lib/generated-client";
import { FlashList } from "@shopify/flash-list";
import { useQuery } from "@tanstack/react-query";
import { useAtomValue } from "jotai";
import React, { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { View } from "react-native";
export default function page() {
const { sessions, isLoading } = useSessions({} as useSessionsProps);
const { t } = useTranslation();
if (isLoading)
return (
<View className='justify-center items-center h-full'>
<Loader />
</View>
);
if (!sessions || sessions.length == 0)
return (
<View className='h-full w-full flex justify-center items-center'>
<Text className='text-lg text-neutral-500'>
{t("home.sessions.no_active_sessions")}
</Text>
</View>
);
return (
<FlashList
contentInsetAdjustmentBehavior='automatic'
contentContainerStyle={{
paddingTop: 17,
paddingHorizontal: 17,
paddingBottom: 150,
}}
data={sessions}
renderItem={({ item }) => <SessionCard session={item} />}
keyExtractor={(item) => item.Id || ""}
estimatedItemSize={200}
/>
);
}
interface SessionCardProps {
session: SessionInfoDto;
}
const SessionCard = ({ session }: SessionCardProps) => {
const api = useAtomValue(apiAtom);
const [remainingTicks, setRemainingTicks] = useState<number>(0);
const tick = () => {
if (session.PlayState?.IsPaused) return;
setRemainingTicks(remainingTicks - 10000000);
};
const getProgressPercentage = () => {
if (!session.NowPlayingItem || !session.NowPlayingItem.RunTimeTicks) {
return 0;
}
return Math.round(
(100 / session.NowPlayingItem?.RunTimeTicks) *
(session.NowPlayingItem?.RunTimeTicks - remainingTicks),
);
};
useEffect(() => {
const currentTime = session.PlayState?.PositionTicks;
const duration = session.NowPlayingItem?.RunTimeTicks;
if (
duration !== null &&
duration !== undefined &&
currentTime !== null &&
currentTime !== undefined
) {
const remainingTimeTicks = duration - currentTime;
setRemainingTicks(remainingTimeTicks);
}
}, [session]);
const { data: ipInfo } = useQuery({
queryKey: ["ipinfo", session.RemoteEndPoint],
cacheTime: Number.POSITIVE_INFINITY,
queryFn: async () => {
const resp = await api.axiosInstance.get(
`https://freeipapi.com/api/json/${session.RemoteEndPoint}`,
);
return resp.data;
},
});
useInterval(tick, 1000);
return (
<View className='flex flex-col shadow-md bg-neutral-900 rounded-2xl mb-4'>
<View className='flex flex-row p-4'>
<View className='w-20 pr-4'>
<Poster
id={session.NowPlayingItem?.Id}
url={getPrimaryImageUrl({ api, item: session.NowPlayingItem })}
/>
</View>
<View className='w-full flex-1'>
<View className='flex flex-row justify-between'>
<View className='flex-1 pr-4'>
{session.NowPlayingItem?.Type === "Episode" ? (
<>
<Text className='font-bold'>
{session.NowPlayingItem?.Name}
</Text>
<Text numberOfLines={1} className='text-xs opacity-50'>
{`S${session.NowPlayingItem.ParentIndexNumber?.toString()}:E${session.NowPlayingItem.IndexNumber?.toString()}`}
{" - "}
{session.NowPlayingItem.SeriesName}
</Text>
</>
) : (
<>
<Text className='font-bold'>
{session.NowPlayingItem?.Name}
</Text>
<Text className='text-xs opacity-50'>
{session.NowPlayingItem?.ProductionYear}
</Text>
<Text className='text-xs opacity-50'>
{session.NowPlayingItem?.SeriesName}
</Text>
</>
)}
</View>
<Text className='text-xs opacity-50 align-right text-right'>
{session.UserName}
{"\n"}
{session.Client}
{"\n"}
{session.DeviceName}
{"\n"}
{ipInfo?.cityName} {ipInfo?.countryCode}
</Text>
</View>
<View className='flex-1' />
<View className='flex flex-col align-bottom'>
<View className='flex flex-row justify-between align-bottom mb-1'>
<Text className='-ml-0.5 text-xs opacity-50 align-left text-left'>
{!session.PlayState?.IsPaused ? (
<Ionicons name='play' size={14} color='white' />
) : (
<Ionicons name='pause' size={14} color='white' />
)}
</Text>
<Text className='text-xs opacity-50 align-right text-right'>
{formatTimeString(remainingTicks, "tick")} left
</Text>
</View>
<View className='align-bottom bg-gray-800 h-1'>
<View
className={`bg-purple-600 h-full`}
style={{
width: `${getProgressPercentage()}%`,
}}
/>
</View>
</View>
</View>
</View>
<TranscodingView session={session} />
</View>
);
};
interface TranscodingBadgesProps {
properties: StreamProps;
}
const TranscodingBadges = ({ properties }: TranscodingBadgesProps) => {
const iconMap = {
bitrate: <Ionicons name='speedometer-outline' size={12} color='white' />,
codec: <Ionicons name='layers-outline' size={12} color='white' />,
videoRange: (
<Ionicons name='color-palette-outline' size={12} color='white' />
),
resolution: <Ionicons name='film-outline' size={12} color='white' />,
language: <Ionicons name='language-outline' size={12} color='white' />,
audioChannels: <Ionicons name='mic-outline' size={12} color='white' />,
hwType: <Ionicons name='hardware-chip-outline' size={12} color='white' />,
} as const;
const icon = (val: string) => {
return (
iconMap[val as keyof typeof iconMap] ?? (
<Ionicons name='layers-outline' size={12} color='white' />
)
);
};
const formatVal = (key: string, val: any) => {
switch (key) {
case "bitrate":
return formatBitrate(val);
case "hwType":
return val === HardwareAccelerationType.None ? "sw" : "hw";
default:
return val;
}
};
return Object.entries(properties)
.filter(([_, value]) => value !== undefined && value !== null)
.map(([key]) => (
<Badge
key={key}
variant='gray'
className='m-0 p-0 pt-0.5 mr-1'
text={formatVal(key, properties[key as keyof StreamProps])}
iconLeft={icon(key)}
/>
));
};
interface StreamProps {
hwType?: HardwareAccelerationType | null | undefined;
resolution?: string | null | undefined;
language?: string | null | undefined;
codec?: string | null | undefined;
bitrate?: number | null | undefined;
videoRange?: string | null | undefined;
audioChannels?: string | null | undefined;
}
interface TranscodingStreamViewProps {
title: string | undefined;
value?: string;
isTranscoding: boolean;
transcodeValue?: string | undefined | null;
properties: StreamProps;
transcodeProperties?: StreamProps;
}
const TranscodingStreamView = ({
title,
isTranscoding,
properties,
transcodeProperties,
value,
transcodeValue,
}: TranscodingStreamViewProps) => {
return (
<View className='flex flex-col pt-2 first:pt-0'>
<View className='flex flex-row'>
<Text className='text-xs opacity-50 w-20 font-bold text-right pr-4'>
{title}
</Text>
<Text className='flex-1'>
<TranscodingBadges properties={properties} />
</Text>
</View>
{isTranscoding && transcodeProperties ? (
<>
<View className='flex flex-row'>
<Text className='-mt-0 text-xs opacity-50 w-20 font-bold text-right pr-4'>
<MaterialCommunityIcons
name='arrow-right-bottom'
size={14}
color='white'
/>
</Text>
<Text className='flex-1 text-sm mt-1'>
<TranscodingBadges properties={transcodeProperties} />
</Text>
</View>
</>
) : null}
</View>
);
};
const TranscodingView = ({ session }: SessionCardProps) => {
const videoStream = useMemo(() => {
return session.NowPlayingItem?.MediaStreams?.filter(
(s) => s.Type == "Video",
)[0];
}, [session]);
const audioStream = useMemo(() => {
const index = session.PlayState?.AudioStreamIndex;
return index !== null && index !== undefined
? session.NowPlayingItem?.MediaStreams?.[index]
: undefined;
}, [session.PlayState?.AudioStreamIndex]);
const subtitleStream = useMemo(() => {
const index = session.PlayState?.SubtitleStreamIndex;
return index !== null && index !== undefined
? session.NowPlayingItem?.MediaStreams?.[index]
: undefined;
}, [session.PlayState?.SubtitleStreamIndex]);
const isTranscoding = useMemo(() => {
return (
session.PlayState?.PlayMethod == "Transcode" && session.TranscodingInfo
);
}, [session.PlayState?.PlayMethod, session.TranscodingInfo]);
const videoStreamTitle = () => {
return videoStream?.DisplayTitle?.split(" ")[0];
};
return (
<View className='flex flex-col bg-neutral-800 rounded-b-2xl p-4 pt-2'>
<TranscodingStreamView
title='Video'
properties={{
resolution: videoStreamTitle(),
bitrate: videoStream?.BitRate,
codec: videoStream?.Codec,
}}
transcodeProperties={{
hwType: session.TranscodingInfo?.HardwareAccelerationType,
bitrate: session.TranscodingInfo?.Bitrate,
codec: session.TranscodingInfo?.VideoCodec,
}}
isTranscoding={
isTranscoding && !session.TranscodingInfo?.IsVideoDirect
? true
: false
}
/>
<TranscodingStreamView
title='Audio'
properties={{
language: audioStream?.Language,
bitrate: audioStream?.BitRate,
codec: audioStream?.Codec,
audioChannels: audioStream?.ChannelLayout,
}}
transcodeProperties={{
codec: session.TranscodingInfo?.AudioCodec,
audioChannels: session.TranscodingInfo?.AudioChannels?.toString(),
}}
isTranscoding={
isTranscoding && !session.TranscodingInfo?.IsVideoDirect
? true
: false
}
/>
{subtitleStream && (
<>
<TranscodingStreamView
title='Subtitle'
isTranscoding={false}
properties={{
language: subtitleStream?.Language,
codec: subtitleStream?.Codec,
}}
transcodeValue={null}
/>
</>
)}
</View>
);
};

View File

@@ -1,10 +1,8 @@
import { Platform } from "react-native";
import { Text } from "@/components/common/Text"; 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 { AudioToggles } from "@/components/settings/AudioToggles"; import { AudioToggles } from "@/components/settings/AudioToggles";
import { ChromecastSettings } from "@/components/settings/ChromecastSettings";
import DownloadSettings from "@/components/settings/DownloadSettings";
import { MediaProvider } from "@/components/settings/MediaContext"; import { MediaProvider } from "@/components/settings/MediaContext";
import { MediaToggles } from "@/components/settings/MediaToggles"; import { MediaToggles } from "@/components/settings/MediaToggles";
import { OtherSettings } from "@/components/settings/OtherSettings"; import { OtherSettings } from "@/components/settings/OtherSettings";
@@ -12,23 +10,24 @@ 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 { SubtitleToggles } from "@/components/settings/SubtitleToggles";
import { AppLanguageSelector } from "@/components/settings/AppLanguageSelector";
import { UserInfo } from "@/components/settings/UserInfo"; import { UserInfo } from "@/components/settings/UserInfo";
import { useHaptic } from "@/hooks/useHaptic";
import { useJellyfin } from "@/providers/JellyfinProvider"; import { useJellyfin } from "@/providers/JellyfinProvider";
import { userAtom } from "@/providers/JellyfinProvider";
import { clearLogs } from "@/utils/log"; import { clearLogs } from "@/utils/log";
import { storage } from "@/utils/mmkv"; import { useHaptic } from "@/hooks/useHaptic";
import { useNavigation, useRouter } from "expo-router"; import { useNavigation, useRouter } from "expo-router";
import { t } from "i18next"; import { t } from "i18next";
import { useAtom } from "jotai"; import React, { lazy, useEffect } from "react";
import React, { useEffect } from "react"; import { ScrollView, TouchableOpacity, View } from "react-native";
import { ScrollView, Switch, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { storage } from "@/utils/mmkv";
const DownloadSettings = lazy(
() => import("@/components/settings/DownloadSettings")
);
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 { logout } = useJellyfin(); const { logout } = useJellyfin();
const successHapticFeedback = useHaptic("success"); const successHapticFeedback = useHaptic("success");
@@ -46,7 +45,7 @@ export default function settings() {
logout(); logout();
}} }}
> >
<Text className='text-red-600'> <Text className="text-red-600">
{t("home.settings.log_out_button")} {t("home.settings.log_out_button")}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
@@ -61,27 +60,24 @@ export default function settings() {
paddingRight: insets.right, paddingRight: insets.right,
}} }}
> >
<View className='p-4 flex flex-col gap-y-4'> <View className="p-4 flex flex-col gap-y-4">
<UserInfo /> <UserInfo />
<QuickConnect className="mb-4" />
<QuickConnect className='mb-4' />
<MediaProvider> <MediaProvider>
<MediaToggles className='mb-4' /> <MediaToggles className="mb-4" />
<AudioToggles className='mb-4' /> <AudioToggles className="mb-4" />
<SubtitleToggles className='mb-4' /> <SubtitleToggles className="mb-4" />
</MediaProvider> </MediaProvider>
<OtherSettings /> <OtherSettings />
<DownloadSettings /> {!Platform.isTV && <DownloadSettings />}
<PluginSettings /> <PluginSettings />
<AppLanguageSelector /> <AppLanguageSelector />
<ChromecastSettings />
<ListGroup title={"Intro"}> <ListGroup title={"Intro"}>
<ListItem <ListItem
onPress={() => { onPress={() => {
@@ -90,7 +86,7 @@ export default function settings() {
title={t("home.settings.intro.show_intro")} title={t("home.settings.intro.show_intro")}
/> />
<ListItem <ListItem
textColor='red' textColor="red"
onPress={() => { onPress={() => {
storage.set("hasShownIntro", false); storage.set("hasShownIntro", false);
}} }}
@@ -98,7 +94,7 @@ export default function settings() {
/> />
</ListGroup> </ListGroup>
<View className='mb-4'> <View className="mb-4">
<ListGroup title={t("home.settings.logs.logs_title")}> <ListGroup title={t("home.settings.logs.logs_title")}>
<ListItem <ListItem
onPress={() => router.push("/settings/logs/page")} onPress={() => router.push("/settings/logs/page")}
@@ -106,7 +102,7 @@ export default function settings() {
title={t("home.settings.logs.logs_title")} title={t("home.settings.logs.logs_title")}
/> />
<ListItem <ListItem
textColor='red' textColor="red"
onPress={onClearLogsClicked} onPress={onClearLogsClicked}
title={t("home.settings.logs.delete_all_logs")} title={t("home.settings.logs.delete_all_logs")}
/> />

View File

@@ -1,15 +1,15 @@
import { Loader } from "@/components/Loader";
import { Text } from "@/components/common/Text"; 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 DisabledSetting from "@/components/settings/DisabledSetting"; import { Loader } from "@/components/Loader";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api"; import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import { useTranslation } from "react-i18next";
import { Switch, View } from "react-native"; import { Switch, View } from "react-native";
import { useTranslation } from "react-i18next";
import DisabledSetting from "@/components/settings/DisabledSetting";
export default function page() { export default function page() {
const [settings, updateSettings, pluginSettings] = useSettings(); const [settings, updateSettings, pluginSettings] = useSettings();
@@ -18,7 +18,7 @@ export default function page() {
const { t } = useTranslation(); const { t } = useTranslation();
const { data, isLoading } = useQuery({ const { data, isLoading: isLoading } = useQuery({
queryKey: ["user-views", user?.Id], queryKey: ["user-views", user?.Id],
queryFn: async () => { queryFn: async () => {
const response = await getUserViewsApi(api!).getUserViews({ const response = await getUserViewsApi(api!).getUserViews({
@@ -33,7 +33,7 @@ export default function page() {
if (isLoading) if (isLoading)
return ( return (
<View className='mt-4'> <View className="mt-4">
<Loader /> <Loader />
</View> </View>
); );
@@ -41,7 +41,7 @@ export default function page() {
return ( return (
<DisabledSetting <DisabledSetting
disabled={pluginSettings?.hiddenLibraries?.locked === true} disabled={pluginSettings?.hiddenLibraries?.locked === true}
className='px-4' className="px-4"
> >
<ListGroup> <ListGroup>
{data?.map((view) => ( {data?.map((view) => (
@@ -59,8 +59,8 @@ export default function page() {
</ListItem> </ListItem>
))} ))}
</ListGroup> </ListGroup>
<Text className='px-4 text-xs text-neutral-500 mt-1'> <Text className="px-4 text-xs text-neutral-500 mt-1">
{t("home.settings.other.select_liraries_you_want_to_hide")} {t("home.settings.other.select_liraries_you_want_to_hide")}
</Text> </Text>
</DisabledSetting> </DisabledSetting>
); );

View File

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

View File

@@ -1,17 +1,17 @@
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { useLog } from "@/utils/log"; import { useLog } from "@/utils/log";
import { useTranslation } from "react-i18next";
import { ScrollView, View } from "react-native"; import { ScrollView, View } from "react-native";
import { useTranslation } from "react-i18next";
export default function page() { export default function page() {
const { logs } = useLog(); const { logs } = useLog();
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<ScrollView className='p-4'> <ScrollView className="p-4">
<View className='flex flex-col space-y-2'> <View className="flex flex-col space-y-2">
{logs?.map((log, index) => ( {logs?.map((log, index) => (
<View key={index} className='bg-neutral-900 rounded-xl p-3'> <View key={index} className="bg-neutral-900 rounded-xl p-3">
<Text <Text
className={` className={`
mb-1 mb-1
@@ -21,15 +21,13 @@ export default function page() {
> >
{log.level} {log.level}
</Text> </Text>
<Text uiTextView selectable className='text-xs'> <Text uiTextView selectable className="text-xs">
{log.message} {log.message}
</Text> </Text>
</View> </View>
))} ))}
{logs?.length === 0 && ( {logs?.length === 0 && (
<Text className='opacity-50'> <Text className="opacity-50">{t("home.settings.logs.no_logs_available")}</Text>
{t("home.settings.logs.no_logs_available")}
</Text>
)} )}
</View> </View>
</ScrollView> </ScrollView>

View File

@@ -6,8 +6,7 @@ import { useQueryClient } from "@tanstack/react-query";
import { useNavigation } from "expo-router"; import { useNavigation } from "expo-router";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import DisabledSetting from "@/components/settings/DisabledSetting"; import React, {useEffect, useMemo, useState} from "react";
import React, { useEffect, useMemo, useState } from "react";
import { import {
Linking, Linking,
Switch, Switch,
@@ -16,6 +15,7 @@ import {
View, View,
} from "react-native"; } from "react-native";
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import DisabledSetting from "@/components/settings/DisabledSetting";
export default function page() { export default function page() {
const navigation = useNavigation(); const navigation = useNavigation();
@@ -39,10 +39,7 @@ export default function page() {
}; };
const disabled = useMemo(() => { const disabled = useMemo(() => {
return ( return pluginSettings?.searchEngine?.locked === true && pluginSettings?.marlinServerUrl?.locked === true
pluginSettings?.searchEngine?.locked === true &&
pluginSettings?.marlinServerUrl?.locked === true
);
}, [pluginSettings]); }, [pluginSettings]);
useEffect(() => { useEffect(() => {
@@ -50,9 +47,7 @@ export default function page() {
navigation.setOptions({ navigation.setOptions({
headerRight: () => ( headerRight: () => (
<TouchableOpacity onPress={() => onSave(value)}> <TouchableOpacity onPress={() => onSave(value)}>
<Text className='text-blue-500'> <Text className="text-blue-500">{t("home.settings.plugins.marlin_search.save_button")}</Text>
{t("home.settings.plugins.marlin_search.save_button")}
</Text>
</TouchableOpacity> </TouchableOpacity>
), ),
}); });
@@ -62,16 +57,17 @@ export default function page() {
if (!settings) return null; if (!settings) return null;
return ( return (
<DisabledSetting disabled={disabled} className='px-4'> <DisabledSetting
disabled={disabled}
className="px-4"
>
<ListGroup> <ListGroup>
<DisabledSetting <DisabledSetting
disabled={pluginSettings?.searchEngine?.locked === true} disabled={pluginSettings?.searchEngine?.locked === true}
showText={!pluginSettings?.marlinServerUrl?.locked} showText={!pluginSettings?.marlinServerUrl?.locked}
> >
<ListItem <ListItem
title={t( title={t("home.settings.plugins.marlin_search.enable_marlin_search")}
"home.settings.plugins.marlin_search.enable_marlin_search",
)}
onPress={() => { onPress={() => {
updateSettings({ searchEngine: "Jellyfin" }); updateSettings({ searchEngine: "Jellyfin" });
queryClient.invalidateQueries({ queryKey: ["search"] }); queryClient.invalidateQueries({ queryKey: ["search"] });
@@ -91,30 +87,28 @@ export default function page() {
<DisabledSetting <DisabledSetting
disabled={pluginSettings?.marlinServerUrl?.locked === true} disabled={pluginSettings?.marlinServerUrl?.locked === true}
showText={!pluginSettings?.searchEngine?.locked} showText={!pluginSettings?.searchEngine?.locked}
className='mt-2 flex flex-col rounded-xl overflow-hidden pl-4 bg-neutral-900 px-4' 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`}> <View
<Text className='mr-4'> className={`flex flex-row items-center bg-neutral-900 h-11 pr-4`}
{t("home.settings.plugins.marlin_search.url")} >
</Text> <Text className="mr-4">{t("home.settings.plugins.marlin_search.url")}</Text>
<TextInput <TextInput
editable={settings.searchEngine === "Marlin"} editable={settings.searchEngine === "Marlin"}
className='text-white' className="text-white"
placeholder={t( placeholder={t("home.settings.plugins.marlin_search.server_url_placeholder")}
"home.settings.plugins.marlin_search.server_url_placeholder",
)}
value={value} value={value}
keyboardType='url' keyboardType="url"
returnKeyType='done' returnKeyType="done"
autoCapitalize='none' autoCapitalize="none"
textContentType='URL' textContentType="URL"
onChangeText={(text) => setValue(text)} onChangeText={(text) => setValue(text)}
/> />
</View> </View>
</DisabledSetting> </DisabledSetting>
<Text className='px-4 text-xs text-neutral-500 mt-1'> <Text className="px-4 text-xs text-neutral-500 mt-1">
{t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "} {t("home.settings.plugins.marlin_search.marlin_search_hint")}{" "}
<Text className='text-blue-500' onPress={handleOpenLink}> <Text className="text-blue-500" onPress={handleOpenLink}>
{t("home.settings.plugins.marlin_search.read_more_about_marlin")} {t("home.settings.plugins.marlin_search.read_more_about_marlin")}
</Text> </Text>
</Text> </Text>

View File

@@ -1,5 +1,4 @@
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import DisabledSetting from "@/components/settings/DisabledSetting";
import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm"; import { OptimizedServerForm } from "@/components/settings/OptimizedServerForm";
import { apiAtom } from "@/providers/JellyfinProvider"; import { apiAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
@@ -9,9 +8,10 @@ import { useMutation } from "@tanstack/react-query";
import { useNavigation } from "expo-router"; import { useNavigation } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { ActivityIndicator, TouchableOpacity, View } from "react-native"; import { ActivityIndicator, TouchableOpacity, View } from "react-native";
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import { useTranslation } from "react-i18next";
import DisabledSetting from "@/components/settings/DisabledSetting";
export default function page() { export default function page() {
const navigation = useNavigation(); const navigation = useNavigation();
@@ -38,7 +38,7 @@ export default function page() {
}); });
return await getStatistics({ return await getStatistics({
url: updatedUrl, url: settings?.optimizedVersionsServerUrl,
authHeader: api?.accessToken, authHeader: api?.accessToken,
deviceId: getOrSetDeviceId(), deviceId: getOrSetDeviceId(),
}); });
@@ -67,12 +67,8 @@ export default function page() {
saveMutation.isPending ? ( saveMutation.isPending ? (
<ActivityIndicator size={"small"} color={"white"} /> <ActivityIndicator size={"small"} color={"white"} />
) : ( ) : (
<TouchableOpacity <TouchableOpacity onPress={() => onSave(optimizedVersionsServerUrl)}>
onPress={() => onSave(optimizedVersionsServerUrl)} <Text className="text-blue-500">{t("home.settings.downloads.save_button")}</Text>
>
<Text className='text-blue-500'>
{t("home.settings.downloads.save_button")}
</Text>
</TouchableOpacity> </TouchableOpacity>
), ),
}); });
@@ -82,7 +78,7 @@ export default function page() {
return ( return (
<DisabledSetting <DisabledSetting
disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true} disabled={pluginSettings?.optimizedVersionsServerUrl?.locked === true}
className='p-4' className="p-4"
> >
<OptimizedServerForm <OptimizedServerForm
value={optimizedVersionsServerUrl} value={optimizedVersionsServerUrl}

View File

@@ -10,15 +10,15 @@ import MoviePoster from "@/components/posters/MoviePoster";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl"; import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData"; import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
import type { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models"; import { BaseItemDtoQueryResult } from "@jellyfin/sdk/lib/generated-client/models";
import { getItemsApi } from "@jellyfin/sdk/lib/utils/api"; import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import { useCallback, useMemo } from "react"; import { useCallback, useMemo } from "react";
import { useTranslation } from "react-i18next";
import { View } from "react-native"; import { View } from "react-native";
import { useTranslation } from "react-i18next";
const page: React.FC = () => { const page: React.FC = () => {
const local = useLocalSearchParams(); const local = useLocalSearchParams();
@@ -68,7 +68,7 @@ const page: React.FC = () => {
return response.data; return response.data;
}, },
[api, user?.Id, actorId], [api, user?.Id, actorId]
); );
const backdropUrl = useMemo( const backdropUrl = useMemo(
@@ -79,12 +79,12 @@ const page: React.FC = () => {
quality: 90, quality: 90,
width: 1000, width: 1000,
}), }),
[item], [item]
); );
if (l1) if (l1)
return ( return (
<View className='justify-center items-center h-full'> <View className="justify-center items-center h-full">
<Loader /> <Loader />
</View> </View>
); );
@@ -105,13 +105,13 @@ const page: React.FC = () => {
/> />
} }
> >
<View className='flex flex-col space-y-4 my-4'> <View className="flex flex-col space-y-4 my-4">
<View className='px-4 mb-4'> <View className="px-4 mb-4">
<MoviesTitleHeader item={item} className='mb-4' /> <MoviesTitleHeader item={item} className="mb-4" />
<OverviewText text={item.Overview} /> <OverviewText text={item.Overview} />
</View> </View>
<Text className='px-4 text-2xl font-bold mb-2 text-neutral-100'> <Text className="px-4 text-2xl font-bold mb-2 text-neutral-100">
{t("item_card.appeared_in")} {t("item_card.appeared_in")}
</Text> </Text>
<InfiniteHorizontalScroll <InfiniteHorizontalScroll
@@ -133,7 +133,7 @@ const page: React.FC = () => {
queryFn={fetchItems} queryFn={fetchItems}
queryKey={["actor", "movies", actorId]} queryKey={["actor", "movies", actorId]}
/> />
<View className='h-12'></View> <View className="h-12"></View>
</View> </View>
</ParallaxScrollView> </ParallaxScrollView>
); );

View File

@@ -1,23 +1,22 @@
import { ItemCardText } from "@/components/ItemCardText";
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";
import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton"; import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
import { ItemCardText } from "@/components/ItemCardText";
import { ItemPoster } from "@/components/posters/ItemPoster"; import { ItemPoster } from "@/components/posters/ItemPoster";
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { import {
SortByOption,
SortOrderOption,
genreFilterAtom, genreFilterAtom,
sortByAtom, sortByAtom,
SortByOption,
sortOptions, sortOptions,
sortOrderAtom, sortOrderAtom,
SortOrderOption,
sortOrderOptions, sortOrderOptions,
tagsFilterAtom, tagsFilterAtom,
yearFilterAtom, yearFilterAtom,
} from "@/utils/atoms/filters"; } from "@/utils/atoms/filters";
import type { import {
BaseItemDto, BaseItemDto,
BaseItemDtoQueryResult, BaseItemDtoQueryResult,
ItemSortBy, ItemSortBy,
@@ -30,11 +29,11 @@ import {
import { FlashList } from "@shopify/flash-list"; import { FlashList } from "@shopify/flash-list";
import { useInfiniteQuery, useQuery } from "@tanstack/react-query"; import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { useLocalSearchParams, useNavigation } from "expo-router"; import { useLocalSearchParams, useNavigation } from "expo-router";
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import React, { useCallback, useEffect, useMemo, useState } from "react";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { FlatList, View } from "react-native"; import { FlatList, View } from "react-native";
import { useTranslation } from "react-i18next";
const page: React.FC = () => { const page: React.FC = () => {
const searchParams = useLocalSearchParams(); const searchParams = useLocalSearchParams();
@@ -44,7 +43,7 @@ const page: React.FC = () => {
const [user] = useAtom(userAtom); const [user] = useAtom(userAtom);
const navigation = useNavigation(); const navigation = useNavigation();
const [orientation, setOrientation] = useState( const [orientation, setOrientation] = useState(
ScreenOrientation.Orientation.PORTRAIT_UP, ScreenOrientation.Orientation.PORTRAIT_UP
); );
const { t } = useTranslation(); const { t } = useTranslation();
@@ -112,7 +111,7 @@ const page: React.FC = () => {
recursive: true, recursive: true,
genres: selectedGenres, genres: selectedGenres,
tags: selectedTags, tags: selectedTags,
years: selectedYears.map((year) => Number.parseInt(year)), years: selectedYears.map((year) => parseInt(year)),
includeItemTypes: ["Movie", "Series"], includeItemTypes: ["Movie", "Series"],
}); });
@@ -127,7 +126,7 @@ const page: React.FC = () => {
selectedTags, selectedTags,
sortBy, sortBy,
sortOrder, sortOrder,
], ]
); );
const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({ const { data, isFetching, fetchNextPage, hasNextPage } = useInfiniteQuery({
@@ -152,7 +151,7 @@ const page: React.FC = () => {
const totalItems = lastPage.TotalRecordCount; const totalItems = lastPage.TotalRecordCount;
const accumulatedItems = pages.reduce( const accumulatedItems = pages.reduce(
(acc, curr) => acc + (curr?.Items?.length || 0), (acc, curr) => acc + (curr?.Items?.length || 0),
0, 0
); );
if (accumulatedItems < totalItems) { if (accumulatedItems < totalItems) {
@@ -189,8 +188,8 @@ const page: React.FC = () => {
index % 3 === 0 index % 3 === 0
? "flex-end" ? "flex-end"
: (index + 1) % 3 === 0 : (index + 1) % 3 === 0
? "flex-start" ? "flex-start"
: "center", : "center",
width: "89%", width: "89%",
}} }}
> >
@@ -200,14 +199,14 @@ const page: React.FC = () => {
</View> </View>
</TouchableItemRouter> </TouchableItemRouter>
), ),
[orientation], [orientation]
); );
const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []); const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
const ListHeaderComponent = useCallback( const ListHeaderComponent = useCallback(
() => ( () => (
<View className=''> <View className="">
<FlatList <FlatList
horizontal horizontal
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
@@ -233,13 +232,13 @@ const page: React.FC = () => {
key: "genre", key: "genre",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={collectionId} collectionId={collectionId}
queryKey='genreFilter' queryKey="genreFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: collectionId, parentId: collectionId,
@@ -260,13 +259,13 @@ const page: React.FC = () => {
key: "year", key: "year",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={collectionId} collectionId={collectionId}
queryKey='yearFilter' queryKey="yearFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: collectionId, parentId: collectionId,
@@ -285,13 +284,13 @@ const page: React.FC = () => {
key: "tags", key: "tags",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={collectionId} collectionId={collectionId}
queryKey='tagsFilter' queryKey="tagsFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: collectionId, parentId: collectionId,
@@ -312,9 +311,9 @@ const page: React.FC = () => {
key: "sortBy", key: "sortBy",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={collectionId} collectionId={collectionId}
queryKey='sortBy' queryKey="sortBy"
queryFn={async () => sortOptions.map((s) => s.key)} queryFn={async () => sortOptions.map((s) => s.key)}
set={setSortBy} set={setSortBy}
values={sortBy} values={sortBy}
@@ -332,9 +331,9 @@ const page: React.FC = () => {
key: "sortOrder", key: "sortOrder",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={collectionId} collectionId={collectionId}
queryKey='sortOrder' queryKey="sortOrder"
queryFn={async () => sortOrderOptions.map((s) => s.key)} queryFn={async () => sortOrderOptions.map((s) => s.key)}
set={setSortOrder} set={setSortOrder}
values={sortOrder} values={sortOrder}
@@ -369,7 +368,7 @@ const page: React.FC = () => {
sortOrder, sortOrder,
setSortOrder, setSortOrder,
isFetching, isFetching,
], ]
); );
if (!collection) return null; if (!collection) return null;
@@ -377,10 +376,8 @@ const page: React.FC = () => {
return ( return (
<FlashList <FlashList
ListEmptyComponent={ ListEmptyComponent={
<View className='flex flex-col items-center justify-center h-full'> <View className="flex flex-col items-center justify-center h-full">
<Text className='font-bold text-xl text-neutral-500'> <Text className="font-bold text-xl text-neutral-500">{t("search.no_results")}</Text>
{t("search.no_results")}
</Text>
</View> </View>
} }
extraData={[ extraData={[
@@ -390,7 +387,7 @@ const page: React.FC = () => {
sortBy, sortBy,
sortOrder, sortOrder,
]} ]}
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
data={flatData} data={flatData}
renderItem={renderItem} renderItem={renderItem}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}

View File

@@ -1,13 +1,11 @@
import { ItemContent } from "@/components/ItemContent";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { ItemContent } from "@/components/ItemContent";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api"; import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { View } from "react-native"; import { View } from "react-native";
import Animated, { import Animated, {
runOnJS, runOnJS,
@@ -15,6 +13,7 @@ import Animated, {
useSharedValue, useSharedValue,
withTiming, withTiming,
} from "react-native-reanimated"; } from "react-native-reanimated";
import { useTranslation } from "react-i18next";
const Page: React.FC = () => { const Page: React.FC = () => {
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
@@ -76,36 +75,36 @@ const Page: React.FC = () => {
if (isError) if (isError)
return ( return (
<View className='flex flex-col items-center justify-center h-screen w-screen'> <View className="flex flex-col items-center justify-center h-screen w-screen">
<Text>{t("item_card.could_not_load_item")}</Text> <Text>{t("item_card.could_not_load_item")}</Text>
</View> </View>
); );
return ( return (
<View className='flex flex-1 relative'> <View className="flex flex-1 relative">
<Animated.View <Animated.View
pointerEvents={"none"} pointerEvents={"none"}
style={[animatedStyle]} style={[animatedStyle]}
className='absolute top-0 left-0 flex flex-col items-start h-screen w-screen px-4 z-50 bg-black' className="absolute top-0 left-0 flex flex-col items-start h-screen w-screen px-4 z-50 bg-black"
> >
<View <View
style={{ style={{
height: item?.Type === "Episode" ? 300 : 450, height: item?.Type === "Episode" ? 300 : 450,
}} }}
className='bg-transparent rounded-lg mb-4 w-full' className="bg-transparent rounded-lg mb-4 w-full"
></View> ></View>
<View className='h-6 bg-neutral-900 rounded mb-4 w-14'></View> <View className="h-6 bg-neutral-900 rounded mb-4 w-14"></View>
<View className='h-10 bg-neutral-900 rounded-lg mb-2 w-1/2'></View> <View className="h-10 bg-neutral-900 rounded-lg mb-2 w-1/2"></View>
<View className='h-3 bg-neutral-900 rounded mb-3 w-8'></View> <View className="h-3 bg-neutral-900 rounded mb-3 w-8"></View>
<View className='flex flex-row space-x-1 mb-8'> <View className="flex flex-row space-x-1 mb-8">
<View className='h-6 bg-neutral-900 rounded mb-3 w-14'></View> <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
<View className='h-6 bg-neutral-900 rounded mb-3 w-14'></View> <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
<View className='h-6 bg-neutral-900 rounded mb-3 w-14'></View> <View className="h-6 bg-neutral-900 rounded mb-3 w-14"></View>
</View> </View>
<View className='h-3 bg-neutral-900 rounded w-2/3 mb-1'></View> <View className="h-3 bg-neutral-900 rounded w-2/3 mb-1"></View>
<View className='h-10 bg-neutral-900 rounded-lg w-full mb-2'></View> <View className="h-10 bg-neutral-900 rounded-lg w-full mb-2"></View>
<View className='h-12 bg-neutral-900 rounded-lg w-full mb-2'></View> <View className="h-12 bg-neutral-900 rounded-lg w-full mb-2"></View>
<View className='h-24 bg-neutral-900 rounded-lg mb-1 w-full'></View> <View className="h-24 bg-neutral-900 rounded-lg mb-1 w-full"></View>
</Animated.View> </Animated.View>
{item && <ItemContent item={item} />} {item && <ItemContent item={item} />}
</View> </View>

View File

@@ -1,43 +1,45 @@
import {router, useLocalSearchParams, useSegments,} from "expo-router";
import React, {useMemo,} from "react";
import {TouchableOpacity} from "react-native";
import {useInfiniteQuery} from "@tanstack/react-query";
import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
import {Text} from "@/components/common/Text";
import {Image} from "expo-image";
import Poster from "@/components/posters/Poster";
import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow"; import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
import {COMPANY_LOGO_IMAGE_FILTER} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
import {uniqBy} from "lodash";
import JellyseerrPoster from "@/components/posters/JellyseerrPoster"; import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr";
import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
import {
type MovieResult,
Results,
type TvResult,
} from "@/utils/jellyseerr/server/models/Search";
import { COMPANY_LOGO_IMAGE_FILTER } from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
import { useInfiniteQuery } from "@tanstack/react-query";
import { Image } from "expo-image";
import { useLocalSearchParams } from "expo-router";
import { uniqBy } from "lodash";
import React, { useMemo } from "react";
export default function page() { export default function page() {
const local = useLocalSearchParams(); const local = useLocalSearchParams();
const { jellyseerrApi } = useJellyseerr(); const {jellyseerrApi} = useJellyseerr();
const { companyId, name, image, type } = local as unknown as { const {companyId, name, image, type} = local as unknown as {
companyId: string; companyId: string,
name: string; name: string,
image: string; image: string,
type: DiscoverSliderType; type: DiscoverSliderType
}; };
const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({ const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
queryKey: ["jellyseerr", "company", type, companyId], queryKey: ["jellyseerr", "company", type, companyId],
queryFn: async ({ pageParam }) => { queryFn: async ({pageParam}) => {
const params: any = { let params: any = {
page: Number(pageParam), page: Number(pageParam),
}; };
return jellyseerrApi?.discover( return jellyseerrApi?.discover(
(type == DiscoverSliderType.NETWORKS (
? Endpoints.DISCOVER_TV_NETWORK type == DiscoverSliderType.NETWORKS
: Endpoints.DISCOVER_MOVIES_STUDIO) + `/${companyId}`, ? Endpoints.DISCOVER_TV_NETWORK
params, : Endpoints.DISCOVER_MOVIES_STUDIO
); ) + `/${companyId}`,
params
)
}, },
enabled: !!jellyseerrApi && !!companyId, enabled: !!jellyseerrApi && !!companyId,
initialPageParam: 1, initialPageParam: 1,
@@ -48,58 +50,46 @@ export default function page() {
}); });
const flatData = useMemo( const flatData = useMemo(
() => () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
uniqBy( [data]
data?.pages
?.filter((p) => p?.results.length)
.flatMap((p) => p?.results ?? []),
"id",
) ?? [],
[data],
); );
const backdrops = useMemo( const backdrops = useMemo(
() => () => jellyseerrApi
jellyseerrApi ? flatData.map((r) => jellyseerrApi.imageProxy((r as TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
? flatData.map((r) => : [],
jellyseerrApi.imageProxy( [jellyseerrApi, flatData]
(r as TvResult | MovieResult).backdropPath,
"w1920_and_h800_multi_faces",
),
)
: [],
[jellyseerrApi, flatData],
); );
return ( return (
<ParallaxSlideShow <ParallaxSlideShow
data={flatData} data={flatData}
images={backdrops} images={backdrops}
listHeader='' listHeader=""
keyExtractor={(item) => item.id.toString()} keyExtractor={(item) => item.id.toString()}
onEndReached={() => { onEndReached={() => {
if (hasNextPage) { if (hasNextPage) {
fetchNextPage(); fetchNextPage()
} }
}} }}
logo={ logo={
<Image <Image
id={companyId} id={companyId}
key={companyId} key={companyId}
className='bottom-1 w-1/2' className="bottom-1 w-1/2"
source={{ source={{
uri: jellyseerrApi?.imageProxy(image, COMPANY_LOGO_IMAGE_FILTER), uri: jellyseerrApi?.imageProxy(image, COMPANY_LOGO_IMAGE_FILTER),
}} }}
cachePolicy={"memory-disk"} cachePolicy={"memory-disk"}
contentFit='contain' contentFit="contain"
style={{ style={{
aspectRatio: "4/3", aspectRatio: "4/3",
}} }}
/> />
} }
renderItem={(item, index) => ( renderItem={(item, index) =>
<JellyseerrPoster item={item as MovieResult | TvResult} /> <JellyseerrPoster item={item as MovieResult | TvResult} />
)} }
/> />
); );
} }

View File

@@ -1,46 +1,42 @@
import { Text } from "@/components/common/Text"; import {router, useLocalSearchParams, useSegments,} from "expo-router";
import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon"; import React, {useMemo,} from "react";
import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow"; import {TouchableOpacity} from "react-native";
import { textShadowStyle } from "@/components/jellyseerr/discover/GenericSlideCard"; import {useInfiniteQuery} from "@tanstack/react-query";
import JellyseerrPoster from "@/components/posters/JellyseerrPoster"; import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
import {Text} from "@/components/common/Text";
import Poster from "@/components/posters/Poster"; import Poster from "@/components/posters/Poster";
import { Endpoints, useJellyseerr } from "@/hooks/useJellyseerr"; import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover"; import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
import { import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
type MovieResult, import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
Results, import {uniqBy} from "lodash";
type TvResult, import {textShadowStyle} from "@/components/jellyseerr/discover/GenericSlideCard";
} from "@/utils/jellyseerr/server/models/Search"; import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
import { useInfiniteQuery } from "@tanstack/react-query";
import { router, useLocalSearchParams, useSegments } from "expo-router";
import { uniqBy } from "lodash";
import React, { useMemo } from "react";
import { TouchableOpacity } from "react-native";
export default function page() { export default function page() {
const local = useLocalSearchParams(); const local = useLocalSearchParams();
const { jellyseerrApi } = useJellyseerr(); const {jellyseerrApi} = useJellyseerr();
const { genreId, name, type } = local as unknown as { const {genreId, name, type} = local as unknown as {
genreId: string; genreId: string,
name: string; name: string,
type: DiscoverSliderType; type: DiscoverSliderType
}; };
const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({ const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
queryKey: ["jellyseerr", "company", type, genreId], queryKey: ["jellyseerr", "company", type, genreId],
queryFn: async ({ pageParam }) => { queryFn: async ({pageParam}) => {
const params: any = { let params: any = {
page: Number(pageParam), page: Number(pageParam),
genre: genreId, genre: genreId
}; };
return jellyseerrApi?.discover( return jellyseerrApi?.discover(
type == DiscoverSliderType.MOVIE_GENRES type == DiscoverSliderType.MOVIE_GENRES
? Endpoints.DISCOVER_MOVIES ? Endpoints.DISCOVER_MOVIES
: Endpoints.DISCOVER_TV, : Endpoints.DISCOVER_TV,
params, params
); )
}, },
enabled: !!jellyseerrApi && !!genreId, enabled: !!jellyseerrApi && !!genreId,
initialPageParam: 1, initialPageParam: 1,
@@ -51,54 +47,41 @@ export default function page() {
}); });
const flatData = useMemo( const flatData = useMemo(
() => () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
uniqBy( [data]
data?.pages
?.filter((p) => p?.results.length)
.flatMap((p) => p?.results ?? []),
"id",
) ?? [],
[data],
); );
const backdrops = useMemo( const backdrops = useMemo(
() => () => jellyseerrApi
jellyseerrApi ? flatData.map((r) => jellyseerrApi.imageProxy((r as TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
? flatData.map((r) => : [],
jellyseerrApi.imageProxy( [jellyseerrApi, flatData]
(r as TvResult | MovieResult).backdropPath,
"w1920_and_h800_multi_faces",
),
)
: [],
[jellyseerrApi, flatData],
); );
return ( return (
<ParallaxSlideShow <ParallaxSlideShow
data={flatData} data={flatData}
images={backdrops} images={backdrops}
listHeader='' listHeader=""
keyExtractor={(item) => item.id.toString()} keyExtractor={(item) => item.id.toString()}
onEndReached={() => { onEndReached={() => {
if (hasNextPage) { if (hasNextPage) {
fetchNextPage(); fetchNextPage()
} }
}} }}
logo={ logo={
<Text <Text
className='text-4xl font-bold text-center bottom-1' className="text-4xl font-bold text-center bottom-1"
style={{ style={{
...textShadowStyle.shadow, ...textShadowStyle.shadow,
shadowRadius: 10, shadowRadius: 10
}} }}>
>
{name} {name}
</Text> </Text>
} }
renderItem={(item, index) => ( renderItem={(item, index) =>
<JellyseerrPoster item={item as MovieResult | TvResult} /> <JellyseerrPoster item={item as MovieResult | TvResult} />
)} }
/> />
); );
} }

View File

@@ -1,29 +1,27 @@
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import { Text } from "@/components/common/Text";
import { GenreTags } from "@/components/GenreTags"; import { GenreTags } from "@/components/GenreTags";
import Cast from "@/components/jellyseerr/Cast";
import DetailFacts from "@/components/jellyseerr/DetailFacts";
import { OverviewText } from "@/components/OverviewText"; import { OverviewText } from "@/components/OverviewText";
import { ParallaxScrollView } from "@/components/ParallaxPage"; import { ParallaxScrollView } from "@/components/ParallaxPage";
import { JellyserrRatings } from "@/components/Ratings"; import { JellyserrRatings } from "@/components/Ratings";
import { Text } from "@/components/common/Text";
import Cast from "@/components/jellyseerr/Cast";
import DetailFacts from "@/components/jellyseerr/DetailFacts";
import JellyseerrSeasons from "@/components/series/JellyseerrSeasons"; import JellyseerrSeasons from "@/components/series/JellyseerrSeasons";
import { ItemActions } from "@/components/series/SeriesActions"; import { ItemActions } from "@/components/series/SeriesActions";
import { useJellyseerr } from "@/hooks/useJellyseerr"; import { useJellyseerr } from "@/hooks/useJellyseerr";
import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest"; import { useJellyseerrCanRequest } from "@/utils/_jellyseerr/useJellyseerrCanRequest";
import { import {
type IssueType, IssueType,
IssueTypeName, IssueTypeName,
} from "@/utils/jellyseerr/server/constants/issue"; } from "@/utils/jellyseerr/server/constants/issue";
import { MediaType } from "@/utils/jellyseerr/server/constants/media"; import { MediaType } from "@/utils/jellyseerr/server/constants/media";
import type { import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
MovieResult, import { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
TvResult, import { useTranslation } from "react-i18next";
} from "@/utils/jellyseerr/server/models/Search";
import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { import {
BottomSheetBackdrop, BottomSheetBackdrop,
type BottomSheetBackdropProps, BottomSheetBackdropProps,
BottomSheetModal, BottomSheetModal,
BottomSheetTextInput, BottomSheetTextInput,
BottomSheetView, BottomSheetView,
@@ -31,37 +29,38 @@ import {
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useLocalSearchParams, useNavigation } from "expo-router"; import { useLocalSearchParams, useNavigation } from "expo-router";
import type React from "react"; import React, {
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; useCallback,
import { useTranslation } from "react-i18next"; useEffect,
useMemo,
useRef,
useState,
} from "react";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import RequestModal from "@/components/jellyseerr/RequestModal"; import RequestModal from "@/components/jellyseerr/RequestModal";
import { ANIME_KEYWORD_ID } from "@/utils/jellyseerr/server/api/themoviedb/constants"; import { ANIME_KEYWORD_ID } from "@/utils/jellyseerr/server/api/themoviedb/constants";
import type { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces"; import { MediaRequestBody } from "@/utils/jellyseerr/server/interfaces/api/requestInterfaces";
import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
const Page: React.FC = () => { const Page: React.FC = () => {
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const params = useLocalSearchParams(); const params = useLocalSearchParams();
const { t } = useTranslation(); const { t } = useTranslation();
const { mediaTitle, releaseYear, posterSrc, mediaType, ...result } = const { mediaTitle, releaseYear, posterSrc, ...result } =
params as unknown as { params as unknown as {
mediaTitle: string; mediaTitle: string;
releaseYear: number; releaseYear: number;
canRequest: string; canRequest: string;
posterSrc: string; posterSrc: string;
mediaType: MediaType; } & Partial<MovieResult | TvResult>;
} & Partial<MovieResult | TvResult | MovieDetails | TvDetails>;
const navigation = useNavigation(); const navigation = useNavigation();
const { jellyseerrApi, requestMedia } = useJellyseerr(); const { jellyseerrApi, requestMedia } = useJellyseerr();
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 advancedReqModalRef = useRef<BottomSheetModal>(null); const advancedReqModalRef = useRef<BottomSheetModal>(null);
const bottomSheetModalRef = useRef<BottomSheetModal>(null); const bottomSheetModalRef = useRef<BottomSheetModal>(null);
@@ -72,7 +71,7 @@ const Page: React.FC = () => {
refetch, refetch,
} = useQuery({ } = useQuery({
enabled: !!jellyseerrApi && !!result && !!result.id, enabled: !!jellyseerrApi && !!result && !!result.id,
queryKey: ["jellyseerr", "detail", mediaType, result.id], queryKey: ["jellyseerr", "detail", result.mediaType, result.id],
staleTime: 0, staleTime: 0,
refetchOnMount: true, refetchOnMount: true,
refetchOnReconnect: true, refetchOnReconnect: true,
@@ -80,9 +79,9 @@ const Page: React.FC = () => {
retryOnMount: true, retryOnMount: true,
refetchInterval: 0, refetchInterval: 0,
queryFn: async () => { queryFn: async () => {
return mediaType === MediaType.MOVIE return result.mediaType === MediaType.MOVIE
? jellyseerrApi?.movieDetails(result.id!) ? jellyseerrApi?.movieDetails(result.id!!)
: jellyseerrApi?.tvDetails(result.id!); : jellyseerrApi?.tvDetails(result.id!!);
}, },
}); });
@@ -97,7 +96,7 @@ const Page: React.FC = () => {
appearsOnIndex={0} appearsOnIndex={0}
/> />
), ),
[], []
); );
const submitIssue = useCallback(() => { const submitIssue = useCallback(() => {
@@ -112,18 +111,10 @@ const Page: React.FC = () => {
} }
}, [jellyseerrApi, details, result, issueType, issueMessage]); }, [jellyseerrApi, details, result, issueType, issueMessage]);
const setRequestBody = useCallback(
(body: MediaRequestBody) => {
_setRequestBody(body);
advancedReqModalRef?.current?.present?.();
},
[requestBody, _setRequestBody, advancedReqModalRef],
);
const request = useCallback(async () => { const request = useCallback(async () => {
const body: MediaRequestBody = { const body: MediaRequestBody = {
mediaId: Number(result.id!), mediaId: Number(result.id!!),
mediaType: mediaType!, mediaType: result.mediaType!!,
tvdbId: details?.externalIds?.tvdbId, tvdbId: details?.externalIds?.tvdbId,
seasons: (details as TvDetails)?.seasons seasons: (details as TvDetails)?.seasons
?.filter?.((s) => s.seasonNumber !== 0) ?.filter?.((s) => s.seasonNumber !== 0)
@@ -131,7 +122,7 @@ const Page: React.FC = () => {
}; };
if (hasAdvancedRequestPermission) { if (hasAdvancedRequestPermission) {
setRequestBody(body); advancedReqModalRef?.current?.present?.(body);
return; return;
} }
@@ -141,15 +132,15 @@ const Page: React.FC = () => {
const isAnime = useMemo( const isAnime = useMemo(
() => () =>
(details?.keywords.some((k) => k.id === ANIME_KEYWORD_ID) || false) && (details?.keywords.some((k) => k.id === ANIME_KEYWORD_ID) || false) &&
mediaType === MediaType.TV, result.mediaType === MediaType.TV,
[details], [details]
); );
useEffect(() => { useEffect(() => {
if (details) { if (details) {
navigation.setOptions({ navigation.setOptions({
headerRight: () => ( headerRight: () => (
<TouchableOpacity className='rounded-full p-2 bg-neutral-800/80'> <TouchableOpacity className="rounded-full p-2 bg-neutral-800/80">
<ItemActions item={details} /> <ItemActions item={details} />
</TouchableOpacity> </TouchableOpacity>
), ),
@@ -159,14 +150,14 @@ const Page: React.FC = () => {
return ( return (
<View <View
className='flex-1 relative' className="flex-1 relative"
style={{ style={{
paddingLeft: insets.left, paddingLeft: insets.left,
paddingRight: insets.right, paddingRight: insets.right,
}} }}
> >
<ParallaxScrollView <ParallaxScrollView
className='flex-1 opacity-100' className="flex-1 opacity-100"
headerHeight={300} headerHeight={300}
headerImage={ headerImage={
<View> <View>
@@ -181,7 +172,7 @@ const Page: React.FC = () => {
source={{ source={{
uri: jellyseerrApi?.imageProxy( uri: jellyseerrApi?.imageProxy(
result.backdropPath, result.backdropPath,
"w1920_and_h800_multi_faces", "w1920_and_h800_multi_faces"
), ),
}} }}
/> />
@@ -191,12 +182,12 @@ const Page: React.FC = () => {
width: "100%", width: "100%",
height: "100%", height: "100%",
}} }}
className='flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900' className="flex flex-col items-center justify-center border border-neutral-800 bg-neutral-900"
> >
<Ionicons <Ionicons
name='image-outline' name="image-outline"
size={24} size={24}
color='white' color="white"
style={{ opacity: 0.4 }} style={{ opacity: 0.4 }}
/> />
</View> </View>
@@ -204,31 +195,23 @@ const Page: React.FC = () => {
</View> </View>
} }
> >
<View className='flex flex-col'> <View className="flex flex-col">
<View className='space-y-4'> <View className="space-y-4">
<View className='px-4'> <View className="px-4">
<View className='flex flex-row justify-between w-full'> <View className="flex flex-row justify-between w-full">
<View className='flex flex-col w-56'> <View className="flex flex-col w-56">
<JellyserrRatings <JellyserrRatings result={result as MovieResult | TvResult} />
result={
result as
| MovieResult
| TvResult
| MovieDetails
| TvDetails
}
/>
<Text <Text
uiTextView uiTextView
selectable selectable
className='font-bold text-2xl mb-1' className="font-bold text-2xl mb-1"
> >
{mediaTitle} {mediaTitle}
</Text> </Text>
<Text className='opacity-50'>{releaseYear}</Text> <Text className="opacity-50">{releaseYear}</Text>
</View> </View>
<Image <Image
className='absolute bottom-1 right-1 rounded-lg w-28 aspect-[10/15] border-2 border-neutral-800/50 drop-shadow-2xl' className="absolute bottom-1 right-1 rounded-lg w-28 aspect-[10/15] border-2 border-neutral-800/50 drop-shadow-2xl"
cachePolicy={"memory-disk"} cachePolicy={"memory-disk"}
transition={300} transition={300}
source={{ source={{
@@ -236,22 +219,22 @@ const Page: React.FC = () => {
}} }}
/> />
</View> </View>
<View className='mb-4'> <View className="mb-4">
<GenreTags genres={details?.genres?.map((g) => g.name) || []} /> <GenreTags genres={details?.genres?.map((g) => g.name) || []} />
</View> </View>
{isLoading || isFetching ? ( {isLoading || isFetching ? (
<Button loading={true} disabled={true} color='purple'></Button> <Button loading={true} disabled={true} color="purple"></Button>
) : canRequest ? ( ) : canRequest ? (
<Button color='purple' onPress={request}> <Button color="purple" onPress={request}>
{t("jellyseerr.request_button")} {t("jellyseerr.request_button")}
</Button> </Button>
) : ( ) : (
<Button <Button
className='bg-yellow-500/50 border-yellow-400 ring-yellow-400 text-yellow-100' className="bg-yellow-500/50 border-yellow-400 ring-yellow-400 text-yellow-100"
color='transparent' color="transparent"
onPress={() => bottomSheetModalRef?.current?.present()} onPress={() => bottomSheetModalRef?.current?.present()}
iconLeft={ iconLeft={
<Ionicons name='warning-outline' size={24} color='white' /> <Ionicons name="warning-outline" size={24} color="white" />
} }
style={{ style={{
borderWidth: 1, borderWidth: 1,
@@ -261,20 +244,23 @@ const Page: React.FC = () => {
{t("jellyseerr.report_issue_button")} {t("jellyseerr.report_issue_button")}
</Button> </Button>
)} )}
<OverviewText text={result.overview} className='mt-4' /> <OverviewText text={result.overview} className="mt-4" />
</View> </View>
{mediaType === MediaType.TV && ( {result.mediaType === MediaType.TV && (
<JellyseerrSeasons <JellyseerrSeasons
isLoading={isLoading || isFetching} isLoading={isLoading || isFetching}
result={result as TvResult}
details={details as TvDetails} details={details as TvDetails}
refetch={refetch} refetch={refetch}
hasAdvancedRequest={hasAdvancedRequestPermission} hasAdvancedRequest={hasAdvancedRequestPermission}
onAdvancedRequest={(data) => setRequestBody(data)} onAdvancedRequest={(data) =>
advancedReqModalRef?.current?.present(data)
}
/> />
)} )}
<DetailFacts <DetailFacts
className='p-2 border border-neutral-800 bg-neutral-900 rounded-xl' className="p-2 border border-neutral-800 bg-neutral-900 rounded-xl"
details={details} details={details}
/> />
<Cast details={details} /> <Cast details={details} />
@@ -283,17 +269,14 @@ const Page: React.FC = () => {
</ParallaxScrollView> </ParallaxScrollView>
<RequestModal <RequestModal
ref={advancedReqModalRef} ref={advancedReqModalRef}
requestBody={requestBody}
title={mediaTitle} title={mediaTitle}
id={result.id!} id={result.id!!}
type={mediaType} type={result.mediaType as MediaType}
isAnime={isAnime} isAnime={isAnime}
onRequested={() => { onRequested={() => {
_setRequestBody(undefined);
advancedReqModalRef?.current?.close(); advancedReqModalRef?.current?.close();
refetch(); refetch();
}} }}
onDismiss={() => _setRequestBody(undefined)}
/> />
<BottomSheetModal <BottomSheetModal
ref={bottomSheetModalRef} ref={bottomSheetModalRef}
@@ -307,22 +290,22 @@ const Page: React.FC = () => {
backdropComponent={renderBackdrop} backdropComponent={renderBackdrop}
> >
<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">
<View> <View>
<Text className='font-bold text-2xl text-neutral-100'> <Text className="font-bold text-2xl text-neutral-100">
{t("jellyseerr.whats_wrong")} {t("jellyseerr.whats_wrong")}
</Text> </Text>
</View> </View>
<View className='flex flex-col space-y-2 items-start'> <View className="flex flex-col space-y-2 items-start">
<View className='flex flex-col'> <View className="flex flex-col">
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<View className='flex flex-col'> <View className="flex flex-col">
<Text className='opacity-50 mb-1 text-xs'> <Text className="opacity-50 mb-1 text-xs">
{t("jellyseerr.issue_type")} {t("jellyseerr.issue_type")}
</Text> </Text>
<TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
<Text style={{}} className='' numberOfLines={1}> <Text style={{}} className="" numberOfLines={1}>
{issueType {issueType
? IssueTypeName[issueType] ? IssueTypeName[issueType]
: t("jellyseerr.select_an_issue")} : t("jellyseerr.select_an_issue")}
@@ -332,8 +315,8 @@ const Page: React.FC = () => {
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={false} loop={false}
side='bottom' side="bottom"
align='center' align="center"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={0} collisionPadding={0}
@@ -360,14 +343,14 @@ const Page: React.FC = () => {
</DropdownMenu.Root> </DropdownMenu.Root>
</View> </View>
<View className='p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full'> <View className="p-4 border border-neutral-800 rounded-xl bg-neutral-900 w-full">
<BottomSheetTextInput <BottomSheetTextInput
multiline multiline
maxLength={254} maxLength={254}
style={{ color: "white" }} style={{ color: "white" }}
clearButtonMode='always' clearButtonMode="always"
placeholder={t("jellyseerr.describe_the_issue")} placeholder={t("jellyseerr.describe_the_issue")}
placeholderTextColor='#9CA3AF' placeholderTextColor="#9CA3AF"
// Issue with multiline + Textinput inside a portal // Issue with multiline + Textinput inside a portal
// https://github.com/callstack/react-native-paper/issues/1668 // https://github.com/callstack/react-native-paper/issues/1668
defaultValue={issueMessage} defaultValue={issueMessage}
@@ -375,7 +358,7 @@ const Page: React.FC = () => {
/> />
</View> </View>
</View> </View>
<Button className='mt-auto' onPress={submitIssue} color='purple'> <Button className="mt-auto" onPress={submitIssue} color="purple">
{t("jellyseerr.submit_button")} {t("jellyseerr.submit_button")}
</Button> </Button>
</View> </View>

View File

@@ -1,30 +1,25 @@
import { OverviewText } from "@/components/OverviewText"; import {
useLocalSearchParams,
useSegments,
} from "expo-router";
import React, { useMemo } from "react";
import { useQuery } from "@tanstack/react-query";
import { useJellyseerr } from "@/hooks/useJellyseerr";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { Image } from "expo-image";
import { OverviewText } from "@/components/OverviewText";
import {orderBy, uniqBy} from "lodash";
import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow"; import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
import JellyseerrPoster from "@/components/posters/JellyseerrPoster"; import JellyseerrPoster from "@/components/posters/JellyseerrPoster";
import { useJellyseerr } from "@/hooks/useJellyseerr"; import {MovieResult, TvResult} from "@/utils/jellyseerr/server/models/Search";
import type { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
import type {
MovieResult,
TvResult,
} from "@/utils/jellyseerr/server/models/Search";
import { useQuery } from "@tanstack/react-query";
import { Image } from "expo-image";
import { useLocalSearchParams, useSegments } from "expo-router";
import { orderBy, uniqBy } from "lodash";
import React, { useMemo } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
export default function page() { export default function page() {
const local = useLocalSearchParams(); const local = useLocalSearchParams();
const { t } = useTranslation(); const { t } = useTranslation();
const { const { jellyseerrApi, jellyseerrUser } = useJellyseerr();
jellyseerrApi,
jellyseerrUser,
jellyseerrRegion: region,
jellyseerrLocale: locale,
} = useJellyseerr();
const { personId } = local as { personId: string }; const { personId } = local as { personId: string };
@@ -37,29 +32,29 @@ export default function page() {
enabled: !!jellyseerrApi && !!personId, enabled: !!jellyseerrApi && !!personId,
}); });
const locale = useMemo(() => {
return jellyseerrUser?.settings?.locale || "en";
}, [jellyseerrUser]);
const region = useMemo(
() => jellyseerrUser?.settings?.region || "US",
[jellyseerrUser]
);
const castedRoles: PersonCreditCast[] = useMemo( const castedRoles: PersonCreditCast[] = useMemo(
() => () =>
uniqBy( uniqBy(orderBy(
orderBy( data?.combinedCredits?.cast,
data?.combinedCredits?.cast, ["voteCount", "voteAverage"],
["voteCount", "voteAverage"], "desc"
"desc", ), 'id'),
), [data?.combinedCredits]
"id",
),
[data?.combinedCredits],
); );
const backdrops = useMemo( const backdrops = useMemo(
() => () => jellyseerrApi
jellyseerrApi ? castedRoles.map((c) => jellyseerrApi.imageProxy(c.backdropPath, "w1920_and_h800_multi_faces"))
? castedRoles.map((c) => : [],
jellyseerrApi.imageProxy( [jellyseerrApi, data?.combinedCredits]
c.backdropPath,
"w1920_and_h800_multi_faces",
),
)
: [],
[jellyseerrApi, data?.combinedCredits],
); );
return ( return (
@@ -72,15 +67,15 @@ export default function page() {
<Image <Image
key={data?.details?.id} key={data?.details?.id}
id={data?.details?.id.toString()} id={data?.details?.id.toString()}
className='rounded-full bottom-1' className="rounded-full bottom-1"
source={{ source={{
uri: jellyseerrApi?.imageProxy( uri: jellyseerrApi?.imageProxy(
data?.details?.profilePath, data?.details?.profilePath,
"w600_and_h600_bestv2", "w600_and_h600_bestv2"
), ),
}} }}
cachePolicy={"memory-disk"} cachePolicy={"memory-disk"}
contentFit='cover' contentFit="cover"
style={{ style={{
width: 125, width: 125,
height: 125, height: 125,
@@ -89,27 +84,27 @@ export default function page() {
} }
HeaderContent={() => ( HeaderContent={() => (
<> <>
<Text className='font-bold text-2xl mb-1'>{data?.details?.name}</Text> <Text className="font-bold text-2xl mb-1">
<Text className='opacity-50'> {data?.details?.name}
</Text>
<Text className="opacity-50">
{t("jellyseerr.born")}{" "} {t("jellyseerr.born")}{" "}
{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>
</> </>
)} )}
MainContent={() => ( MainContent={() => (
<OverviewText text={data?.details?.biography} className='mt-4' /> <OverviewText text={data?.details?.biography} className="mt-4" />
)}
renderItem={(item, index) => (
<JellyseerrPoster item={item as MovieResult | TvResult} />
)} )}
renderItem={(item, index) => <JellyseerrPoster item={item as MovieResult | TvResult} />}
/> />
); );
} }

View File

@@ -3,10 +3,7 @@ import type {
MaterialTopTabNavigationOptions, MaterialTopTabNavigationOptions,
} from "@react-navigation/material-top-tabs"; } from "@react-navigation/material-top-tabs";
import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs"; import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
import type { import { ParamListBase, TabNavigationState } from "@react-navigation/native";
ParamListBase,
TabNavigationState,
} from "@react-navigation/native";
import { Stack, withLayoutContext } from "expo-router"; import { Stack, withLayoutContext } from "expo-router";
import React from "react"; import React from "react";
@@ -24,8 +21,8 @@ const Layout = () => {
<> <>
<Stack.Screen options={{ title: "Live TV" }} /> <Stack.Screen options={{ title: "Live TV" }} />
<Tab <Tab
initialRouteName='programs' initialRouteName="programs"
keyboardDismissMode='none' keyboardDismissMode="none"
screenOptions={{ screenOptions={{
tabBarBounces: true, tabBarBounces: true,
tabBarLabelStyle: { fontSize: 10 }, tabBarLabelStyle: { fontSize: 10 },
@@ -40,10 +37,10 @@ const Layout = () => {
tabBarScrollEnabled: true, tabBarScrollEnabled: true,
}} }}
> >
<Tab.Screen name='programs' /> <Tab.Screen name="programs" />
<Tab.Screen name='guide' /> <Tab.Screen name="guide" />
<Tab.Screen name='channels' /> <Tab.Screen name="channels" />
<Tab.Screen name='recordings' /> <Tab.Screen name="recordings" />
</Tab> </Tab>
</> </>
); );

View File

@@ -31,13 +31,13 @@ export default function page() {
}); });
return ( return (
<View className='flex flex-1'> <View className="flex flex-1">
<FlashList <FlashList
data={channels?.Items} data={channels?.Items}
estimatedItemSize={76} 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">
<ItemImage <ItemImage
style={{ style={{
aspectRatio: "1/1", aspectRatio: "1/1",
@@ -47,7 +47,7 @@ export default function page() {
item={item} item={item}
/> />
</View> </View>
<Text className='font-bold'>{item.Name}</Text> <Text className="font-bold">{item.Name}</Text>
</View> </View>
)} )}
/> />

View File

@@ -9,7 +9,6 @@ import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React, { useCallback, useMemo, useState } from "react"; import React, { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { import {
Button, Button,
Dimensions, Dimensions,
@@ -18,6 +17,7 @@ import {
View, View,
} from "react-native"; } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useTranslation } from "react-i18next";
const HOUR_HEIGHT = 30; const HOUR_HEIGHT = 30;
const ITEMS_PER_PAGE = 20; const ITEMS_PER_PAGE = 20;
@@ -71,7 +71,7 @@ export default function page() {
MaxStartDate: endOfDay.toISOString(), MaxStartDate: endOfDay.toISOString(),
MinEndDate: isToday ? now.toISOString() : startOfDay.toISOString(), MinEndDate: isToday ? now.toISOString() : startOfDay.toISOString(),
ChannelIds: channels?.Items?.map((c) => c.Id).filter( ChannelIds: channels?.Items?.map((c) => c.Id).filter(
Boolean, Boolean
) as string[], ) as string[],
ImageTypeLimit: 1, ImageTypeLimit: 1,
EnableImages: false, EnableImages: false,
@@ -100,7 +100,7 @@ export default function page() {
return ( return (
<ScrollView <ScrollView
nestedScrollEnabled nestedScrollEnabled
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
key={"home"} key={"home"}
contentContainerStyle={{ contentContainerStyle={{
paddingLeft: insets.left, paddingLeft: insets.left,
@@ -117,16 +117,16 @@ export default function page() {
} }
/> />
<View className='flex flex-row'> <View className="flex flex-row">
<View className='flex flex-col w-[64px]'> <View className="flex flex-col w-[64px]">
<View <View
style={{ style={{
height: HOUR_HEIGHT, height: HOUR_HEIGHT,
}} }}
className='bg-neutral-800' className="bg-neutral-800"
></View> ></View>
{channels?.Items?.map((c, i) => ( {channels?.Items?.map((c, i) => (
<View className='h-16 w-16 mr-4 rounded-lg overflow-hidden' key={i}> <View className="h-16 w-16 mr-4 rounded-lg overflow-hidden" key={i}>
<ItemImage <ItemImage
style={{ style={{
width: "100%", width: "100%",
@@ -148,7 +148,7 @@ export default function page() {
setScrollX(e.nativeEvent.contentOffset.x); setScrollX(e.nativeEvent.contentOffset.x);
}} }}
> >
<View className='flex flex-col'> <View className="flex flex-col">
<HourHeader height={HOUR_HEIGHT} /> <HourHeader height={HOUR_HEIGHT} />
{channels?.Items?.map((c, i) => ( {channels?.Items?.map((c, i) => (
<MemoizedLiveTVGuideRow <MemoizedLiveTVGuideRow
@@ -180,14 +180,14 @@ const PageButtons: React.FC<PageButtonsProps> = ({
}) => { }) => {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<View className='flex flex-row justify-between items-center bg-neutral-800 w-full px-4 py-2'> <View className="flex flex-row justify-between items-center bg-neutral-800 w-full px-4 py-2">
<TouchableOpacity <TouchableOpacity
onPress={onPrevPage} onPress={onPrevPage}
disabled={currentPage === 1} disabled={currentPage === 1}
className='flex flex-row items-center' className="flex flex-row items-center"
> >
<Ionicons <Ionicons
name='chevron-back' name="chevron-back"
size={24} size={24}
color={currentPage === 1 ? "gray" : "white"} color={currentPage === 1 ? "gray" : "white"}
/> />
@@ -199,11 +199,11 @@ const PageButtons: React.FC<PageButtonsProps> = ({
{t("live_tv.previous")} {t("live_tv.previous")}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
<Text className='text-white'>Page {currentPage}</Text> <Text className="text-white">Page {currentPage}</Text>
<TouchableOpacity <TouchableOpacity
onPress={onNextPage} onPress={onNextPage}
disabled={isNextDisabled} disabled={isNextDisabled}
className='flex flex-row items-center' className="flex flex-row items-center"
> >
<Text <Text
className={`mr-1 ${isNextDisabled ? "text-gray-500" : "text-white"}`} className={`mr-1 ${isNextDisabled ? "text-gray-500" : "text-white"}`}
@@ -211,7 +211,7 @@ const PageButtons: React.FC<PageButtonsProps> = ({
{t("live_tv.next")} {t("live_tv.next")}
</Text> </Text>
<Ionicons <Ionicons
name='chevron-forward' name="chevron-forward"
size={24} size={24}
color={isNextDisabled ? "gray" : "white"} color={isNextDisabled ? "gray" : "white"}
/> />

View File

@@ -1,13 +1,13 @@
import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList"; import { ScrollingCollectionList } from "@/components/home/ScrollingCollectionList";
import { TAB_HEIGHT } from "@/constants/Values"; import { TAB_HEIGHT } from "@/constants/Values";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api"; import { getLiveTvApi } from "@jellyfin/sdk/lib/utils/api";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next";
import { ScrollView, View } from "react-native"; import { ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useTranslation } from "react-i18next";
export default function page() { export default function page() {
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
@@ -19,7 +19,7 @@ export default function page() {
return ( return (
<ScrollView <ScrollView
nestedScrollEnabled nestedScrollEnabled
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
key={"home"} key={"home"}
contentContainerStyle={{ contentContainerStyle={{
paddingLeft: insets.left, paddingLeft: insets.left,
@@ -28,7 +28,7 @@ export default function page() {
paddingTop: 8, paddingTop: 8,
}} }}
> >
<View className='flex flex-col space-y-2'> <View className="flex flex-col space-y-2">
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "recommended"]} queryKey={["livetv", "recommended"]}
title={t("live_tv.on_now")} title={t("live_tv.on_now")}
@@ -45,7 +45,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "shows"]} queryKey={["livetv", "shows"]}
@@ -67,7 +67,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "movies"]} queryKey={["livetv", "movies"]}
@@ -85,7 +85,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "sports"]} queryKey={["livetv", "sports"]}
@@ -103,7 +103,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "kids"]} queryKey={["livetv", "kids"]}
@@ -121,7 +121,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
<ScrollingCollectionList <ScrollingCollectionList
queryKey={["livetv", "news"]} queryKey={["livetv", "news"]}
@@ -139,7 +139,7 @@ export default function page() {
}); });
return res.data.Items || []; return res.data.Items || [];
}} }}
orientation='horizontal' orientation="horizontal"
/> />
</View> </View>
</ScrollView> </ScrollView>

View File

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

View File

@@ -14,10 +14,9 @@ import { useQuery } from "@tanstack/react-query";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useLocalSearchParams, useNavigation } from "expo-router"; import { useLocalSearchParams, useNavigation } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import React, { useEffect, useMemo } from "react";
import { useEffect, useMemo } from "react"; import { View } from "react-native";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Platform, View } from "react-native";
const page: React.FC = () => { const page: React.FC = () => {
const navigation = useNavigation(); const navigation = useNavigation();
@@ -50,7 +49,7 @@ const page: React.FC = () => {
quality: 90, quality: 90,
width: 1000, width: 1000,
}), }),
[item], [item]
); );
const logoUrl = useMemo( const logoUrl = useMemo(
@@ -59,7 +58,7 @@ const page: React.FC = () => {
api, api,
item, item,
}), }),
[item], [item]
); );
const { data: allEpisodes, isLoading } = useQuery({ const { data: allEpisodes, isLoading } = useQuery({
@@ -84,27 +83,23 @@ const page: React.FC = () => {
item && item &&
allEpisodes && allEpisodes &&
allEpisodes.length > 0 && ( allEpisodes.length > 0 && (
<View className='flex flex-row items-center space-x-2'> <View className="flex flex-row items-center space-x-2">
<AddToFavorites item={item} /> <AddToFavorites item={item} type="series" />
{!Platform.isTV && ( <DownloadItems
<> size="large"
<DownloadItems title={t("item_card.download.download_series")}
size='large' items={allEpisodes || []}
title={t("item_card.download.download_series")} MissingDownloadIconComponent={() => (
items={allEpisodes || []} <Ionicons name="download" size={22} color="white" />
MissingDownloadIconComponent={() => ( )}
<Ionicons name='download' size={22} color='white' /> DownloadedIconComponent={() => (
)} <Ionicons
DownloadedIconComponent={() => ( name="checkmark-done-outline"
<Ionicons size={24}
name='checkmark-done-outline' color="#9333ea"
size={24}
color='#9333ea'
/>
)}
/> />
</> )}
)} />
</View> </View>
), ),
}); });
@@ -143,9 +138,9 @@ const page: React.FC = () => {
</> </>
} }
> >
<View className='flex flex-col pt-4'> <View className="flex flex-col pt-4">
<SeriesHeader item={item} /> <SeriesHeader item={item} />
<View className='mb-4'> <View className="mb-4">
<NextUp seriesId={seriesId} /> <NextUp seriesId={seriesId} />
</View> </View>
<SeasonPicker item={item} initialSeasonIndex={Number(seasonIndex)} /> <SeasonPicker item={item} initialSeasonIndex={Number(seasonIndex)} />

View File

@@ -1,35 +1,35 @@
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { useInfiniteQuery, useQuery } from "@tanstack/react-query"; import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { useLocalSearchParams, useNavigation } from "expo-router"; import { useLocalSearchParams, useNavigation } from "expo-router";
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React, { useCallback, useEffect, useMemo } from "react"; import React, { useCallback, useEffect, useMemo } from "react";
import { FlatList, View, useWindowDimensions } from "react-native"; import { FlatList, useWindowDimensions, View } from "react-native";
import { ItemCardText } from "@/components/ItemCardText";
import { Loader } from "@/components/Loader";
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";
import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton"; import { ResetFiltersButton } from "@/components/filters/ResetFiltersButton";
import { ItemCardText } from "@/components/ItemCardText";
import { Loader } from "@/components/Loader";
import { ItemPoster } from "@/components/posters/ItemPoster"; import { ItemPoster } from "@/components/posters/ItemPoster";
import { useOrientation } from "@/hooks/useOrientation"; import { useOrientation } from "@/hooks/useOrientation";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { import {
SortByOption,
SortOrderOption,
genreFilterAtom, genreFilterAtom,
getSortByPreference, getSortByPreference,
getSortOrderPreference, getSortOrderPreference,
sortByAtom, sortByAtom,
SortByOption,
sortByPreferenceAtom, sortByPreferenceAtom,
sortOptions, sortOptions,
sortOrderAtom, sortOrderAtom,
SortOrderOption,
sortOrderOptions, sortOrderOptions,
sortOrderPreferenceAtom, sortOrderPreferenceAtom,
tagsFilterAtom, tagsFilterAtom,
yearFilterAtom, yearFilterAtom,
} from "@/utils/atoms/filters"; } from "@/utils/atoms/filters";
import type { import {
BaseItemDto, BaseItemDto,
BaseItemDtoQueryResult, BaseItemDtoQueryResult,
BaseItemKind, BaseItemKind,
@@ -40,8 +40,8 @@ import {
getUserLibraryApi, getUserLibraryApi,
} from "@jellyfin/sdk/lib/utils/api"; } from "@jellyfin/sdk/lib/utils/api";
import { FlashList } from "@shopify/flash-list"; import { FlashList } from "@shopify/flash-list";
import { useTranslation } from "react-i18next";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useTranslation } from "react-i18next";
const Page = () => { const Page = () => {
const searchParams = useLocalSearchParams(); const searchParams = useLocalSearchParams();
@@ -58,7 +58,7 @@ const Page = () => {
const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom); const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom); const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
const [sortOrderPreference, setOderByPreference] = useAtom( const [sortOrderPreference, setOderByPreference] = useAtom(
sortOrderPreferenceAtom, sortOrderPreferenceAtom
); );
const { orientation } = useOrientation(); const { orientation } = useOrientation();
@@ -88,7 +88,7 @@ const Page = () => {
} }
_setSortBy(sortBy); _setSortBy(sortBy);
}, },
[libraryId, sortByPreference], [libraryId, sortByPreference]
); );
const setSortOrder = useCallback( const setSortOrder = useCallback(
@@ -102,7 +102,7 @@ const Page = () => {
} }
_setSortOrder(sortOrder); _setSortOrder(sortOrder);
}, },
[libraryId, sortOrderPreference], [libraryId, sortOrderPreference]
); );
const nrOfCols = useMemo(() => { const nrOfCols = useMemo(() => {
@@ -169,7 +169,7 @@ const Page = () => {
fields: ["PrimaryImageAspectRatio", "SortName"], fields: ["PrimaryImageAspectRatio", "SortName"],
genres: selectedGenres, genres: selectedGenres,
tags: selectedTags, tags: selectedTags,
years: selectedYears.map((year) => Number.parseInt(year)), years: selectedYears.map((year) => parseInt(year)),
includeItemTypes: itemType ? [itemType] : undefined, includeItemTypes: itemType ? [itemType] : undefined,
}); });
@@ -185,7 +185,7 @@ const Page = () => {
selectedTags, selectedTags,
sortBy, sortBy,
sortOrder, sortOrder,
], ]
); );
const { data, isFetching, fetchNextPage, hasNextPage, isLoading } = const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
@@ -211,7 +211,7 @@ const Page = () => {
const totalItems = lastPage.TotalRecordCount; const totalItems = lastPage.TotalRecordCount;
const accumulatedItems = pages.reduce( const accumulatedItems = pages.reduce(
(acc, curr) => acc + (curr?.Items?.length || 0), (acc, curr) => acc + (curr?.Items?.length || 0),
0, 0
); );
if (accumulatedItems < totalItems) { if (accumulatedItems < totalItems) {
@@ -248,8 +248,8 @@ const Page = () => {
? index % nrOfCols === 0 ? index % nrOfCols === 0
? "flex-end" ? "flex-end"
: (index + 1) % nrOfCols === 0 : (index + 1) % nrOfCols === 0
? "flex-start" ? "flex-start"
: "center" : "center"
: "center", : "center",
width: "89%", width: "89%",
}} }}
@@ -260,14 +260,14 @@ const Page = () => {
</View> </View>
</TouchableItemRouter> </TouchableItemRouter>
), ),
[orientation], [orientation]
); );
const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []); const keyExtractor = useCallback((item: BaseItemDto) => item.Id || "", []);
const ListHeaderComponent = useCallback( const ListHeaderComponent = useCallback(
() => ( () => (
<View className=''> <View className="">
<FlatList <FlatList
horizontal horizontal
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
@@ -286,13 +286,13 @@ const Page = () => {
key: "genre", key: "genre",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={libraryId} collectionId={libraryId}
queryKey='genreFilter' queryKey="genreFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: libraryId, parentId: libraryId,
@@ -313,13 +313,13 @@ const Page = () => {
key: "year", key: "year",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={libraryId} collectionId={libraryId}
queryKey='yearFilter' queryKey="yearFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: libraryId, parentId: libraryId,
@@ -338,13 +338,13 @@ const Page = () => {
key: "tags", key: "tags",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={libraryId} collectionId={libraryId}
queryKey='tagsFilter' queryKey="tagsFilter"
queryFn={async () => { queryFn={async () => {
if (!api) return null; if (!api) return null;
const response = await getFilterApi( const response = await getFilterApi(
api, api
).getQueryFiltersLegacy({ ).getQueryFiltersLegacy({
userId: user?.Id, userId: user?.Id,
parentId: libraryId, parentId: libraryId,
@@ -365,9 +365,9 @@ const Page = () => {
key: "sortBy", key: "sortBy",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={libraryId} collectionId={libraryId}
queryKey='sortBy' queryKey="sortBy"
queryFn={async () => sortOptions.map((s) => s.key)} queryFn={async () => sortOptions.map((s) => s.key)}
set={setSortBy} set={setSortBy}
values={sortBy} values={sortBy}
@@ -385,9 +385,9 @@ const Page = () => {
key: "sortOrder", key: "sortOrder",
component: ( component: (
<FilterButton <FilterButton
className='mr-1' className="mr-1"
collectionId={libraryId} collectionId={libraryId}
queryKey='sortOrder' queryKey="sortOrder"
queryFn={async () => sortOrderOptions.map((s) => s.key)} queryFn={async () => sortOrderOptions.map((s) => s.key)}
set={setSortOrder} set={setSortOrder}
values={sortOrder} values={sortOrder}
@@ -422,24 +422,22 @@ const Page = () => {
sortOrder, sortOrder,
setSortOrder, setSortOrder,
isFetching, isFetching,
], ]
); );
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
if (isLoading || isLibraryLoading) if (isLoading || isLibraryLoading)
return ( return (
<View className='w-full h-full flex items-center justify-center'> <View className="w-full h-full flex items-center justify-center">
<Loader /> <Loader />
</View> </View>
); );
if (flatData.length === 0) if (flatData.length === 0)
return ( return (
<View className='h-full w-full flex justify-center items-center'> <View className="h-full w-full flex justify-center items-center">
<Text className='text-lg text-neutral-500'> <Text className="text-lg text-neutral-500">{t("library.no_items_found")}</Text>
{t("library.no_items_found")}
</Text>
</View> </View>
); );
@@ -447,13 +445,11 @@ const Page = () => {
<FlashList <FlashList
key={orientation} key={orientation}
ListEmptyComponent={ ListEmptyComponent={
<View className='flex flex-col items-center justify-center h-full'> <View className="flex flex-col items-center justify-center h-full">
<Text className='font-bold text-xl text-neutral-500'> <Text className="font-bold text-xl text-neutral-500">{t("library.no_results")}</Text>
{t("library.no_results")}
</Text>
</View> </View>
} }
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
data={flatData} data={flatData}
renderItem={renderItem} renderItem={renderItem}
extraData={[orientation, nrOfCols]} extraData={[orientation, nrOfCols]}

View File

@@ -16,7 +16,7 @@ export default function IndexLayout() {
return ( return (
<Stack> <Stack>
<Stack.Screen <Stack.Screen
name='index' name="index"
options={{ options={{
headerShown: true, headerShown: true,
headerLargeTitle: true, headerLargeTitle: true,
@@ -33,9 +33,9 @@ export default function IndexLayout() {
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<Ionicons <Ionicons
name='ellipsis-horizontal-outline' name="ellipsis-horizontal-outline"
size={24} size={24}
color='white' color="white"
/> />
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
@@ -50,9 +50,9 @@ export default function IndexLayout() {
<DropdownMenu.Label> <DropdownMenu.Label>
{t("library.options.display")} {t("library.options.display")}
</DropdownMenu.Label> </DropdownMenu.Label>
<DropdownMenu.Group key='display-group'> <DropdownMenu.Group key="display-group">
<DropdownMenu.Sub> <DropdownMenu.Sub>
<DropdownMenu.SubTrigger key='image-style-trigger'> <DropdownMenu.SubTrigger key="image-style-trigger">
{t("library.options.display")} {t("library.options.display")}
</DropdownMenu.SubTrigger> </DropdownMenu.SubTrigger>
<DropdownMenu.SubContent <DropdownMenu.SubContent
@@ -63,7 +63,7 @@ export default function IndexLayout() {
sideOffset={10} sideOffset={10}
> >
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
key='display-option-1' key="display-option-1"
value={settings.libraryOptions.display === "row"} value={settings.libraryOptions.display === "row"}
onValueChange={() => onValueChange={() =>
updateSettings({ updateSettings({
@@ -75,12 +75,12 @@ export default function IndexLayout() {
} }
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='display-title-1'> <DropdownMenu.ItemTitle key="display-title-1">
{t("library.options.row")} {t("library.options.row")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
key='display-option-2' key="display-option-2"
value={settings.libraryOptions.display === "list"} value={settings.libraryOptions.display === "list"}
onValueChange={() => onValueChange={() =>
updateSettings({ updateSettings({
@@ -92,14 +92,14 @@ export default function IndexLayout() {
} }
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='display-title-2'> <DropdownMenu.ItemTitle key="display-title-2">
{t("library.options.list")} {t("library.options.list")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
</DropdownMenu.SubContent> </DropdownMenu.SubContent>
</DropdownMenu.Sub> </DropdownMenu.Sub>
<DropdownMenu.Sub> <DropdownMenu.Sub>
<DropdownMenu.SubTrigger key='image-style-trigger'> <DropdownMenu.SubTrigger key="image-style-trigger">
{t("library.options.image_style")} {t("library.options.image_style")}
</DropdownMenu.SubTrigger> </DropdownMenu.SubTrigger>
<DropdownMenu.SubContent <DropdownMenu.SubContent
@@ -110,7 +110,7 @@ export default function IndexLayout() {
sideOffset={10} sideOffset={10}
> >
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
key='poster-option' key="poster-option"
value={ value={
settings.libraryOptions.imageStyle === "poster" settings.libraryOptions.imageStyle === "poster"
} }
@@ -124,12 +124,12 @@ export default function IndexLayout() {
} }
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='poster-title'> <DropdownMenu.ItemTitle key="poster-title">
{t("library.options.poster")} {t("library.options.poster")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
key='cover-option' key="cover-option"
value={settings.libraryOptions.imageStyle === "cover"} value={settings.libraryOptions.imageStyle === "cover"}
onValueChange={() => onValueChange={() =>
updateSettings({ updateSettings({
@@ -141,19 +141,19 @@ export default function IndexLayout() {
} }
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='cover-title'> <DropdownMenu.ItemTitle key="cover-title">
{t("library.options.cover")} {t("library.options.cover")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
</DropdownMenu.SubContent> </DropdownMenu.SubContent>
</DropdownMenu.Sub> </DropdownMenu.Sub>
</DropdownMenu.Group> </DropdownMenu.Group>
<DropdownMenu.Group key='show-titles-group'> <DropdownMenu.Group key="show-titles-group">
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
disabled={settings.libraryOptions.imageStyle === "poster"} disabled={settings.libraryOptions.imageStyle === "poster"}
key='show-titles-option' key="show-titles-option"
value={settings.libraryOptions.showTitles} value={settings.libraryOptions.showTitles}
onValueChange={(newValue: string) => { onValueChange={(newValue) => {
if (settings.libraryOptions.imageStyle === "poster") if (settings.libraryOptions.imageStyle === "poster")
return; return;
updateSettings({ updateSettings({
@@ -165,14 +165,14 @@ export default function IndexLayout() {
}} }}
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='show-titles-title'> <DropdownMenu.ItemTitle key="show-titles-title">
{t("library.options.show_titles")} {t("library.options.show_titles")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
key='show-stats-option' key="show-stats-option"
value={settings.libraryOptions.showStats} value={settings.libraryOptions.showStats}
onValueChange={(newValue: string) => { onValueChange={(newValue) => {
updateSettings({ updateSettings({
libraryOptions: { libraryOptions: {
...settings.libraryOptions, ...settings.libraryOptions,
@@ -182,7 +182,7 @@ export default function IndexLayout() {
}} }}
> >
<DropdownMenu.ItemIndicator /> <DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key='show-stats-title'> <DropdownMenu.ItemTitle key="show-stats-title">
{t("library.options.show_stats")} {t("library.options.show_stats")}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.CheckboxItem> </DropdownMenu.CheckboxItem>
@@ -195,7 +195,7 @@ export default function IndexLayout() {
}} }}
/> />
<Stack.Screen <Stack.Screen
name='[libraryId]' name="[libraryId]"
options={{ options={{
title: "", title: "",
headerShown: true, headerShown: true,
@@ -208,7 +208,7 @@ export default function IndexLayout() {
<Stack.Screen key={name} name={name} options={options} /> <Stack.Screen key={name} name={name} options={options} />
))} ))}
<Stack.Screen <Stack.Screen
name='collections/[collectionId]' name="collections/[collectionId]"
options={{ options={{
title: "", title: "",
headerShown: true, headerShown: true,

View File

@@ -1,6 +1,6 @@
import { Loader } from "@/components/Loader";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { LibraryItemCard } from "@/components/library/LibraryItemCard"; import { LibraryItemCard } from "@/components/library/LibraryItemCard";
import { Loader } from "@/components/Loader";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { import {
@@ -11,9 +11,9 @@ import { FlashList } from "@shopify/flash-list";
import { useQuery, useQueryClient } from "@tanstack/react-query"; 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 { 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 { useTranslation } from "react-i18next";
export default function index() { export default function index() {
const [api] = useAtom(apiAtom); const [api] = useAtom(apiAtom);
@@ -23,7 +23,7 @@ export default function index() {
const { t } = useTranslation(); const { t } = useTranslation();
const { data, isLoading } = useQuery({ const { data, isLoading: isLoading } = useQuery({
queryKey: ["user-views", user?.Id], queryKey: ["user-views", user?.Id],
queryFn: async () => { queryFn: async () => {
const response = await getUserViewsApi(api!).getUserViews({ const response = await getUserViewsApi(api!).getUserViews({
@@ -41,7 +41,7 @@ export default function index() {
?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!)) ?.filter((l) => !settings?.hiddenLibraries?.includes(l.Id!))
.filter((l) => l.CollectionType !== "music") .filter((l) => l.CollectionType !== "music")
.filter((l) => l.CollectionType !== "books") || [], .filter((l) => l.CollectionType !== "books") || [],
[data, settings?.hiddenLibraries], [data, settings?.hiddenLibraries]
); );
useEffect(() => { useEffect(() => {
@@ -65,24 +65,22 @@ export default function index() {
if (isLoading) if (isLoading)
return ( return (
<View className='justify-center items-center h-full'> <View className="justify-center items-center h-full">
<Loader /> <Loader />
</View> </View>
); );
if (!libraries) if (!libraries)
return ( return (
<View className='h-full w-full flex justify-center items-center'> <View className="h-full w-full flex justify-center items-center">
<Text className='text-lg text-neutral-500'> <Text className="text-lg text-neutral-500">{t("library.no_libraries_found")}</Text>
{t("library.no_libraries_found")}
</Text>
</View> </View>
); );
return ( return (
<FlashList <FlashList
extraData={settings} extraData={settings}
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{ contentContainerStyle={{
paddingTop: 17, paddingTop: 17,
paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17, paddingHorizontal: settings?.libraryOptions?.display === "row" ? 0 : 17,
@@ -99,10 +97,10 @@ export default function index() {
style={{ style={{
height: StyleSheet.hairlineWidth, height: StyleSheet.hairlineWidth,
}} }}
className='bg-neutral-800 mx-2 my-4' className="bg-neutral-800 mx-2 my-4"
></View> ></View>
) : ( ) : (
<View className='h-4' /> <View className="h-4" />
) )
} }
estimatedItemSize={200} estimatedItemSize={200}

View File

@@ -3,15 +3,15 @@ import {
nestedTabPageScreenOptions, nestedTabPageScreenOptions,
} from "@/components/stacks/NestedTabPageStack"; } from "@/components/stacks/NestedTabPageStack";
import { Stack } from "expo-router"; import { Stack } from "expo-router";
import { useTranslation } from "react-i18next";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { useTranslation } from "react-i18next";
export default function SearchLayout() { export default function SearchLayout() {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<Stack> <Stack>
<Stack.Screen <Stack.Screen
name='index' name="index"
options={{ options={{
headerShown: true, headerShown: true,
headerLargeTitle: true, headerLargeTitle: true,
@@ -28,7 +28,7 @@ export default function SearchLayout() {
<Stack.Screen key={name} name={name} options={options} /> <Stack.Screen key={name} name={name} options={options} />
))} ))}
<Stack.Screen <Stack.Screen
name='collections/[collectionId]' name="collections/[collectionId]"
options={{ options={{
title: "", title: "",
headerShown: true, headerShown: true,
@@ -37,19 +37,10 @@ export default function SearchLayout() {
headerShadowVisible: false, headerShadowVisible: false,
}} }}
/> />
<Stack.Screen name='jellyseerr/page' options={commonScreenOptions} /> <Stack.Screen name="jellyseerr/page" options={commonScreenOptions} />
<Stack.Screen <Stack.Screen name="jellyseerr/person/[personId]" options={commonScreenOptions} />
name='jellyseerr/person/[personId]' <Stack.Screen name="jellyseerr/company/[companyId]" options={commonScreenOptions} />
options={commonScreenOptions} <Stack.Screen name="jellyseerr/genre/[genreId]" options={commonScreenOptions} />
/>
<Stack.Screen
name='jellyseerr/company/[companyId]'
options={commonScreenOptions}
/>
<Stack.Screen
name='jellyseerr/genre/[genreId]'
options={commonScreenOptions}
/>
</Stack> </Stack>
); );
} }

View File

@@ -1,43 +1,37 @@
import { Input } from "@/components/common/Input";
import { Text } from "@/components/common/Text";
import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
import ContinueWatchingPoster from "@/components/ContinueWatchingPoster"; import ContinueWatchingPoster from "@/components/ContinueWatchingPoster";
import { Tag } from "@/components/GenreTags"; import { Tag } from "@/components/GenreTags";
import { ItemCardText } from "@/components/ItemCardText"; import { ItemCardText } from "@/components/ItemCardText";
import { Text } from "@/components/common/Text"; import { JellyserrIndexPage } from "@/components/jellyseerr/JellyseerrIndexPage";
import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
import { FilterButton } from "@/components/filters/FilterButton";
import {
JellyseerrSearchSort,
JellyserrIndexPage,
} from "@/components/jellyseerr/JellyseerrIndexPage";
import MoviePoster from "@/components/posters/MoviePoster"; import MoviePoster from "@/components/posters/MoviePoster";
import SeriesPoster from "@/components/posters/SeriesPoster"; import SeriesPoster from "@/components/posters/SeriesPoster";
import { LoadingSkeleton } from "@/components/search/LoadingSkeleton"; import { LoadingSkeleton } from "@/components/search/LoadingSkeleton";
import { SearchItemWrapper } from "@/components/search/SearchItemWrapper"; import { SearchItemWrapper } from "@/components/search/SearchItemWrapper";
import { useJellyseerr } from "@/hooks/useJellyseerr"; import { useJellyseerr } from "@/hooks/useJellyseerr";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { sortOrderOptions } from "@/utils/atoms/filters";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { eventBus } from "@/utils/eventBus"; import {
import type {
BaseItemDto, BaseItemDto,
BaseItemKind, BaseItemKind,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api"; import { getItemsApi, getSearchApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import axios from "axios"; import axios from "axios";
import { router, useLocalSearchParams, useNavigation } from "expo-router"; import { Href, router, useLocalSearchParams, useNavigation } from "expo-router";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React, { import React, {
useCallback, useCallback,
useEffect, useEffect,
useLayoutEffect, useLayoutEffect,
useMemo, useMemo,
useRef,
useState, useState,
} from "react"; } from "react";
import { useTranslation } from "react-i18next";
import { Platform, ScrollView, TouchableOpacity, View } from "react-native"; import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useDebounce } from "use-debounce"; import { useDebounce } from "use-debounce";
import { useTranslation } from "react-i18next";
type SearchType = "Library" | "Discover"; type SearchType = "Library" | "Discover";
@@ -56,7 +50,7 @@ export default function search() {
const { t } = useTranslation(); const { t } = useTranslation();
const { q } = params as { q: string }; const { q, prev } = params as { q: string; prev: Href<string> };
const [searchType, setSearchType] = useState<SearchType>("Library"); const [searchType, setSearchType] = useState<SearchType>("Library");
const [search, setSearch] = useState<string>(""); const [search, setSearch] = useState<string>("");
@@ -68,15 +62,6 @@ export default function search() {
const [settings] = useSettings(); const [settings] = useSettings();
const { jellyseerrApi } = useJellyseerr(); const { jellyseerrApi } = useJellyseerr();
const [jellyseerrOrderBy, setJellyseerrOrderBy] =
useState<JellyseerrSearchSort>(
JellyseerrSearchSort[
JellyseerrSearchSort.DEFAULT
] as unknown as JellyseerrSearchSort,
);
const [jellyseerrSortOrder, setJellyseerrSortOrder] = useState<
"asc" | "desc"
>("desc");
const searchEngine = useMemo(() => { const searchEngine = useMemo(() => {
return settings?.searchEngine || "Jellyfin"; return settings?.searchEngine || "Jellyfin";
@@ -132,47 +117,25 @@ export default function search() {
return []; // Ensure an empty array is returned in case of an error return []; // Ensure an empty array is returned in case of an error
} }
}, },
[api, searchEngine, settings], [api, searchEngine, settings]
); );
type HeaderSearchBarRef = {
focus: () => void;
blur: () => void;
setText: (text: string) => void;
clearText: () => void;
cancelSearch: () => void;
};
const searchBarRef = useRef<HeaderSearchBarRef>(null);
const navigation = useNavigation(); const navigation = useNavigation();
useLayoutEffect(() => { useLayoutEffect(() => {
navigation.setOptions({ if (Platform.OS === "ios")
headerSearchBarOptions: { navigation.setOptions({
ref: searchBarRef, headerSearchBarOptions: {
placeholder: t("search.search"), placeholder: t("search.search"),
onChangeText: (e: any) => { onChangeText: (e: any) => {
router.setParams({ q: "" }); router.setParams({ q: "" });
setSearch(e.nativeEvent.text); setSearch(e.nativeEvent.text);
},
hideWhenScrolling: false,
autoFocus: true,
}, },
hideWhenScrolling: false, });
autoFocus: false,
},
});
}, [navigation]); }, [navigation]);
useEffect(() => {
const unsubscribe = eventBus.on("searchTabPressed", () => {
// Screen not actuve
if (!searchBarRef.current) return;
// Screen is active, focus search bar
searchBarRef.current?.focus();
});
return () => {
unsubscribe();
};
}, []);
const { data: movies, isFetching: l1 } = useQuery({ const { data: movies, isFetching: l1 } = useQuery({
queryKey: ["search", "movies", debouncedSearch], queryKey: ["search", "movies", debouncedSearch],
queryFn: () => queryFn: () =>
@@ -240,81 +203,50 @@ export default function search() {
return ( return (
<> <>
<ScrollView <ScrollView
keyboardDismissMode='on-drag' keyboardDismissMode="on-drag"
contentInsetAdjustmentBehavior='automatic' contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{ contentContainerStyle={{
paddingLeft: insets.left, paddingLeft: insets.left,
paddingRight: insets.right, paddingRight: insets.right,
}} }}
> >
<View <View className="flex flex-col">
className='flex flex-col' {Platform.OS === "android" && (
style={{ <View className="mb-4 px-4">
marginTop: Platform.OS === "android" ? 16 : 0, <Input
}} autoCorrect={false}
> returnKeyType="done"
keyboardType="web-search"
placeholder={t("search.search_here")}
value={search}
onChangeText={(text) => setSearch(text)}
/>
</View>
)}
{jellyseerrApi && ( {jellyseerrApi && (
<> <View className="flex flex-row flex-wrap space-x-2 px-4 mb-2">
<ScrollView <TouchableOpacity onPress={() => setSearchType("Library")}>
horizontal <Tag
className='flex flex-row flex-wrap space-x-2 px-4 mb-2' text={t("search.library")}
> textClass="p-1"
<TouchableOpacity onPress={() => setSearchType("Library")}> className={
<Tag searchType === "Library" ? "bg-purple-600" : undefined
text={t("search.library")} }
textClass='p-1' />
className={ </TouchableOpacity>
searchType === "Library" ? "bg-purple-600" : undefined <TouchableOpacity onPress={() => setSearchType("Discover")}>
} <Tag
/> text={t("search.discover")}
</TouchableOpacity> textClass="p-1"
<TouchableOpacity onPress={() => setSearchType("Discover")}> className={
<Tag searchType === "Discover" ? "bg-purple-600" : undefined
text={t("search.discover")} }
textClass='p-1' />
className={ </TouchableOpacity>
searchType === "Discover" ? "bg-purple-600" : undefined </View>
}
/>
</TouchableOpacity>
{searchType === "Discover" &&
!loading &&
noResults &&
debouncedSearch.length > 0 && (
<View className='flex flex-row justify-end items-center space-x-1'>
<FilterButton
collectionId='search'
queryKey='jellyseerr_search'
queryFn={async () =>
Object.keys(JellyseerrSearchSort).filter((v) =>
isNaN(Number(v)),
)
}
set={(value) => setJellyseerrOrderBy(value[0])}
values={[jellyseerrOrderBy]}
title={t("library.filters.sort_by")}
renderItemLabel={(item) =>
t(`home.settings.plugins.jellyseerr.order_by.${item}`)
}
showSearch={false}
/>
<FilterButton
collectionId='order'
queryKey='jellysearr_search'
queryFn={async () => ["asc", "desc"]}
set={(value) => setJellyseerrSortOrder(value[0])}
values={[jellyseerrSortOrder]}
title={t("library.filters.sort_order")}
renderItemLabel={(item) => t(`library.filters.${item}`)}
showSearch={false}
/>
</View>
)}
</ScrollView>
</>
)} )}
<View className='mt-2'> <View className="mt-2">
<LoadingSkeleton isLoading={loading} /> <LoadingSkeleton isLoading={loading} />
</View> </View>
@@ -326,14 +258,14 @@ export default function search() {
renderItem={(item: BaseItemDto) => ( renderItem={(item: BaseItemDto) => (
<TouchableItemRouter <TouchableItemRouter
key={item.Id} key={item.Id}
className='flex flex-col w-28 mr-2' className="flex flex-col w-28 mr-2"
item={item} item={item}
> >
<MoviePoster item={item} key={item.Id} /> <MoviePoster item={item} key={item.Id} />
<Text numberOfLines={2} className='mt-2'> <Text numberOfLines={2} className="mt-2">
{item.Name} {item.Name}
</Text> </Text>
<Text className='opacity-50 text-xs'> <Text className="opacity-50 text-xs">
{item.ProductionYear} {item.ProductionYear}
</Text> </Text>
</TouchableItemRouter> </TouchableItemRouter>
@@ -346,13 +278,13 @@ export default function search() {
<TouchableItemRouter <TouchableItemRouter
key={item.Id} key={item.Id}
item={item} item={item}
className='flex flex-col w-28 mr-2' className="flex flex-col w-28 mr-2"
> >
<SeriesPoster item={item} key={item.Id} /> <SeriesPoster item={item} key={item.Id} />
<Text numberOfLines={2} className='mt-2'> <Text numberOfLines={2} className="mt-2">
{item.Name} {item.Name}
</Text> </Text>
<Text className='opacity-50 text-xs'> <Text className="opacity-50 text-xs">
{item.ProductionYear} {item.ProductionYear}
</Text> </Text>
</TouchableItemRouter> </TouchableItemRouter>
@@ -365,7 +297,7 @@ export default function search() {
<TouchableItemRouter <TouchableItemRouter
item={item} item={item}
key={item.Id} key={item.Id}
className='flex flex-col w-44 mr-2' className="flex flex-col w-44 mr-2"
> >
<ContinueWatchingPoster item={item} /> <ContinueWatchingPoster item={item} />
<ItemCardText item={item} /> <ItemCardText item={item} />
@@ -379,10 +311,10 @@ export default function search() {
<TouchableItemRouter <TouchableItemRouter
key={item.Id} key={item.Id}
item={item} item={item}
className='flex flex-col w-28 mr-2' className="flex flex-col w-28 mr-2"
> >
<MoviePoster item={item} key={item.Id} /> <MoviePoster item={item} key={item.Id} />
<Text numberOfLines={2} className='mt-2'> <Text numberOfLines={2} className="mt-2">
{item.Name} {item.Name}
</Text> </Text>
</TouchableItemRouter> </TouchableItemRouter>
@@ -395,7 +327,7 @@ export default function search() {
<TouchableItemRouter <TouchableItemRouter
item={item} item={item}
key={item.Id} key={item.Id}
className='flex flex-col w-28 mr-2' className="flex flex-col w-28 mr-2"
> >
<MoviePoster item={item} /> <MoviePoster item={item} />
<ItemCardText item={item} /> <ItemCardText item={item} />
@@ -404,33 +336,29 @@ export default function search() {
/> />
</View> </View>
) : ( ) : (
<JellyserrIndexPage <JellyserrIndexPage searchQuery={debouncedSearch} />
searchQuery={debouncedSearch}
sortType={jellyseerrOrderBy}
order={jellyseerrSortOrder}
/>
)} )}
{searchType === "Library" && ( {searchType === "Library" && (
<> <>
{!loading && noResults && debouncedSearch.length > 0 ? ( {!loading && noResults && debouncedSearch.length > 0 ? (
<View> <View>
<Text className='text-center text-lg font-bold mt-4'> <Text className="text-center text-lg font-bold mt-4">
{t("search.no_results_found_for")} {t("search.no_results_found_for")}
</Text> </Text>
<Text className='text-xs text-purple-600 text-center'> <Text className="text-xs text-purple-600 text-center">
"{debouncedSearch}" "{debouncedSearch}"
</Text> </Text>
</View> </View>
) : debouncedSearch.length === 0 ? ( ) : debouncedSearch.length === 0 ? (
<View className='mt-4 flex flex-col items-center space-y-2'> <View className="mt-4 flex flex-col items-center space-y-2">
{exampleSearches.map((e) => ( {exampleSearches.map((e) => (
<TouchableOpacity <TouchableOpacity
onPress={() => setSearch(e)} onPress={() => setSearch(e)}
key={e} key={e}
className='mb-2' className="mb-2"
> >
<Text className='text-purple-600'>{e}</Text> <Text className="text-purple-600">{e}</Text>
</TouchableOpacity> </TouchableOpacity>
))} ))}
</View> </View>

View File

@@ -1,20 +1,20 @@
import React, { useCallback, useRef } from "react"; import React, { useCallback, useRef } from "react";
import { useTranslation } from "react-i18next";
import { Platform } from "react-native"; import { Platform } from "react-native";
import { useTranslation } from "react-i18next";
import { useFocusEffect, useRouter, withLayoutContext } from "expo-router"; import { useFocusEffect, useRouter, withLayoutContext } from "expo-router";
import { import {
type NativeBottomTabNavigationEventMap,
createNativeBottomTabNavigator, createNativeBottomTabNavigator,
NativeBottomTabNavigationEventMap,
} from "@bottom-tabs/react-navigation"; } from "@bottom-tabs/react-navigation";
const { Navigator } = createNativeBottomTabNavigator(); const { Navigator } = createNativeBottomTabNavigator();
import type { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
import { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
import { Colors } from "@/constants/Colors"; import { Colors } from "@/constants/Colors";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { eventBus } from "@/utils/eventBus";
import { storage } from "@/utils/mmkv"; import { storage } from "@/utils/mmkv";
import type { import type {
ParamListBase, ParamListBase,
@@ -46,29 +46,22 @@ export default function TabLayout() {
clearTimeout(timer); clearTimeout(timer);
}; };
} }
}, []), }, [])
); );
return ( return (
<> <>
<SystemBars hidden={false} style='light' /> <SystemBars hidden={false} style="light" />
<NativeTabs <NativeTabs
sidebarAdaptable={false} sidebarAdaptable={false}
ignoresTopSafeArea ignoresTopSafeArea
tabBarStyle={{ barTintColor={Platform.OS === "android" ? "#121212" : undefined}
backgroundColor: "#121212",
}}
tabBarActiveTintColor={Colors.primary} tabBarActiveTintColor={Colors.primary}
scrollEdgeAppearance='default' scrollEdgeAppearance="default"
> >
<NativeTabs.Screen redirect name='index' /> <NativeTabs.Screen redirect name="index" />
<NativeTabs.Screen <NativeTabs.Screen
listeners={({ navigation }) => ({ name="(home)"
tabPress: (e) => {
eventBus.emit("scrollToTop");
},
})}
name='(home)'
options={{ options={{
title: t("tabs.home"), title: t("tabs.home"),
tabBarIcon: tabBarIcon:
@@ -82,12 +75,7 @@ export default function TabLayout() {
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
listeners={({ navigation }) => ({ name="(search)"
tabPress: (e) => {
eventBus.emit("searchTabPressed");
},
})}
name='(search)'
options={{ options={{
title: t("tabs.search"), title: t("tabs.search"),
tabBarIcon: tabBarIcon:
@@ -101,7 +89,7 @@ export default function TabLayout() {
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
name='(favorites)' name="(favorites)"
options={{ options={{
title: t("tabs.favorites"), title: t("tabs.favorites"),
tabBarIcon: tabBarIcon:
@@ -117,7 +105,7 @@ export default function TabLayout() {
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
name='(libraries)' name="(libraries)"
options={{ options={{
title: t("tabs.library"), title: t("tabs.library"),
tabBarIcon: tabBarIcon:
@@ -131,7 +119,7 @@ export default function TabLayout() {
}} }}
/> />
<NativeTabs.Screen <NativeTabs.Screen
name='(custom-links)' name="(custom-links)"
options={{ options={{
title: t("tabs.custom_links"), title: t("tabs.custom_links"),
// @ts-expect-error // @ts-expect-error

View File

@@ -1,39 +1,23 @@
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { useSettings } from "@/utils/atoms/settings";
import { Stack } from "expo-router"; import { Stack } from "expo-router";
import React, { useLayoutEffect } from "react"; import React from "react";
import { Platform } from "react-native";
import { SystemBars } from "react-native-edge-to-edge"; import { SystemBars } from "react-native-edge-to-edge";
export default function Layout() { export default function Layout() {
const [settings] = useSettings();
useLayoutEffect(() => {
if (Platform.isTV) return;
if (!settings.followDeviceOrientation && settings.defaultVideoOrientation) {
ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
}
return () => {
if (Platform.isTV) return;
if (settings.followDeviceOrientation === true) {
ScreenOrientation.unlockAsync();
} else {
ScreenOrientation.lockAsync(
ScreenOrientation.OrientationLock.PORTRAIT_UP,
);
}
};
});
return ( return (
<> <>
<SystemBars hidden /> <SystemBars hidden />
<Stack> <Stack>
<Stack.Screen <Stack.Screen
name='direct-player' name="direct-player"
options={{
headerShown: false,
autoHideHomeIndicator: true,
title: "",
animation: "fade",
}}
/>
<Stack.Screen
name="transcoding-player"
options={{ options={{
headerShown: false, headerShown: false,
autoHideHomeIndicator: true, autoHideHomeIndicator: true,

View File

@@ -1,59 +1,64 @@
import { BITRATES } from "@/components/BitrateSelector"; import { BITRATES } from "@/components/BitrateSelector";
import { Loader } from "@/components/Loader";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { Loader } from "@/components/Loader";
import { Controls } from "@/components/video-player/controls/Controls"; import { Controls } from "@/components/video-player/controls/Controls";
import { getDownloadedFileUrl } from "@/hooks/useDownloadedFileOpener"; import { getDownloadedFileUrl } from "@/hooks/useDownloadedFileOpener";
import { useHaptic } from "@/hooks/useHaptic"; import { useOrientation } from "@/hooks/useOrientation";
import { useOrientationSettings } from "@/hooks/useOrientationSettings";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache"; import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useWebSocket } from "@/hooks/useWebsockets"; import { useWebSocket } from "@/hooks/useWebsockets";
import { VlcPlayerView } from "@/modules"; import { VlcPlayerView } from "@/modules/vlc-player";
import type { import {
PipStartedPayload,
PlaybackStatePayload, PlaybackStatePayload,
ProgressUpdatePayload, ProgressUpdatePayload,
VlcPlayerViewRef, VlcPlayerViewRef,
} from "@/modules/VlcPlayer.types"; } from "@/modules/vlc-player/src/VlcPlayer.types";
// import { useDownload } from "@/providers/DownloadProvider";
const downloadProvider = !Platform.isTV
? require("@/providers/DownloadProvider")
: null;
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings"; import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl"; import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
import { writeToLog } from "@/utils/log"; import { writeToLog } from "@/utils/log";
import native from "@/utils/profiles/native"; import native from "@/utils/profiles/native";
import { msToTicks, ticksToSeconds } from "@/utils/time"; import { msToTicks, ticksToSeconds } from "@/utils/time";
import { import { Api } from "@jellyfin/sdk";
type BaseItemDto, import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
type MediaSourceInfo,
PlaybackOrder,
type PlaybackProgressInfo,
RepeatMode,
} from "@jellyfin/sdk/lib/generated-client";
import { import {
getPlaystateApi, getPlaystateApi,
getUserLibraryApi, getUserLibraryApi,
} from "@jellyfin/sdk/lib/utils/api"; } from "@jellyfin/sdk/lib/utils/api";
import { activateKeepAwakeAsync, deactivateKeepAwake } from "expo-keep-awake"; import { useQuery } from "@tanstack/react-query";
import { useGlobalSearchParams, useNavigation } from "expo-router"; import { useHaptic } from "@/hooks/useHaptic";
import { useFocusEffect, useGlobalSearchParams } from "expo-router";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import React, { import React, {
useCallback, useCallback,
useEffect,
useMemo, useMemo,
useRef, useRef,
useState, useState,
useEffect,
} from "react"; } from "react";
import { useTranslation } from "react-i18next"; import {
import { Alert, Platform, View } from "react-native"; Alert,
BackHandler,
View,
AppState,
AppStateStatus,
Platform,
} from "react-native";
import { useSharedValue } from "react-native-reanimated"; import { useSharedValue } from "react-native-reanimated";
import settings from "../(tabs)/(home)/settings";
import { useSettings } from "@/utils/atoms/settings";
import { useTranslation } from "react-i18next";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
const downloadProvider = !Platform.isTV
? require("@/providers/DownloadProvider")
: null;
export default function page() { export default function page() {
const videoRef = useRef<VlcPlayerViewRef>(null); const videoRef = useRef<VlcPlayerViewRef>(null);
const user = useAtomValue(userAtom); const user = useAtomValue(userAtom);
const api = useAtomValue(apiAtom); const api = useAtomValue(apiAtom);
const { t } = useTranslation(); const { t } = useTranslation();
const navigation = useNavigation();
const [isPlaybackStopped, setIsPlaybackStopped] = useState(false); const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
const [showControls, _setShowControls] = useState(true); const [showControls, _setShowControls] = useState(true);
@@ -61,14 +66,13 @@ export default function page() {
const [isPlaying, setIsPlaying] = useState(false); const [isPlaying, setIsPlaying] = useState(false);
const [isBuffering, setIsBuffering] = useState(true); const [isBuffering, setIsBuffering] = useState(true);
const [isVideoLoaded, setIsVideoLoaded] = useState(false); const [isVideoLoaded, setIsVideoLoaded] = useState(false);
const [isPipStarted, setIsPipStarted] = useState(false);
const progress = useSharedValue(0); const progress = useSharedValue(0);
const isSeeking = useSharedValue(false); const isSeeking = useSharedValue(false);
const cacheProgress = useSharedValue(0); const cacheProgress = useSharedValue(0);
let getDownloadedItem = null;
if (!Platform.isTV) { if (!Platform.isTV) {
getDownloadedItem = downloadProvider.useDownload(); const getDownloadedItem = downloadProvider.useDownload();
} }
const revalidateProgressCache = useInvalidatePlaybackProgressCache(); const revalidateProgressCache = useInvalidatePlaybackProgressCache();
@@ -96,124 +100,145 @@ export default function page() {
offline: string; offline: string;
}>(); }>();
const [settings] = useSettings(); const [settings] = useSettings();
const insets = useSafeAreaInsets();
const offline = offlineStr === "true"; const offline = offlineStr === "true";
const audioIndex = audioIndexStr const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
? Number.parseInt(audioIndexStr, 10) const subtitleIndex = subtitleIndexStr ? parseInt(subtitleIndexStr, 10) : -1;
: undefined;
const subtitleIndex = subtitleIndexStr
? Number.parseInt(subtitleIndexStr, 10)
: -1;
const bitrateValue = bitrateValueStr const bitrateValue = bitrateValueStr
? Number.parseInt(bitrateValueStr, 10) ? parseInt(bitrateValueStr, 10)
: BITRATES[0].value; : BITRATES[0].value;
const [item, setItem] = useState<BaseItemDto | null>(null); const {
const [itemStatus, setItemStatus] = useState({ data: item,
isLoading: true, isLoading: isLoadingItem,
isError: false, isError: isErrorItem,
} = useQuery({
queryKey: ["item", itemId],
queryFn: async () => {
if (offline && !Platform.isTV) {
const item = await getDownloadedItem(itemId);
if (item) return item.item;
}
const res = await getUserLibraryApi(api!).getItem({
itemId,
userId: user?.Id,
});
return res.data;
},
enabled: !!itemId,
staleTime: 0,
}); });
useEffect(() => { const {
const fetchItemData = async () => { data: stream,
setItemStatus({ isLoading: true, isError: false }); isLoading: isLoadingStreamUrl,
try { isError: isErrorStreamUrl,
let fetchedItem: BaseItemDto | null = null; } = useQuery({
if (offline && !Platform.isTV) { queryKey: ["stream-url", itemId, mediaSourceId, bitrateValue],
const data = await getDownloadedItem.getDownloadedItem(itemId); queryFn: async () => {
if (data) fetchedItem = data.item as BaseItemDto; if (offline && !Platform.isTV) {
} else { const data = await getDownloadedItem(itemId);
const res = await getUserLibraryApi(api!).getItem({ if (!data?.mediaSource) return null;
itemId,
userId: user?.Id, const url = await getDownloadedFileUrl(data.item.Id!);
});
fetchedItem = res.data; if (item)
} return {
setItem(fetchedItem); mediaSource: data.mediaSource,
} catch (error) { url,
console.error("Failed to fetch item:", error); sessionId: undefined,
setItemStatus({ isLoading: false, isError: true }); };
} finally {
setItemStatus({ isLoading: false, isError: false });
} }
};
if (itemId) { const res = await getStreamUrl({
fetchItemData(); api,
} item,
}, [itemId, offline, api, user?.Id]); startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
userId: user?.Id,
audioStreamIndex: audioIndex,
maxStreamingBitrate: bitrateValue,
mediaSourceId: mediaSourceId,
subtitleStreamIndex: subtitleIndex,
deviceProfile: native,
});
interface Stream { if (!res) return null;
mediaSource: MediaSourceInfo;
sessionId: string;
url: string;
}
const [stream, setStream] = useState<Stream | null>(null); const { mediaSource, sessionId, url } = res;
const [streamStatus, setStreamStatus] = useState({
isLoading: true, if (!sessionId || !mediaSource || !url) {
isError: false, Alert.alert(t("player.error"), t("player.failed_to_get_stream_url"));
return null;
}
return {
mediaSource,
sessionId,
url,
};
},
enabled: !!itemId && !!item,
staleTime: 0,
}); });
useEffect(() => { const togglePlay = useCallback(async () => {
const fetchStreamData = async () => { if (!api) return;
try {
let result: Stream | null = null;
if (offline && !Platform.isTV) {
const data = await getDownloadedItem.getDownloadedItem(itemId);
if (!data?.mediaSource) return;
const url = await getDownloadedFileUrl(data.item.Id!);
if (item) {
result = { mediaSource: data.mediaSource, sessionId: "", url };
}
} else {
const res = await getStreamUrl({
api,
item,
startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
userId: user?.Id,
audioStreamIndex: audioIndex,
maxStreamingBitrate: bitrateValue,
mediaSourceId: mediaSourceId,
subtitleStreamIndex: subtitleIndex,
deviceProfile: native,
});
if (!res) return;
const { mediaSource, sessionId, url } = res;
if (!sessionId || !mediaSource || !url) {
Alert.alert(
t("player.error"),
t("player.failed_to_get_stream_url"),
);
return;
}
result = { mediaSource, sessionId, url };
}
setStream(result);
} catch (error) {
console.error("Failed to fetch stream:", error);
setStreamStatus({ isLoading: false, isError: true });
} finally {
setStreamStatus({ isLoading: false, isError: false });
}
};
fetchStreamData();
}, [itemId, mediaSourceId, bitrateValue, api, item, user?.Id]);
const togglePlay = async () => {
lightHapticFeedback(); lightHapticFeedback();
setIsPlaying(!isPlaying);
if (isPlaying) { if (isPlaying) {
await videoRef.current?.pause(); await videoRef.current?.pause();
if (!offline && stream) {
await getPlaystateApi(api).onPlaybackProgress({
itemId: item?.Id!,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: msToTicks(progress.value),
isPaused: true,
playMethod: stream.url?.includes("m3u8")
? "Transcode"
: "DirectStream",
playSessionId: stream.sessionId,
});
}
} else { } else {
videoRef.current?.play(); videoRef.current?.play();
if (!offline && stream) {
await getPlaystateApi(api).onPlaybackProgress({
itemId: item?.Id!,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: msToTicks(progress.value),
isPaused: false,
playMethod: stream?.url.includes("m3u8")
? "Transcode"
: "DirectStream",
playSessionId: stream.sessionId,
});
}
} }
}; }, [
isPlaying,
api,
item,
stream,
videoRef,
audioIndex,
subtitleIndex,
mediaSourceId,
offline,
progress.value,
]);
const reportPlaybackStopped = useCallback(async () => { const reportPlaybackStopped = useCallback(async () => {
if (offline) return; if (offline) return;
const currentTimeInTicks = msToTicks(progress.get());
const currentTimeInTicks = msToTicks(progress.value);
await getPlaystateApi(api!).onPlaybackStopped({ await getPlaystateApi(api!).onPlaybackStopped({
itemId: item?.Id!, itemId: item?.Id!,
mediaSourceId: mediaSourceId, mediaSourceId: mediaSourceId,
@@ -230,89 +255,56 @@ export default function page() {
videoRef.current?.stop(); videoRef.current?.stop();
}, [videoRef, reportPlaybackStopped]); }, [videoRef, reportPlaybackStopped]);
useEffect(() => { // TODO: unused should remove.
const beforeRemoveListener = navigation.addListener("beforeRemove", stop); const reportPlaybackStart = useCallback(async () => {
return () => { if (offline) return;
beforeRemoveListener();
};
}, [navigation, stop]);
const currentPlayStateInfo = () => {
if (!stream) return; if (!stream) return;
return { await getPlaystateApi(api!).onPlaybackStart({
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,
positionTicks: msToTicks(progress.get()), playMethod: stream.url?.includes("m3u8") ? "Transcode" : "DirectStream",
isPaused: !isPlaying, playSessionId: stream?.sessionId ? stream?.sessionId : undefined,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream", });
playSessionId: stream.sessionId, }, [api, item, mediaSourceId, stream]);
isMuted: false,
canSeek: true,
repeatMode: RepeatMode.RepeatNone,
playbackOrder: PlaybackOrder.Default,
};
};
const onProgress = useCallback( const onProgress = useCallback(
async (data: ProgressUpdatePayload) => { async (data: ProgressUpdatePayload) => {
if (isSeeking.get() || isPlaybackStopped) return; if (isSeeking.value === true) return;
if (isPlaybackStopped === true) return;
const { currentTime } = data.nativeEvent; const { currentTime } = data.nativeEvent;
if (isBuffering) { if (isBuffering) {
setIsBuffering(false); setIsBuffering(false);
} }
progress.set(currentTime); progress.value = currentTime;
if (offline) return; if (offline) return;
const currentTimeInTicks = msToTicks(currentTime);
if (!item?.Id || !stream) return; if (!item?.Id || !stream) return;
reportPlaybackProgress(); await getPlaystateApi(api!).onPlaybackProgress({
itemId: item.Id,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: Math.floor(currentTimeInTicks),
isPaused: !isPlaying,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
playSessionId: stream.sessionId,
});
}, },
[ [item?.Id, isPlaying, api, isPlaybackStopped, audioIndex, subtitleIndex]
item?.Id,
audioIndex,
subtitleIndex,
mediaSourceId,
isPlaying,
stream,
isSeeking,
isPlaybackStopped,
isBuffering,
],
); );
const onPipStarted = useCallback((e: PipStartedPayload) => { useOrientation();
const { pipStarted } = e.nativeEvent; useOrientationSettings();
setIsPipStarted(pipStarted);
}, []);
const reportPlaybackProgress = useCallback(async () => {
if (!api || offline || !stream) return;
await getPlaystateApi(api).reportPlaybackProgress({
playbackProgressInfo: currentPlayStateInfo() as PlaybackProgressInfo,
});
}, [
api,
isPlaying,
offline,
stream,
item?.Id,
audioIndex,
subtitleIndex,
mediaSourceId,
progress,
]);
const startPosition = useMemo(() => {
if (offline) return 0;
return item?.UserData?.PlaybackPositionTicks
? ticksToSeconds(item.UserData.PlaybackPositionTicks)
: 0;
}, [item]);
useWebSocket({ useWebSocket({
isPlaying: isPlaying, isPlaying: isPlaying,
@@ -321,94 +313,128 @@ export default function page() {
offline, offline,
}); });
const onPlaybackStateChanged = useCallback( const onPlaybackStateChanged = useCallback((e: PlaybackStatePayload) => {
async (e: PlaybackStatePayload) => { const { state, isBuffering, isPlaying } = e.nativeEvent;
const { state, isBuffering, isPlaying } = e.nativeEvent;
if (state === "Playing") {
setIsPlaying(true);
reportPlaybackProgress();
if (!Platform.isTV) await activateKeepAwakeAsync();
return;
}
if (state === "Paused") { if (state === "Playing") {
setIsPlaying(false); setIsPlaying(true);
reportPlaybackProgress(); return;
if (!Platform.isTV) await deactivateKeepAwake(); }
return;
}
if (isPlaying) { if (state === "Paused") {
setIsPlaying(true); setIsPlaying(false);
setIsBuffering(false); return;
} else if (isBuffering) { }
setIsBuffering(true);
}
},
[reportPlaybackProgress],
);
const allAudio = if (isPlaying) {
stream?.mediaSource.MediaStreams?.filter( setIsPlaying(true);
(audio) => audio.Type === "Audio", setIsBuffering(false);
) || []; } else if (isBuffering) {
setIsBuffering(true);
// Move all the external subtitles last, because vlc places them last. }
const allSubs =
stream?.mediaSource.MediaStreams?.filter(
(sub) => sub.Type === "Subtitle",
).sort((a, b) => Number(a.IsExternal) - Number(b.IsExternal)) || [];
const externalSubtitles = allSubs
.filter((sub: any) => sub.DeliveryMethod === "External")
.map((sub: any) => ({
name: sub.DisplayTitle,
DeliveryUrl: api?.basePath + sub.DeliveryUrl,
}));
const textSubs = allSubs.filter((sub) => sub.IsTextSubtitleStream);
const chosenSubtitleTrack = allSubs.find(
(sub) => sub.Index === subtitleIndex,
);
const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
const notTranscoding = !stream?.mediaSource.TranscodingUrl;
const initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
if (
chosenSubtitleTrack &&
(notTranscoding || chosenSubtitleTrack.IsTextSubtitleStream)
) {
const finalIndex = notTranscoding
? allSubs.indexOf(chosenSubtitleTrack)
: textSubs.indexOf(chosenSubtitleTrack);
initOptions.push(`--sub-track=${finalIndex}`);
}
if (notTranscoding && chosenAudioTrack) {
initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
}
const [isMounted, setIsMounted] = useState(false);
// Add useEffect to handle mounting
useEffect(() => {
setIsMounted(true);
return () => setIsMounted(false);
}, []); }, []);
if (itemStatus.isLoading || streamStatus.isLoading) { const startPosition = useMemo(() => {
if (offline) return 0;
return item?.UserData?.PlaybackPositionTicks
? ticksToSeconds(item.UserData.PlaybackPositionTicks)
: 0;
}, [item]);
useFocusEffect(
React.useCallback(() => {
return async () => {
stop();
};
}, [])
);
const [appState, setAppState] = useState(AppState.currentState);
useEffect(() => {
const handleAppStateChange = (nextAppState: AppStateStatus) => {
if (appState.match(/inactive|background/) && nextAppState === "active") {
// Handle app coming to the foreground
} else if (nextAppState.match(/inactive|background/)) {
// Handle app going to the background
if (videoRef.current && videoRef.current.pause) {
videoRef.current.pause();
}
}
setAppState(nextAppState);
};
// Use AppState.addEventListener and return a cleanup function
const subscription = AppState.addEventListener(
"change",
handleAppStateChange
);
return () => {
// Cleanup the event listener when the component is unmounted
subscription.remove();
};
}, [appState]);
// Preselection of audio and subtitle tracks.
if (!settings) return null;
let initOptions = [`--sub-text-scale=${settings.subtitleSize}`];
let externalTrack = { name: "", DeliveryUrl: "" };
const allSubs =
stream?.mediaSource.MediaStreams?.filter(
(sub) => sub.Type === "Subtitle"
) || [];
const chosenSubtitleTrack = allSubs.find(
(sub) => sub.Index === subtitleIndex
);
const allAudio =
stream?.mediaSource.MediaStreams?.filter(
(audio) => audio.Type === "Audio"
) || [];
const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
// Direct playback CASE
if (!bitrateValue) {
// If Subtitle is embedded we can use the position to select it straight away.
if (chosenSubtitleTrack && !chosenSubtitleTrack.DeliveryUrl) {
initOptions.push(`--sub-track=${allSubs.indexOf(chosenSubtitleTrack)}`);
} else if (chosenSubtitleTrack && chosenSubtitleTrack.DeliveryUrl) {
// If Subtitle is external we need to pass the URL to the player.
externalTrack = {
name: chosenSubtitleTrack.DisplayTitle || "",
DeliveryUrl: `${api?.basePath || ""}${chosenSubtitleTrack.DeliveryUrl}`,
};
}
if (chosenAudioTrack)
initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
} else {
// Transcoded playback CASE
if (chosenSubtitleTrack?.DeliveryMethod === "Hls") {
externalTrack = {
name: `subs ${chosenSubtitleTrack.DisplayTitle}`,
DeliveryUrl: "",
};
}
}
const insets = useSafeAreaInsets();
if (!item || isLoadingItem || isLoadingStreamUrl || !stream)
return ( return (
<View className='w-screen h-screen flex flex-col items-center justify-center bg-black'> <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
<Loader /> <Loader />
</View> </View>
); );
}
if (!item || !stream || itemStatus.isError || streamStatus.isError) if (isErrorItem || isErrorStreamUrl)
return ( return (
<View className='w-screen h-screen flex flex-col items-center justify-center bg-black'> <View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
<Text className='text-white'>{t("player.error")}</Text> <Text className="text-white">{t("player.error")}</Text>
</View> </View>
); );
@@ -429,18 +455,18 @@ export default function page() {
<VlcPlayerView <VlcPlayerView
ref={videoRef} ref={videoRef}
source={{ source={{
uri: stream?.url || "", uri: stream.url,
autoplay: true, autoplay: true,
isNetwork: true, isNetwork: true,
startPosition, startPosition,
externalSubtitles, externalTrack,
initOptions, initOptions,
}} }}
style={{ width: "100%", height: "100%" }} style={{ width: "100%", height: "100%" }}
onVideoProgress={onProgress} onVideoProgress={onProgress}
progressUpdateInterval={1000} progressUpdateInterval={1000}
onVideoStateChange={onPlaybackStateChanged} onVideoStateChange={onPlaybackStateChanged}
onPipStarted={onPipStarted} onVideoLoadStart={() => {}}
onVideoLoadEnd={() => { onVideoLoadEnd={() => {
setIsVideoLoaded(true); setIsVideoLoaded(true);
}} }}
@@ -448,13 +474,13 @@ export default function page() {
console.error("Video Error:", e.nativeEvent); console.error("Video Error:", e.nativeEvent);
Alert.alert( Alert.alert(
t("player.error"), t("player.error"),
t("player.an_error_occured_while_playing_the_video"), t("player.an_error_occured_while_playing_the_video")
); );
writeToLog("ERROR", "Video Error", e.nativeEvent); writeToLog("ERROR", "Video Error", e.nativeEvent);
}} }}
/> />
</View> </View>
{videoRef.current && !isPipStarted && isMounted === true ? ( {videoRef.current && (
<Controls <Controls
mediaSource={stream?.mediaSource} mediaSource={stream?.mediaSource}
item={item} item={item}
@@ -470,7 +496,6 @@ export default function page() {
setIgnoreSafeAreas={setIgnoreSafeAreas} setIgnoreSafeAreas={setIgnoreSafeAreas}
ignoreSafeAreas={ignoreSafeAreas} ignoreSafeAreas={ignoreSafeAreas}
isVideoLoaded={isVideoLoaded} isVideoLoaded={isVideoLoaded}
startPictureInPicture={videoRef?.current?.startPictureInPicture}
play={videoRef.current?.play} play={videoRef.current?.play}
pause={videoRef.current?.pause} pause={videoRef.current?.pause}
seek={videoRef.current?.seekTo} seek={videoRef.current?.seekTo}
@@ -481,9 +506,29 @@ export default function page() {
setSubtitleTrack={videoRef.current.setSubtitleTrack} setSubtitleTrack={videoRef.current.setSubtitleTrack}
setSubtitleURL={videoRef.current.setSubtitleURL} setSubtitleURL={videoRef.current.setSubtitleURL}
setAudioTrack={videoRef.current.setAudioTrack} setAudioTrack={videoRef.current.setAudioTrack}
stop={stop}
isVlc isVlc
/> />
) : null} )}
</View> </View>
); );
} }
export function usePoster(
item: BaseItemDto,
api: Api | null
): string | undefined {
const poster = useMemo(() => {
if (!item || !api) return undefined;
return item.Type === "Audio"
? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
: getBackdropUrl({
api,
item: item,
quality: 70,
width: 200,
});
}, [item, api]);
return poster ?? undefined;
}

View File

@@ -0,0 +1,547 @@
import { Text } from "@/components/common/Text";
import { Loader } from "@/components/Loader";
import { Controls } from "@/components/video-player/controls/Controls";
import { useOrientation } from "@/hooks/useOrientation";
import { useOrientationSettings } from "@/hooks/useOrientationSettings";
import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
import { useWebSocket } from "@/hooks/useWebsockets";
import { TrackInfo } from "@/modules/vlc-player";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useSettings } from "@/utils/atoms/settings";
import { getBackdropUrl } from "@/utils/jellyfin/image/getBackdropUrl";
import { getAuthHeaders } from "@/utils/jellyfin/jellyfin";
import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
import transcoding from "@/utils/profiles/transcoding";
import { secondsToTicks } from "@/utils/secondsToTicks";
import { Api } from "@jellyfin/sdk";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import {
getPlaystateApi,
getUserLibraryApi,
} from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query";
import { useHaptic } from "@/hooks/useHaptic";
import { useFocusEffect, useLocalSearchParams } from "expo-router";
import { useAtomValue } from "jotai";
import React, {
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from "react";
import { View } from "react-native";
import { useSharedValue } from "react-native-reanimated";
import Video, {
OnProgressData,
SelectedTrack,
SelectedTrackType,
VideoRef,
} from "react-native-video";
import { SubtitleHelper } from "@/utils/SubtitleHelper";
import { useTranslation } from "react-i18next";
const Player = () => {
const api = useAtomValue(apiAtom);
const user = useAtomValue(userAtom);
const [settings] = useSettings();
const videoRef = useRef<VideoRef | null>(null);
const { t } = useTranslation();
const firstTime = useRef(true);
const revalidateProgressCache = useInvalidatePlaybackProgressCache();
const lightHapticFeedback = useHaptic("light");
const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
const [showControls, _setShowControls] = useState(true);
const [ignoreSafeAreas, setIgnoreSafeAreas] = useState(false);
const [isPlaying, setIsPlaying] = useState(false);
const [isBuffering, setIsBuffering] = useState(true);
const [isVideoLoaded, setIsVideoLoaded] = useState(false);
const setShowControls = useCallback((show: boolean) => {
_setShowControls(show);
lightHapticFeedback();
}, []);
const progress = useSharedValue(0);
const isSeeking = useSharedValue(false);
const cacheProgress = useSharedValue(0);
const {
itemId,
audioIndex: audioIndexStr,
subtitleIndex: subtitleIndexStr,
mediaSourceId,
bitrateValue: bitrateValueStr,
} = useLocalSearchParams<{
itemId: string;
audioIndex: string;
subtitleIndex: string;
mediaSourceId: string;
bitrateValue: string;
}>();
const audioIndex = audioIndexStr ? parseInt(audioIndexStr, 10) : undefined;
const subtitleIndex = subtitleIndexStr
? parseInt(subtitleIndexStr, 10)
: undefined;
const bitrateValue = bitrateValueStr
? parseInt(bitrateValueStr, 10)
: undefined;
const {
data: item,
isLoading: isLoadingItem,
isError: isErrorItem,
} = useQuery({
queryKey: ["item", itemId],
queryFn: async () => {
if (!api) {
throw new Error("No api");
}
if (!itemId) {
console.warn("No itemId");
return null;
}
const res = await getUserLibraryApi(api).getItem({
itemId,
userId: user?.Id,
});
return res.data;
},
staleTime: 0,
});
// TODO: NEED TO FIND A WAY TO FROM SWITCHING TO IMAGE BASED TO TEXT BASED SUBTITLES, THERE IS A BUG.
// MOST LIKELY LIKELY NEED A MASSIVE REFACTOR.
const {
data: stream,
isLoading: isLoadingStreamUrl,
isError: isErrorStreamUrl,
} = useQuery({
queryKey: ["stream-url", itemId, bitrateValue, mediaSourceId, audioIndex],
queryFn: async () => {
if (!api) {
throw new Error("No api");
}
if (!item) {
console.warn("No item", itemId, item);
return null;
}
const res = await getStreamUrl({
api,
item,
startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
userId: user?.Id,
audioStreamIndex: audioIndex,
maxStreamingBitrate: bitrateValue,
mediaSourceId: mediaSourceId,
subtitleStreamIndex: subtitleIndex,
deviceProfile: transcoding,
});
if (!res) return null;
const { mediaSource, sessionId, url } = res;
if (!sessionId || !mediaSource || !url) {
console.warn("No sessionId or mediaSource or url", url);
return null;
}
return {
mediaSource,
sessionId,
url,
};
},
enabled: !!item,
staleTime: 0,
});
const poster = usePoster(item, api);
const videoSource = useVideoSource(item, api, poster, stream?.url);
const togglePlay = useCallback(async () => {
lightHapticFeedback();
if (isPlaying) {
videoRef.current?.pause();
await getPlaystateApi(api!).onPlaybackProgress({
itemId: item?.Id!,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: Math.floor(progress.value),
isPaused: true,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
playSessionId: stream?.sessionId,
});
} else {
videoRef.current?.resume();
await getPlaystateApi(api!).onPlaybackProgress({
itemId: item?.Id!,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: Math.floor(progress.value),
isPaused: false,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
playSessionId: stream?.sessionId,
});
}
}, [
isPlaying,
api,
item,
videoRef,
settings,
stream,
audioIndex,
subtitleIndex,
mediaSourceId,
]);
const play = useCallback(() => {
videoRef.current?.resume();
reportPlaybackStart();
}, [videoRef]);
const pause = useCallback(() => {
videoRef.current?.pause();
}, [videoRef]);
const seek = useCallback(
(seconds: number) => {
videoRef.current?.seek(seconds);
},
[videoRef]
);
const reportPlaybackStopped = async () => {
if (!item?.Id) return;
await getPlaystateApi(api!).onPlaybackStopped({
itemId: item.Id,
mediaSourceId: mediaSourceId,
positionTicks: Math.floor(progress.value),
playSessionId: stream?.sessionId,
});
revalidateProgressCache();
};
const stop = useCallback(() => {
reportPlaybackStopped();
videoRef.current?.pause();
setIsPlaybackStopped(true);
}, [videoRef, reportPlaybackStopped]);
const reportPlaybackStart = async () => {
if (!item?.Id) return;
await getPlaystateApi(api!).onPlaybackStart({
itemId: item.Id,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
playSessionId: stream?.sessionId,
});
};
const onProgress = useCallback(
async (data: OnProgressData) => {
if (isSeeking.value === true) return;
if (isPlaybackStopped === true) return;
const ticks = secondsToTicks(data.currentTime);
progress.value = ticks;
cacheProgress.value = secondsToTicks(data.playableDuration);
// TODO: Use this when streaming with HLS url, but NOT when direct playing
// TODO: since playable duration is always 0 then.
setIsBuffering(data.playableDuration === 0);
if (!item?.Id || data.currentTime === 0) {
return;
}
await getPlaystateApi(api!).onPlaybackProgress({
itemId: item.Id,
audioStreamIndex: audioIndex ? audioIndex : undefined,
subtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
mediaSourceId: mediaSourceId,
positionTicks: Math.round(ticks),
isPaused: !isPlaying,
playMethod: stream?.url.includes("m3u8") ? "Transcode" : "DirectStream",
playSessionId: stream?.sessionId,
});
},
[
item,
isPlaying,
api,
isPlaybackStopped,
isSeeking,
stream,
mediaSourceId,
audioIndex,
subtitleIndex,
]
);
useOrientation();
useOrientationSettings();
useWebSocket({
isPlaying: isPlaying,
togglePlay: togglePlay,
stopPlayback: stop,
offline: false,
});
const [selectedTextTrack, setSelectedTextTrack] = useState<
SelectedTrack | undefined
>();
const [embededTextTracks, setEmbededTextTracks] = useState<
{
index: number;
language?: string | undefined;
selected?: boolean | undefined;
title?: string | undefined;
type: any;
}[]
>([]);
const [audioTracks, setAudioTracks] = useState<TrackInfo[]>([]);
const [selectedAudioTrack, setSelectedAudioTrack] = useState<
SelectedTrack | undefined
>(undefined);
useEffect(() => {
if (selectedTextTrack === undefined) {
const subtitleHelper = new SubtitleHelper(
stream?.mediaSource.MediaStreams ?? []
);
const embeddedTrackIndex = subtitleHelper.getEmbeddedTrackIndex(
subtitleIndex!
);
// Most likely the subtitle is burned in.
if (embeddedTrackIndex === -1) return;
setSelectedTextTrack({
type: SelectedTrackType.INDEX,
value: embeddedTrackIndex,
});
}
}, [embededTextTracks]);
const getAudioTracks = (): TrackInfo[] => {
return audioTracks.map((t) => ({
name: t.name,
index: t.index,
}));
};
const getSubtitleTracks = (): TrackInfo[] => {
return embededTextTracks.map((t) => ({
name: t.title ?? "",
index: t.index,
language: t.language,
}));
};
useFocusEffect(
React.useCallback(() => {
return async () => {
stop();
};
}, [])
);
if (isLoadingItem || isLoadingStreamUrl)
return (
<View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
<Loader />
</View>
);
if (isErrorItem || isErrorStreamUrl)
return (
<View className="w-screen h-screen flex flex-col items-center justify-center bg-black">
<Text className="text-white">{t("player.error")}</Text>
</View>
);
return (
<View style={{ flex: 1, backgroundColor: "black" }}>
<View
style={{
display: "flex",
width: "100%",
height: "100%",
position: "relative",
flexDirection: "column",
justifyContent: "center",
}}
>
{videoSource ? (
<>
<Video
ref={videoRef}
source={videoSource}
style={{
height: "100%",
width: "100%",
}}
resizeMode={ignoreSafeAreas ? "cover" : "contain"}
onProgress={onProgress}
onError={(e) => {
console.error("Error playing video", e);
}}
onLoad={() => {
if (firstTime.current === true) {
play();
firstTime.current = false;
}
}}
progressUpdateInterval={500}
playWhenInactive={true}
allowsExternalPlayback={true}
playInBackground={true}
showNotificationControls={true}
ignoreSilentSwitch="ignore"
fullscreen={false}
onPlaybackStateChanged={(state) => {
if (isSeeking.value === false) setIsPlaying(state.isPlaying);
}}
onTextTracks={(data) => {
setEmbededTextTracks(data.textTracks as any);
}}
onBuffer={(e) => {
setIsBuffering(e.isBuffering);
}}
onAudioTracks={(e) => {
setAudioTracks(
e.audioTracks.map((t) => ({
index: t.index,
name: t.title ?? "",
language: t.language,
}))
);
}}
selectedTextTrack={selectedTextTrack}
selectedAudioTrack={selectedAudioTrack}
/>
</>
) : (
<Text>{t("player.no_video_source")}</Text>
)}
</View>
{item && (
<Controls
mediaSource={stream?.mediaSource}
videoRef={videoRef}
enableTrickplay={true}
item={item}
togglePlay={togglePlay}
isPlaying={isPlaying}
isSeeking={isSeeking}
progress={progress}
cacheProgress={cacheProgress}
isBuffering={isBuffering}
showControls={showControls}
setShowControls={setShowControls}
setIgnoreSafeAreas={setIgnoreSafeAreas}
ignoreSafeAreas={ignoreSafeAreas}
seek={seek}
play={play}
pause={pause}
stop={stop}
getSubtitleTracks={getSubtitleTracks}
setSubtitleTrack={(i) => {
if (i === -1) {
setSelectedTextTrack({
type: SelectedTrackType.DISABLED,
value: undefined,
});
return;
}
setSelectedTextTrack({
type: SelectedTrackType.INDEX,
value: i,
});
}}
getAudioTracks={getAudioTracks}
setAudioTrack={(i) => {
setSelectedAudioTrack({
type: SelectedTrackType.INDEX,
value: i,
});
}}
/>
)}
</View>
);
};
export function usePoster(
item: BaseItemDto | null | undefined,
api: Api | null
): string | undefined {
const poster = useMemo(() => {
if (!item || !api) return undefined;
return item.Type === "Audio"
? `${api.basePath}/Items/${item.AlbumId}/Images/Primary?tag=${item.AlbumPrimaryImageTag}&quality=90&maxHeight=200&maxWidth=200`
: getBackdropUrl({
api,
item: item,
quality: 70,
width: 200,
});
}, [item, api]);
return poster ?? undefined;
}
export function useVideoSource(
item: BaseItemDto | null | undefined,
api: Api | null,
poster: string | undefined,
url?: string | null
) {
const videoSource = useMemo(() => {
if (!item || !api || !url) {
return null;
}
const startPosition = item?.UserData?.PlaybackPositionTicks
? Math.round(item.UserData.PlaybackPositionTicks / 10000)
: 0;
return {
uri: url,
isNetwork: true,
startPosition,
headers: getAuthHeaders(api),
metadata: {
title: item?.Name || "Unknown",
description: item?.Overview ?? undefined,
imageUri: poster,
subtitle: item?.Album ?? undefined,
},
};
}, [item, api, poster, url]);
return videoSource;
}
export default Player;

View File

@@ -1,5 +1,5 @@
import { ScrollViewStyleReset } from "expo-router/html"; import { ScrollViewStyleReset } from "expo-router/html";
import type { PropsWithChildren } from "react"; import { type PropsWithChildren } from "react";
/** /**
* This file is web-only and used to configure the root HTML for every web page during static rendering. * This file is web-only and used to configure the root HTML for every web page during static rendering.
@@ -7,13 +7,13 @@ import type { PropsWithChildren } from "react";
*/ */
export default function Root({ children }: PropsWithChildren) { export default function Root({ children }: PropsWithChildren) {
return ( return (
<html lang='en'> <html lang="en">
<head> <head>
<meta charSet='utf-8' /> <meta charSet="utf-8" />
<meta httpEquiv='X-UA-Compatible' content='IE=edge' /> <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
<meta <meta
name='viewport' name="viewport"
content='width=device-width, initial-scale=1, shrink-to-fit=no' content="width=device-width, initial-scale=1, shrink-to-fit=no"
/> />
{/* {/*

View File

@@ -9,9 +9,9 @@ export default function NotFoundScreen() {
<> <>
<Stack.Screen options={{ title: "Oops!" }} /> <Stack.Screen options={{ title: "Oops!" }} />
<ThemedView style={styles.container}> <ThemedView style={styles.container}>
<ThemedText type='title'>This screen doesn't exist.</ThemedText> <ThemedText type="title">This screen doesn't exist.</ThemedText>
<Link href={"/home"} style={styles.link}> <Link href={"/home"} style={styles.link}>
<ThemedText type='link'>Go to home screen!</ThemedText> <ThemedText type="link">Go to home screen!</ThemedText>
</Link> </Link>
</ThemedView> </ThemedView>
</> </>

View File

@@ -1,28 +1,28 @@
import "@/augmentations"; import "@/augmentations";
import { Platform } from "react-native";
import { Text } from "@/components/common/Text";
import i18n from "@/i18n"; import i18n from "@/i18n";
import { DownloadProvider } from "@/providers/DownloadProvider"; import { DownloadProvider } from "@/providers/DownloadProvider";
import { import {
JellyfinProvider,
apiAtom,
getOrSetDeviceId, getOrSetDeviceId,
getTokenFromStorage, getTokenFromStorage,
JellyfinProvider,
} from "@/providers/JellyfinProvider"; } from "@/providers/JellyfinProvider";
import { JobQueueProvider } from "@/providers/JobQueueProvider"; import { JobQueueProvider } from "@/providers/JobQueueProvider";
import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider"; import { PlaySettingsProvider } from "@/providers/PlaySettingsProvider";
import { WebSocketProvider } from "@/providers/WebSocketProvider";
import { type Settings, useSettings } from "@/utils/atoms/settings";
import { import {
BACKGROUND_FETCH_TASK, SplashScreenProvider,
BACKGROUND_FETCH_TASK_SESSIONS, useSplashScreenLoading,
registerBackgroundFetchAsyncSessions, } from "@/providers/SplashScreenProvider";
} from "@/utils/background-tasks"; import { WebSocketProvider } from "@/providers/WebSocketProvider";
import { LogProvider, writeErrorLog, writeToLog } from "@/utils/log"; import { Settings, useSettings } from "@/utils/atoms/settings";
import { BACKGROUND_FETCH_TASK } from "@/utils/background-tasks";
import { LogProvider, writeToLog } from "@/utils/log";
import { storage } from "@/utils/mmkv"; import { storage } from "@/utils/mmkv";
import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server"; import { cancelJobById, getAllJobsByDeviceId } from "@/utils/optimize-server";
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 type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import { Platform } from "react-native";
const BackGroundDownloader = !Platform.isTV const BackGroundDownloader = !Platform.isTV
? require("@kesha-antonov/react-native-background-downloader") ? require("@kesha-antonov/react-native-background-downloader")
: null; : null;
@@ -32,29 +32,20 @@ const BackgroundFetch = !Platform.isTV
? require("expo-background-fetch") ? require("expo-background-fetch")
: null; : null;
import * as FileSystem from "expo-file-system"; import * as FileSystem from "expo-file-system";
import { useFonts } from "expo-font";
import { useKeepAwake } from "expo-keep-awake";
const Notifications = !Platform.isTV ? require("expo-notifications") : null; const Notifications = !Platform.isTV ? require("expo-notifications") : null;
import { router, Stack } from "expo-router";
import * as ScreenOrientation from "@/packages/expo-screen-orientation"; import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { Stack, router, useSegments } from "expo-router";
import * as SplashScreen from "expo-splash-screen";
const TaskManager = !Platform.isTV ? require("expo-task-manager") : null; const TaskManager = !Platform.isTV ? require("expo-task-manager") : null;
import { getLocales } from "expo-localization"; import { getLocales } from "expo-localization";
import { Provider as JotaiProvider } from "jotai"; import { Provider as JotaiProvider } from "jotai";
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef } from "react";
import { I18nextProvider } from "react-i18next"; import { I18nextProvider, useTranslation } from "react-i18next";
import { AppState, Appearance } from "react-native"; import { Appearance, AppState } from "react-native";
import { SystemBars } from "react-native-edge-to-edge"; import { SystemBars } from "react-native-edge-to-edge";
import { GestureHandlerRootView } from "react-native-gesture-handler"; import { GestureHandlerRootView } from "react-native-gesture-handler";
import "react-native-reanimated"; import "react-native-reanimated";
import { userAtom } from "@/providers/JellyfinProvider";
import { store } from "@/utils/store";
import { getSessionApi } from "@jellyfin/sdk/lib/utils/api/session-api";
import type { EventSubscription } from "expo-modules-core";
import type {
Notification,
NotificationResponse,
} from "expo-notifications/build/Notifications.types";
import type { ExpoPushToken } from "expo-notifications/build/Tokens.types";
import { useAtom } from "jotai";
import { Toaster } from "sonner-native"; import { Toaster } from "sonner-native";
if (!Platform.isTV) { if (!Platform.isTV) {
@@ -67,41 +58,30 @@ if (!Platform.isTV) {
}); });
} }
// Keep the splash screen visible while we fetch resources
SplashScreen.preventAutoHideAsync();
// Set the animation options. This is optional.
SplashScreen.setOptions({
duration: 500,
fade: true,
});
function useNotificationObserver() { function useNotificationObserver() {
if (Platform.isTV) return; if (Platform.isTV) return;
useEffect(() => { useEffect(() => {
let isMounted = true; let isMounted = true;
function redirect(notification: typeof Notifications.Notification) { function redirect(notification: Notifications.Notification) {
const url = notification.request.content.data?.url; const url = notification.request.content.data?.url;
if (url) { if (url) {
router.push(url); router.push(url);
} }
} }
Notifications.getLastNotificationResponseAsync().then( Notifications.getLastNotificationResponseAsync().then((response) => {
(response: { notification: any }) => { if (!isMounted || !response?.notification) {
if (!isMounted || !response?.notification) { return;
return; }
} redirect(response?.notification);
redirect(response?.notification); });
},
);
const subscription = Notifications.addNotificationResponseReceivedListener( const subscription = Notifications.addNotificationResponseReceivedListener(
(response: { notification: any }) => { (response) => {
redirect(response.notification); redirect(response.notification);
}, }
); );
return () => { return () => {
@@ -112,22 +92,6 @@ function useNotificationObserver() {
} }
if (!Platform.isTV) { if (!Platform.isTV) {
TaskManager.defineTask(BACKGROUND_FETCH_TASK_SESSIONS, async () => {
console.log("TaskManager ~ sessions trigger");
const api = store.get(apiAtom);
if (api === null || api === undefined) return;
const response = await getSessionApi(api).getSessions({
activeWithinSeconds: 360,
});
const result = response.data.filter((s) => s.NowPlayingItem);
Notifications.setBadgeCountAsync(result.length);
return BackgroundFetch.BackgroundFetchResult.NewData;
});
TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => { TaskManager.defineTask(BACKGROUND_FETCH_TASK, async () => {
console.log("TaskManager ~ trigger"); console.log("TaskManager ~ trigger");
@@ -158,12 +122,12 @@ if (!Platform.isTV) {
console.log("TaskManager ~ Active jobs: ", jobs.length); console.log("TaskManager ~ Active jobs: ", jobs.length);
for (const job of jobs) { for (let job of jobs) {
if (job.status === "completed") { if (job.status === "completed") {
const downloadUrl = url + "download/" + job.id; const downloadUrl = url + "download/" + job.id;
const tasks = await BackGroundDownloader.checkForExistingDownloads(); const tasks = await BackGroundDownloader.checkForExistingDownloads();
if (tasks.find((task: { id: string }) => task.id === job.id)) { if (tasks.find((task) => task.id === job.id)) {
console.log("TaskManager ~ Download already in progress: ", job.id); console.log("TaskManager ~ Download already in progress: ", job.id);
continue; continue;
} }
@@ -199,9 +163,9 @@ if (!Platform.isTV) {
trigger: null, trigger: null,
}); });
}) })
.error((error: any) => { .error((error) => {
console.log("TaskManager ~ Download error: ", job.id, error); console.log("TaskManager ~ Download error: ", job.id, error);
BackGroundDownloader.completeHandler(job.id); completeHandler(job.id);
Notifications.scheduleNotificationAsync({ Notifications.scheduleNotificationAsync({
content: { content: {
title: job.item.Name, title: job.item.Name,
@@ -226,7 +190,7 @@ if (!Platform.isTV) {
const checkAndRequestPermissions = async () => { const checkAndRequestPermissions = async () => {
try { try {
const hasAskedBefore = storage.getString( const hasAskedBefore = storage.getString(
"hasAskedForNotificationPermission", "hasAskedForNotificationPermission"
); );
if (hasAskedBefore !== "true") { if (hasAskedBefore !== "true") {
@@ -248,7 +212,7 @@ const checkAndRequestPermissions = async () => {
writeToLog( writeToLog(
"ERROR", "ERROR",
"Error checking/requesting notification permissions:", "Error checking/requesting notification permissions:",
error, error
); );
console.error("Error checking/requesting notification permissions:", error); console.error("Error checking/requesting notification permissions:", error);
} }
@@ -258,15 +222,17 @@ export default function RootLayout() {
Appearance.setColorScheme("dark"); Appearance.setColorScheme("dark");
return ( return (
<GestureHandlerRootView style={{ flex: 1 }}> <SplashScreenProvider>
<JotaiProvider> <GestureHandlerRootView style={{ flex: 1 }}>
<ActionSheetProvider> <JotaiProvider>
<I18nextProvider i18n={i18n}> <ActionSheetProvider>
<Layout /> <I18nextProvider i18n={i18n}>
</I18nextProvider> <Layout />
</ActionSheetProvider> </I18nextProvider>
</JotaiProvider> </ActionSheetProvider>
</GestureHandlerRootView> </JotaiProvider>
</GestureHandlerRootView>
</SplashScreenProvider>
); );
} }
@@ -284,106 +250,32 @@ const queryClient = new QueryClient({
function Layout() { function Layout() {
const [settings] = useSettings(); const [settings] = useSettings();
const [user] = useAtom(userAtom);
const [api] = useAtom(apiAtom);
const appState = useRef(AppState.currentState); const appState = useRef(AppState.currentState);
const segments = useSegments();
useEffect(() => { useEffect(() => {
i18n.changeLanguage( i18n.changeLanguage(
settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en", settings?.preferedLanguage ?? getLocales()[0].languageCode ?? "en"
); );
}, [settings?.preferedLanguage, i18n]); }, [settings?.preferedLanguage, i18n]);
if (!Platform.isTV) { if (!Platform.isTV) {
useKeepAwake();
useNotificationObserver(); useNotificationObserver();
const [expoPushToken, setExpoPushToken] = useState<ExpoPushToken>(); const { i18n } = useTranslation();
const notificationListener = useRef<EventSubscription>();
const responseListener = useRef<EventSubscription>();
useEffect(() => { useEffect(() => {
if (expoPushToken && api && user) { checkAndRequestPermissions();
api
?.post("/Streamyfin/device", {
token: expoPushToken.data,
deviceId: getOrSetDeviceId(),
userId: user.Id,
})
.then((_) => console.log("Posted expo push token"))
.catch((_) =>
writeErrorLog("Failed to push expo push token to plugin"),
);
} else console.log("No token available");
}, [api, expoPushToken, user]);
async function registerNotifications() {
if (Platform.OS === "android") {
console.log("Setting android notification channel 'default'");
await Notifications?.setNotificationChannelAsync("default", {
name: "default",
});
}
await checkAndRequestPermissions();
if (!Platform.isTV && user && user.Policy?.IsAdministrator) {
await registerBackgroundFetchAsyncSessions();
}
Notifications?.getExpoPushTokenAsync()
.then((token: ExpoPushToken) => token && setExpoPushToken(token))
.catch((reason: any) => console.log("Failed to get token", reason));
}
useEffect(() => {
registerNotifications();
notificationListener.current =
Notifications?.addNotificationReceivedListener(
(notification: Notification) => {
console.log(
"Notification received while app running",
notification,
);
},
);
responseListener.current =
Notifications?.addNotificationResponseReceivedListener(
(response: NotificationResponse) => {
console.log("Notification interacted with", response);
},
);
return () => {
notificationListener.current &&
Notifications?.removeNotificationSubscription(
notificationListener.current,
);
responseListener.current &&
Notifications?.removeNotificationSubscription(
responseListener.current,
);
};
}, []); }, []);
useEffect(() => { useEffect(() => {
if (Platform.isTV) return; if (settings?.autoRotate === true)
if (segments.includes("direct-player" as never)) { ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.DEFAULT);
return; else
}
// If the user has auto rotate enabled, unlock the orientation
if (settings.followDeviceOrientation === true) {
ScreenOrientation.unlockAsync();
} else {
// If the user has auto rotate disabled, lock the orientation to portrait
ScreenOrientation.lockAsync( ScreenOrientation.lockAsync(
ScreenOrientation.OrientationLock.PORTRAIT_UP, ScreenOrientation.OrientationLock.PORTRAIT_UP
); );
} }, [settings]);
}, [settings.followDeviceOrientation, segments]);
useEffect(() => { useEffect(() => {
const subscription = AppState.addEventListener( const subscription = AppState.addEventListener(
@@ -395,7 +287,7 @@ function Layout() {
) { ) {
BackGroundDownloader.checkForExistingDownloads(); BackGroundDownloader.checkForExistingDownloads();
} }
}, }
); );
BackGroundDownloader.checkForExistingDownloads(); BackGroundDownloader.checkForExistingDownloads();
@@ -406,6 +298,16 @@ function Layout() {
}, []); }, []);
} }
const [loaded] = useFonts({
SpaceMono: require("../assets/fonts/SpaceMono-Regular.ttf"),
});
useSplashScreenLoading(!loaded);
if (!loaded) {
return null;
}
return ( return (
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
<JobQueueProvider> <JobQueueProvider>
@@ -415,11 +317,11 @@ function Layout() {
<WebSocketProvider> <WebSocketProvider>
<DownloadProvider> <DownloadProvider>
<BottomSheetModalProvider> <BottomSheetModalProvider>
<SystemBars style='light' hidden={false} /> <SystemBars style="light" hidden={false} />
<ThemeProvider value={DarkTheme}> <ThemeProvider value={DarkTheme}>
<Stack initialRouteName='(auth)/(tabs)'> <Stack>
<Stack.Screen <Stack.Screen
name='(auth)/(tabs)' name="(auth)/(tabs)"
options={{ options={{
headerShown: false, headerShown: false,
title: "", title: "",
@@ -427,7 +329,7 @@ function Layout() {
}} }}
/> />
<Stack.Screen <Stack.Screen
name='(auth)/player' name="(auth)/player"
options={{ options={{
headerShown: false, headerShown: false,
title: "", title: "",
@@ -435,14 +337,14 @@ function Layout() {
}} }}
/> />
<Stack.Screen <Stack.Screen
name='login' name="login"
options={{ options={{
headerShown: true, headerShown: true,
title: "", title: "",
headerTransparent: true, headerTransparent: true,
}} }}
/> />
<Stack.Screen name='+not-found' /> <Stack.Screen name="+not-found" />
</Stack> </Stack>
<Toaster <Toaster
duration={4000} duration={4000}
@@ -473,7 +375,7 @@ function Layout() {
function saveDownloadedItemInfo(item: BaseItemDto) { function saveDownloadedItemInfo(item: BaseItemDto) {
try { try {
const downloadedItems = storage.getString("downloadedItems"); const downloadedItems = storage.getString("downloadedItems");
const items: BaseItemDto[] = downloadedItems let items: BaseItemDto[] = downloadedItems
? JSON.parse(downloadedItems) ? JSON.parse(downloadedItems)
: []; : [];

View File

@@ -1,17 +1,16 @@
import { Button } from "@/components/Button"; import { Button } from "@/components/Button";
import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
import { PreviousServersList } from "@/components/PreviousServersList";
import { Input } from "@/components/common/Input"; import { Input } from "@/components/common/Input";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import JellyfinServerDiscovery from "@/components/JellyfinServerDiscovery";
import { PreviousServersList } from "@/components/PreviousServersList";
import { Colors } from "@/constants/Colors"; import { Colors } from "@/constants/Colors";
import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider"; import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import type { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client"; import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useLocalSearchParams, useNavigation } from "expo-router"; import { useLocalSearchParams, useNavigation } from "expo-router";
import { useAtomValue } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import React, { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import { import {
Alert, Alert,
KeyboardAvoidingView, KeyboardAvoidingView,
@@ -20,20 +19,17 @@ import {
TouchableOpacity, TouchableOpacity,
View, View,
} from "react-native"; } from "react-native";
import { Keyboard } from "react-native";
import { t } from "i18next";
import { z } from "zod"; import { z } from "zod";
import { t } from 'i18next';
const CredentialsSchema = z.object({ const CredentialsSchema = z.object({
username: z.string().min(1, t("login.username_required")), username: z.string().min(1, t("login.username_required")),});
});
const Login: React.FC = () => { const Login: React.FC = () => {
const api = useAtomValue(apiAtom);
const navigation = useNavigation();
const params = useLocalSearchParams();
const { setServer, login, removeServer, initiateQuickConnect } = const { setServer, login, removeServer, initiateQuickConnect } =
useJellyfin(); useJellyfin();
const [api] = useAtom(apiAtom);
const params = useLocalSearchParams();
const { const {
apiUrl: _apiUrl, apiUrl: _apiUrl,
@@ -41,8 +37,6 @@ const Login: React.FC = () => {
password: _password, password: _password,
} = params as { apiUrl: string; username: string; password: string }; } = params as { apiUrl: string; username: string; password: string };
const [loadingServerCheck, setLoadingServerCheck] = 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<{
@@ -53,13 +47,12 @@ const Login: React.FC = () => {
password: _password, password: _password,
}); });
/**
* A way to auto login based on a link
*/
useEffect(() => { useEffect(() => {
(async () => { (async () => {
// we might re-use the checkUrl function here to check the url as well
// however, I don't think it should be necessary for now
if (_apiUrl) { if (_apiUrl) {
await setServer({ setServer({
address: _apiUrl, address: _apiUrl,
}); });
@@ -73,6 +66,7 @@ const Login: React.FC = () => {
})(); })();
}, [_apiUrl, _username, _password]); }, [_apiUrl, _username, _password]);
const navigation = useNavigation();
useEffect(() => { useEffect(() => {
navigation.setOptions({ navigation.setOptions({
headerTitle: serverName, headerTitle: serverName,
@@ -82,20 +76,18 @@ const Login: React.FC = () => {
onPress={() => { onPress={() => {
removeServer(); removeServer();
}} }}
className='flex flex-row items-center' className="flex flex-row items-center"
> >
<Ionicons name='chevron-back' size={18} color={Colors.primary} /> <Ionicons name="chevron-back" size={18} color={Colors.primary} />
<Text className='ml-2 text-purple-600'> <Text className="ml-2 text-purple-600">{t("login.change_server")}</Text>
{t("login.change_server")}
</Text>
</TouchableOpacity> </TouchableOpacity>
) : null, ) : null,
}); });
}, [serverName, navigation, api?.basePath]); }, [serverName, navigation, api?.basePath]);
const handleLogin = async () => { const [loading, setLoading] = useState<boolean>(false);
Keyboard.dismiss();
const handleLogin = async () => {
setLoading(true); setLoading(true);
try { try {
const result = CredentialsSchema.safeParse(credentials); const result = CredentialsSchema.safeParse(credentials);
@@ -106,16 +98,15 @@ const Login: React.FC = () => {
if (error instanceof Error) { if (error instanceof Error) {
Alert.alert(t("login.connection_failed"), error.message); Alert.alert(t("login.connection_failed"), error.message);
} else { } else {
Alert.alert( Alert.alert(t("login.connection_failed"), t("login.an_unexpected_error_occured"));
t("login.connection_failed"),
t("login.an_unexpected_error_occured"),
);
} }
} finally { } finally {
setLoading(false); setLoading(false);
} }
}; };
const [loadingServerCheck, setLoadingServerCheck] = useState<boolean>(false);
/** /**
* Checks the availability and validity of a Jellyfin server URL. * Checks the availability and validity of a Jellyfin server URL.
* *
@@ -177,33 +168,26 @@ const Login: React.FC = () => {
if (result === undefined) { if (result === undefined) {
Alert.alert( Alert.alert(
t("login.connection_failed"), t("login.connection_failed"),
t("login.could_not_connect_to_server"), t("login.could_not_connect_to_server")
); );
return; return;
} }
await setServer({ address: url }); setServer({ address: url });
}, []); }, []);
const handleQuickConnect = async () => { const handleQuickConnect = async () => {
try { try {
const code = await initiateQuickConnect(); const code = await initiateQuickConnect();
if (code) { if (code) {
Alert.alert( Alert.alert(t("login.quick_connect"), t("login.enter_code_to_login", {code: code}), [
t("login.quick_connect"), {
t("login.enter_code_to_login", { code: code }), text: t("login.got_it"),
[ },
{ ]);
text: t("login.got_it"),
},
],
);
} }
} catch (error) { } catch (error) {
Alert.alert( Alert.alert(t("login.error_title"), t("login.failed_to_initiate_quick_connect"));
t("login.error_title"),
t("login.failed_to_initiate_quick_connect"),
);
} }
}; };
@@ -214,22 +198,20 @@ const Login: React.FC = () => {
> >
{api?.basePath ? ( {api?.basePath ? (
<> <>
<View className='flex flex-col h-full relative 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">
<> <>
{serverName ? ( {serverName ? (
<> <>
{t("login.login_to_title") + " "} {t("login.login_to_title") + " "}
<Text className='text-purple-600'>{serverName}</Text> <Text className="text-purple-600">{serverName}</Text>
</> </>
) : ( ) : t("login.login_title")}
t("login.login_title") </>
)} </Text>
</> <Text className="text-xs text-neutral-400">
</Text>
<Text className='text-xs text-neutral-400'>
{api.basePath} {api.basePath}
</Text> </Text>
<Input <Input
@@ -238,13 +220,13 @@ const Login: React.FC = () => {
setCredentials({ ...credentials, username: text }) setCredentials({ ...credentials, username: text })
} }
value={credentials.username} value={credentials.username}
keyboardType='default' autoFocus
returnKeyType='done' secureTextEntry={false}
autoCapitalize='none' keyboardType="default"
// Changed from username to oneTimeCode because it is a known issue in RN returnKeyType="done"
// https://github.com/facebook/react-native/issues/47106#issuecomment-2521270037 autoCapitalize="none"
textContentType='oneTimeCode' textContentType="username"
clearButtonMode='while-editing' clearButtonMode="while-editing"
maxLength={500} maxLength={500}
/> />
@@ -255,42 +237,42 @@ const Login: React.FC = () => {
} }
value={credentials.password} value={credentials.password}
secureTextEntry secureTextEntry
keyboardType='default' keyboardType="default"
returnKeyType='done' returnKeyType="done"
autoCapitalize='none' autoCapitalize="none"
textContentType='password' textContentType="password"
clearButtonMode='while-editing' clearButtonMode="while-editing"
maxLength={500} maxLength={500}
/> />
<View className='flex flex-row items-center justify-between'> <View className="flex flex-row items-center justify-between">
<Button <Button
onPress={handleLogin} onPress={handleLogin}
loading={loading} loading={loading}
className='flex-1 mr-2' className="flex-1 mr-2"
> >
{t("login.login_button")} {t("login.login_button")}
</Button> </Button>
<TouchableOpacity <TouchableOpacity
onPress={handleQuickConnect} onPress={handleQuickConnect}
className='p-2 bg-neutral-900 rounded-xl h-12 w-12 flex items-center justify-center' className="p-2 bg-neutral-900 rounded-xl h-12 w-12 flex items-center justify-center"
> >
<MaterialCommunityIcons <MaterialCommunityIcons
name='cellphone-lock' name="cellphone-lock"
size={24} size={24}
color='white' color="white"
/> />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
</View> </View>
<View className='absolute bottom-0 left-0 w-full px-4 mb-2'></View> <View className="absolute bottom-0 left-0 w-full px-4 mb-2"></View>
</View> </View>
</> </>
) : ( ) : (
<> <>
<View className='flex flex-col h-full 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={{
width: 100, width: 100,
@@ -300,43 +282,41 @@ const Login: React.FC = () => {
}} }}
source={require("@/assets/images/StreamyFinFinal.png")} source={require("@/assets/images/StreamyFinFinal.png")}
/> />
<Text className='text-3xl font-bold'>Streamyfin</Text> <Text className="text-3xl font-bold">Streamyfin</Text>
<Text className='text-neutral-500'> <Text className="text-neutral-500">
{t("server.enter_url_to_jellyfin_server")} {t("server.enter_url_to_jellyfin_server")}
</Text> </Text>
<Input <Input
aria-label='Server URL' aria-label="Server URL"
placeholder={t("server.server_url_placeholder")} placeholder={t("server.server_url_placeholder")}
onChangeText={setServerURL} onChangeText={setServerURL}
value={serverURL} value={serverURL}
keyboardType='url' keyboardType="url"
returnKeyType='done' returnKeyType="done"
autoCapitalize='none' autoCapitalize="none"
textContentType='URL' textContentType="URL"
maxLength={500} maxLength={500}
/> />
<Button <Button
loading={loadingServerCheck} loading={loadingServerCheck}
disabled={loadingServerCheck} disabled={loadingServerCheck}
onPress={async () => { onPress={async () => await handleConnect(serverURL)}
await handleConnect(serverURL); className="w-full grow"
}}
className='w-full grow'
> >
{t("server.connect_button")} {t("server.connect_button")}
</Button> </Button>
<JellyfinServerDiscovery <JellyfinServerDiscovery
onServerSelect={async (server) => { onServerSelect={(server) => {
setServerURL(server.address); setServerURL(server.address);
if (server.serverName) { if (server.serverName) {
setServerName(server.serverName); setServerName(server.serverName);
} }
await handleConnect(server.address); handleConnect(server.address);
}} }}
/> />
<PreviousServersList <PreviousServersList
onServerSelect={async (s) => { onServerSelect={(s) => {
await handleConnect(s.address); handleConnect(s.address);
}} }}
/> />
</View> </View>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -1,21 +1,17 @@
import type { StreamyfinPluginConfig } from "@/utils/atoms/settings"; import { Api, AUTHORIZATION_HEADER } from "@jellyfin/sdk";
import { AUTHORIZATION_HEADER, Api } from "@jellyfin/sdk"; import { AxiosRequestConfig, AxiosResponse } from "axios";
import type { AxiosRequestConfig, AxiosResponse } from "axios"; import { StreamyfinPluginConfig } from "@/utils/atoms/settings";
declare module "@jellyfin/sdk" { declare module "@jellyfin/sdk" {
interface Api { interface Api {
get<T, D = any>( get<T, D = any>(
url: string, url: string,
config?: AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>
): Promise<AxiosResponse<T>>; ): Promise<AxiosResponse<T>>;
post<T, D = any>( post<T, D = any>(
url: string, url: string,
data: D, data: D,
config?: AxiosRequestConfig<D>, config?: AxiosRequestConfig<D>
): Promise<AxiosResponse<T>>;
delete<T, D = any>(
url: string,
config?: AxiosRequestConfig<D>,
): Promise<AxiosResponse<T>>; ): Promise<AxiosResponse<T>>;
getStreamyfinPluginConfig(): Promise<AxiosResponse<StreamyfinPluginConfig>>; getStreamyfinPluginConfig(): Promise<AxiosResponse<StreamyfinPluginConfig>>;
} }
@@ -23,7 +19,7 @@ declare module "@jellyfin/sdk" {
Api.prototype.get = function <T, D = any>( Api.prototype.get = function <T, D = any>(
url: string, url: string,
config: AxiosRequestConfig<D> = {}, config: AxiosRequestConfig<D> = {}
): Promise<AxiosResponse<T>> { ): Promise<AxiosResponse<T>> {
return this.axiosInstance.get<T>(`${this.basePath}${url}`, { return this.axiosInstance.get<T>(`${this.basePath}${url}`, {
...(config ?? {}), ...(config ?? {}),
@@ -34,20 +30,11 @@ Api.prototype.get = function <T, D = any>(
Api.prototype.post = function <T, D = any>( Api.prototype.post = function <T, D = any>(
url: string, url: string,
data: D, data: D,
config: AxiosRequestConfig<D>, config: AxiosRequestConfig<D>
): Promise<AxiosResponse<T>> { ): Promise<AxiosResponse<T>> {
return this.axiosInstance.post<T>(`${this.basePath}${url}`, data, { return this.axiosInstance.post<T>(`${this.basePath}${url}`, {
...(config || {}),
headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
});
};
Api.prototype.delete = function <T, D = any>(
url: string,
config: AxiosRequestConfig<D>,
): Promise<AxiosResponse<T>> {
return this.axiosInstance.delete<T>(`${this.basePath}${url}`, {
...(config || {}), ...(config || {}),
data,
headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader }, headers: { [AUTHORIZATION_HEADER]: this.authorizationHeader },
}); });
}; };

View File

@@ -1,21 +1,22 @@
import { MMKV } from "react-native-mmkv"; import {MMKV} from "react-native-mmkv";
declare module "react-native-mmkv" { declare module "react-native-mmkv" {
interface MMKV { interface MMKV {
get<T>(key: string): T | undefined; get<T>(key: string): T | undefined
setAny(key: string, value: any | undefined): void; setAny(key: string, value: any | undefined): void
} }
} }
MMKV.prototype.get = function <T>(key: string): T | undefined { MMKV.prototype.get = function <T> (key: string): T | undefined {
const serializedItem = this.getString(key); const serializedItem = this.getString(key);
return serializedItem ? JSON.parse(serializedItem) : undefined; return serializedItem ? JSON.parse(serializedItem) : undefined;
}; }
MMKV.prototype.setAny = function (key: string, value: any | undefined): void { MMKV.prototype.setAny = function (key: string, value: any | undefined): void {
if (value === undefined) { if (value === undefined) {
this.delete(key); this.delete(key)
} else { }
else {
this.set(key, JSON.stringify(value)); this.set(key, JSON.stringify(value));
} }
}; }

View File

@@ -7,19 +7,17 @@ declare global {
} }
} }
Number.prototype.bytesToReadable = function (decimals = 2) { Number.prototype.bytesToReadable = function (decimals: number = 2) {
const bytes = this.valueOf(); const bytes = this.valueOf();
if (bytes === 0) return "0 Bytes"; if (bytes === 0) return '0 Bytes';
const k = 1024; const k = 1024;
const dm = decimals < 0 ? 0 : decimals; const dm = decimals < 0 ? 0 : decimals;
const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]; const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
const i = Math.floor(Math.log(bytes) / Math.log(k)); const i = Math.floor(Math.log(bytes) / Math.log(k));
return ( return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
Number.parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i]
);
}; };
Number.prototype.secondsToMilliseconds = function () { Number.prototype.secondsToMilliseconds = function () {

View File

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

View File

@@ -1,4 +1,4 @@
module.exports = (api) => { module.exports = function (api) {
api.cache(true); api.cache(true);
return { return {
presets: ["babel-preset-expo"], presets: ["babel-preset-expo"],

View File

@@ -1,54 +0,0 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"organizeImports": {
"enabled": true
},
"files": {
"ignore": [
"node_modules",
"ios",
"android",
"Streamyfin.app",
"utils/jellyseerr"
]
},
"linter": {
"enabled": true,
"rules": {
"style": {
"useImportType": "off",
"noNonNullAssertion": "off"
},
"recommended": true,
"correctness": { "useExhaustiveDependencies": "off" },
"suspicious": {
"noExplicitAny": "off"
}
}
},
"formatter": {
"enabled": true,
"formatWithErrors": true,
"attributePosition": "auto",
"indentStyle": "space",
"indentWidth": 2,
"lineEnding": "lf",
"lineWidth": 80
},
"javascript": {
"formatter": {
"arrowParentheses": "always",
"bracketSameLine": false,
"bracketSpacing": true,
"jsxQuoteStyle": "single",
"quoteProperties": "asNeeded",
"semicolons": "always",
"lineWidth": 80
}
},
"json": {
"formatter": {
"trailingCommas": "none"
}
}
}

3046
bun.lock

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +1,113 @@
import { RoundButton } from "@/components/RoundButton"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { useFavorite } from "@/hooks/useFavorite"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client"; import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
import type { FC } from "react"; import { useMutation, useQueryClient } from "@tanstack/react-query";
import { View, type ViewProps } from "react-native"; import { useAtom } from "jotai";
import { useMemo } from "react";
import { TouchableOpacityProps, View, ViewProps } from "react-native";
import { RoundButton } from "./RoundButton";
interface Props extends ViewProps { interface Props extends ViewProps {
item: BaseItemDto; item: BaseItemDto;
type: "item" | "series";
} }
export const AddToFavorites: FC<Props> = ({ item, ...props }) => { export const AddToFavorites: React.FC<Props> = ({ item, type, ...props }) => {
const { isFavorite, toggleFavorite } = useFavorite(item); const queryClient = useQueryClient();
const [api] = useAtom(apiAtom);
const [user] = useAtom(userAtom);
const isFavorite = useMemo(() => {
return item.UserData?.IsFavorite;
}, [item.UserData?.IsFavorite]);
const updateItemInQueries = (newData: Partial<BaseItemDto>) => {
queryClient.setQueryData<BaseItemDto | undefined>(
[type, item.Id],
(old) => {
if (!old) return old;
return {
...old,
...newData,
UserData: { ...old.UserData, ...newData.UserData },
};
}
);
};
const markFavoriteMutation = useMutation({
mutationFn: async () => {
if (api && user) {
await getUserLibraryApi(api).markFavoriteItem({
userId: user.Id,
itemId: item.Id!,
});
}
},
onMutate: async () => {
await queryClient.cancelQueries({ queryKey: [type, item.Id] });
const previousItem = queryClient.getQueryData<BaseItemDto>([
type,
item.Id,
]);
updateItemInQueries({ UserData: { IsFavorite: true } });
return { previousItem };
},
onError: (err, variables, context) => {
if (context?.previousItem) {
queryClient.setQueryData([type, item.Id], context.previousItem);
}
},
onSettled: () => {
queryClient.invalidateQueries({ queryKey: [type, item.Id] });
queryClient.invalidateQueries({ queryKey: ["home", "favorites"] });
},
});
const unmarkFavoriteMutation = useMutation({
mutationFn: async () => {
if (api && user) {
await getUserLibraryApi(api).unmarkFavoriteItem({
userId: user.Id,
itemId: item.Id!,
});
}
},
onMutate: async () => {
await queryClient.cancelQueries({ queryKey: [type, item.Id] });
const previousItem = queryClient.getQueryData<BaseItemDto>([
type,
item.Id,
]);
updateItemInQueries({ UserData: { IsFavorite: false } });
return { previousItem };
},
onError: (err, variables, context) => {
if (context?.previousItem) {
queryClient.setQueryData([type, item.Id], context.previousItem);
}
},
onSettled: () => {
queryClient.invalidateQueries({ queryKey: [type, item.Id] });
queryClient.invalidateQueries({ queryKey: ["home", "favorites"] });
},
});
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} fillColor={isFavorite ? "primary" : undefined}
onPress={toggleFavorite} onPress={() => {
if (isFavorite) {
unmarkFavoriteMutation.mutate();
} else {
markFavoriteMutation.mutate();
}
}}
/> />
</View> </View>
); );

View File

@@ -1,9 +1,9 @@
import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models"; import { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
import { useMemo } from "react"; import { useMemo } from "react";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import { useTranslation } from "react-i18next";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
import { useTranslation } from "react-i18next";
interface Props extends React.ComponentProps<typeof View> { interface Props extends React.ComponentProps<typeof View> {
source?: MediaSourceInfo; source?: MediaSourceInfo;
@@ -20,31 +20,31 @@ export const AudioTrackSelector: React.FC<Props> = ({
if (Platform.isTV) return null; if (Platform.isTV) return null;
const audioStreams = useMemo( const audioStreams = useMemo(
() => source?.MediaStreams?.filter((x) => x.Type === "Audio"), () => source?.MediaStreams?.filter((x) => x.Type === "Audio"),
[source], [source]
); );
const selectedAudioSteam = useMemo( const selectedAudioSteam = useMemo(
() => audioStreams?.find((x) => x.Index === selected), () => audioStreams?.find((x) => x.Index === selected),
[audioStreams, selected], [audioStreams, selected]
); );
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<View <View
className='flex shrink' className="flex shrink"
style={{ style={{
minWidth: 50, minWidth: 50,
}} }}
> >
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<Text className='opacity-50 mb-1 text-xs'> <Text className="opacity-50 mb-1 text-xs">
{t("item_card.audio")} {t("item_card.audio")}
</Text> </Text>
<TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <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 className='' numberOfLines={1}> <Text className="" numberOfLines={1}>
{selectedAudioSteam?.DisplayTitle} {selectedAudioSteam?.DisplayTitle}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
@@ -52,8 +52,8 @@ export const AudioTrackSelector: React.FC<Props> = ({
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={true} loop={true}
side='bottom' side="bottom"
align='start' align="start"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={8} collisionPadding={8}

View File

@@ -1,4 +1,4 @@
import { View, type ViewProps } from "react-native"; import { View, ViewProps } from "react-native";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
interface Props extends ViewProps { interface Props extends ViewProps {
@@ -22,7 +22,7 @@ export const Badge: React.FC<Props> = ({
${variant === "gray" && "bg-neutral-800"} ${variant === "gray" && "bg-neutral-800"}
`} `}
> >
{iconLeft && <View className='mr-1'>{iconLeft}</View>} {iconLeft && <View className="mr-1">{iconLeft}</View>}
<Text <Text
className={` className={`
text-xs text-xs

View File

@@ -1,8 +1,8 @@
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import { Text } from "./common/Text";
import { useMemo } from "react"; import { useMemo } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Text } from "./common/Text";
export type Bitrate = { export type Bitrate = {
key: string; key: string;
@@ -40,11 +40,7 @@ export const BITRATES: Bitrate[] = [
key: "250 Kb/s", key: "250 Kb/s",
value: 250000, value: 250000,
}, },
].sort( ].sort((a, b) => (b.value || Infinity) - (a.value || Infinity));
(a, b) =>
(b.value || Number.POSITIVE_INFINITY) -
(a.value || Number.POSITIVE_INFINITY),
);
interface Props extends React.ComponentProps<typeof View> { interface Props extends React.ComponentProps<typeof View> {
onChange: (value: Bitrate) => void; onChange: (value: Bitrate) => void;
@@ -62,14 +58,10 @@ export const BitrateSelector: React.FC<Props> = ({
const sorted = useMemo(() => { const sorted = useMemo(() => {
if (inverted) if (inverted)
return BITRATES.sort( return BITRATES.sort(
(a, b) => (a, b) => (a.value || Infinity) - (b.value || Infinity)
(a.value || Number.POSITIVE_INFINITY) -
(b.value || Number.POSITIVE_INFINITY),
); );
return BITRATES.sort( return BITRATES.sort(
(a, b) => (a, b) => (b.value || Infinity) - (a.value || Infinity)
(b.value || Number.POSITIVE_INFINITY) -
(a.value || Number.POSITIVE_INFINITY),
); );
}, []); }, []);
@@ -77,7 +69,7 @@ export const BitrateSelector: React.FC<Props> = ({
return ( return (
<View <View
className='flex shrink' className="flex shrink"
style={{ style={{
minWidth: 60, minWidth: 60,
maxWidth: 200, maxWidth: 200,
@@ -85,12 +77,12 @@ export const BitrateSelector: React.FC<Props> = ({
> >
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<Text className='opacity-50 mb-1 text-xs'> <Text className="opacity-50 mb-1 text-xs">
{t("item_card.quality")} {t("item_card.quality")}
</Text> </Text>
<TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between">
<Text style={{}} className='' numberOfLines={1}> <Text style={{}} className="" numberOfLines={1}>
{BITRATES.find((b) => b.value === selected?.value)?.key} {BITRATES.find((b) => b.value === selected?.value)?.key}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
@@ -98,8 +90,8 @@ export const BitrateSelector: React.FC<Props> = ({
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={false} loop={false}
side='bottom' side="bottom"
align='center' align="center"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={0} collisionPadding={0}

View File

@@ -1,6 +1,5 @@
import { useHaptic } from "@/hooks/useHaptic"; import { useHaptic } from "@/hooks/useHaptic";
import type React from "react"; import React, { PropsWithChildren, ReactNode, useMemo } from "react";
import { type PropsWithChildren, type ReactNode, useMemo } from "react";
import { Platform, Text, TouchableOpacity, View } from "react-native"; import { Platform, Text, TouchableOpacity, View } from "react-native";
import { Loader } from "./Loader"; import { Loader } from "./Loader";
@@ -64,7 +63,7 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
{...props} {...props}
> >
{loading ? ( {loading ? (
<View className='p-0.5'> <View className="p-0.5">
<Loader /> <Loader />
</View> </View>
) : ( ) : (
@@ -73,7 +72,7 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
flex flex-row items-center justify-between w-full flex flex-row items-center justify-between w-full
${justify === "between" ? "justify-between" : "justify-center"}`} ${justify === "between" ? "justify-between" : "justify-center"}`}
> >
{iconLeft ? iconLeft : <View className='w-4'></View>} {iconLeft ? iconLeft : <View className="w-4"></View>}
<Text <Text
className={` className={`
text-white font-bold text-base text-white font-bold text-base
@@ -85,7 +84,7 @@ export const Button: React.FC<PropsWithChildren<ButtonProps>> = ({
> >
{children} {children}
</Text> </Text>
{iconRight ? iconRight : <View className='w-4'></View>} {iconRight ? iconRight : <View className="w-4"></View>}
</View> </View>
)} )}
</TouchableOpacity> </TouchableOpacity>

View File

@@ -1,6 +1,6 @@
import { Feather } from "@expo/vector-icons"; import { Feather } from "@expo/vector-icons";
import React, { useCallback, useEffect } from "react"; import React, { useCallback, useEffect } from "react";
import { Platform, TouchableOpacity, type ViewProps } from "react-native"; import { Platform, TouchableOpacity, ViewProps } from "react-native";
import GoogleCast, { import GoogleCast, {
CastButton, CastButton,
CastContext, CastContext,
@@ -17,7 +17,7 @@ interface Props extends ViewProps {
background?: "blur" | "transparent"; background?: "blur" | "transparent";
} }
export function Chromecast({ export default function Chromecast({
width = 48, width = 48,
height = 48, height = 48,
background = "transparent", background = "transparent",
@@ -45,18 +45,18 @@ export function Chromecast({
const AndroidCastButton = useCallback( const AndroidCastButton = useCallback(
() => () =>
Platform.OS === "android" ? ( Platform.OS === "android" ? (
<CastButton tintColor='transparent' /> <CastButton tintColor="transparent" />
) : ( ) : (
<></> <></>
), ),
[Platform.OS], [Platform.OS]
); );
if (background === "transparent") if (background === "transparent")
return ( return (
<RoundButton <RoundButton
size='large' size="large"
className='mr-2' className="mr-2"
background={false} background={false}
onPress={() => { onPress={() => {
if (mediaStatus?.currentItemId) CastContext.showExpandedControls(); if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
@@ -65,13 +65,13 @@ export function Chromecast({
{...props} {...props}
> >
<AndroidCastButton /> <AndroidCastButton />
<Feather name='cast' size={22} color={"white"} /> <Feather name="cast" size={22} color={"white"} />
</RoundButton> </RoundButton>
); );
return ( return (
<RoundButton <RoundButton
size='large' size="large"
onPress={() => { onPress={() => {
if (mediaStatus?.currentItemId) CastContext.showExpandedControls(); if (mediaStatus?.currentItemId) CastContext.showExpandedControls();
else CastContext.showCastDialog(); else CastContext.showCastDialog();
@@ -79,7 +79,7 @@ export function Chromecast({
{...props} {...props}
> >
<AndroidCastButton /> <AndroidCastButton />
<Feather name='cast' size={22} color={"white"} /> <Feather name="cast" size={22} color={"white"} />
</RoundButton> </RoundButton>
); );
} }

View File

@@ -1,12 +1,12 @@
import { apiAtom } from "@/providers/JellyfinProvider"; import { apiAtom } from "@/providers/JellyfinProvider";
import { Ionicons } from "@expo/vector-icons"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import { useMemo } from "react"; import { useMemo } from "react";
import type React from "react";
import { View } from "react-native"; import { View } from "react-native";
import { WatchedIndicator } from "./WatchedIndicator"; import { WatchedIndicator } from "./WatchedIndicator";
import React from "react";
import { Ionicons } from "@expo/vector-icons";
type ContinueWatchingPosterProps = { type ContinueWatchingPosterProps = {
item: BaseItemDto; item: BaseItemDto;
@@ -71,7 +71,7 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
if (!url) if (!url)
return ( return (
<View className='aspect-video border border-neutral-800 w-44'></View> <View className="aspect-video border border-neutral-800 w-44"></View>
); );
return ( return (
@@ -81,7 +81,7 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
${size === "small" ? "w-32" : "w-44"} ${size === "small" ? "w-32" : "w-44"}
`} `}
> >
<View className='w-full h-full flex items-center justify-center'> <View className="w-full h-full flex items-center justify-center">
<Image <Image
key={item.Id} key={item.Id}
id={item.Id} id={item.Id}
@@ -89,12 +89,12 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
uri: url, uri: url,
}} }}
cachePolicy={"memory-disk"} cachePolicy={"memory-disk"}
contentFit='cover' contentFit="cover"
className='w-full h-full' className="w-full h-full"
/> />
{showPlayButton && ( {showPlayButton && (
<View className='absolute inset-0 flex items-center justify-center'> <View className="absolute inset-0 flex items-center justify-center">
<Ionicons name='play-circle' size={40} color='white' /> <Ionicons name="play-circle" size={40} color="white" />
</View> </View>
)} )}
</View> </View>

View File

@@ -2,7 +2,7 @@ import { useRemuxHlsToMp4 } from "@/hooks/useRemuxHlsToMp4";
import { useDownload } from "@/providers/DownloadProvider"; import { useDownload } from "@/providers/DownloadProvider";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { queueActions, queueAtom } from "@/utils/atoms/queue"; import { queueActions, queueAtom } from "@/utils/atoms/queue";
import { DownloadMethod, useSettings } from "@/utils/atoms/settings"; import {DownloadMethod, useSettings} from "@/utils/atoms/settings";
import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings"; import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl"; import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server"; import { saveDownloadItemInfoToDiskTmp } from "@/utils/optimize-server";
@@ -10,30 +10,29 @@ import download from "@/utils/profiles/download";
import Ionicons from "@expo/vector-icons/Ionicons"; import Ionicons from "@expo/vector-icons/Ionicons";
import { import {
BottomSheetBackdrop, BottomSheetBackdrop,
type BottomSheetBackdropProps, BottomSheetBackdropProps,
BottomSheetModal, BottomSheetModal,
BottomSheetView, BottomSheetView,
} from "@gorhom/bottom-sheet"; } from "@gorhom/bottom-sheet";
import type { import {
BaseItemDto, BaseItemDto,
MediaSourceInfo, MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { type Href, router, useFocusEffect } from "expo-router"; import { Href, router, useFocusEffect } from "expo-router";
import { t } from "i18next";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import React, { useCallback, useMemo, useRef, useState } from "react";
import { useCallback, useMemo, useRef, useState } from "react"; import { Alert, View, ViewProps } from "react-native";
import { Alert, Platform, View, type ViewProps } from "react-native";
import { toast } from "sonner-native"; import { toast } from "sonner-native";
import { AudioTrackSelector } from "./AudioTrackSelector"; import { AudioTrackSelector } from "./AudioTrackSelector";
import { type Bitrate, BitrateSelector } from "./BitrateSelector"; import { Bitrate, BitrateSelector } from "./BitrateSelector";
import { Button } from "./Button"; import { Button } from "./Button";
import { Text } from "./common/Text";
import { Loader } from "./Loader"; import { Loader } from "./Loader";
import { MediaSourceSelector } from "./MediaSourceSelector"; import { MediaSourceSelector } from "./MediaSourceSelector";
import ProgressCircle from "./ProgressCircle"; import ProgressCircle from "./ProgressCircle";
import { RoundButton } from "./RoundButton"; import { RoundButton } from "./RoundButton";
import { SubtitleTrackSelector } from "./SubtitleTrackSelector"; import { SubtitleTrackSelector } from "./SubtitleTrackSelector";
import { Text } from "./common/Text"; import { t } from "i18next";
interface DownloadProps extends ViewProps { interface DownloadProps extends ViewProps {
items: BaseItemDto[]; items: BaseItemDto[];
@@ -67,20 +66,18 @@ export const DownloadItems: React.FC<DownloadProps> = ({
const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1); const [selectedAudioStream, setSelectedAudioStream] = useState<number>(-1);
const [selectedSubtitleStream, setSelectedSubtitleStream] = const [selectedSubtitleStream, setSelectedSubtitleStream] =
useState<number>(0); useState<number>(0);
const [maxBitrate, setMaxBitrate] = useState<Bitrate>( const [maxBitrate, setMaxBitrate] = useState<Bitrate>({
settings?.defaultBitrate ?? { key: "Max",
key: "Max", value: undefined,
value: undefined, });
},
);
const userCanDownload = useMemo( const userCanDownload = useMemo(
() => user?.Policy?.EnableContentDownloading, () => user?.Policy?.EnableContentDownloading,
[user], [user]
); );
const usingOptimizedServer = useMemo( const usingOptimizedServer = useMemo(
() => settings?.downloadMethod === DownloadMethod.Optimized, () => settings?.downloadMethod === DownloadMethod.Optimized,
[settings], [settings]
); );
const bottomSheetModalRef = useRef<BottomSheetModal>(null); const bottomSheetModalRef = useRef<BottomSheetModal>(null);
@@ -100,7 +97,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
const itemsNotDownloaded = useMemo( const itemsNotDownloaded = useMemo(
() => () =>
items.filter((i) => !downloadedFiles?.some((f) => f.item.Id === i.Id)), items.filter((i) => !downloadedFiles?.some((f) => f.item.Id === i.Id)),
[items, downloadedFiles], [items, downloadedFiles]
); );
const allItemsDownloaded = useMemo(() => { const allItemsDownloaded = useMemo(() => {
@@ -109,7 +106,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
}, [items, itemsNotDownloaded]); }, [items, itemsNotDownloaded]);
const itemsProcesses = useMemo( const itemsProcesses = useMemo(
() => processes?.filter((p) => itemIds.includes(p.item.Id)), () => processes?.filter((p) => itemIds.includes(p.item.Id)),
[processes, itemIds], [processes, itemIds]
); );
const progress = useMemo(() => { const progress = useMemo(() => {
@@ -141,7 +138,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
params: { params: {
episodeSeasonIndex: firstItem.ParentIndexNumber, episodeSeasonIndex: firstItem.ParentIndexNumber,
}, },
} as Href), } as Href)
); );
}; };
@@ -161,13 +158,11 @@ export const DownloadItems: React.FC<DownloadProps> = ({
id: item.Id!, id: item.Id!,
execute: async () => await initiateDownload(item), execute: async () => await initiateDownload(item),
item, item,
})), }))
); );
} }
} 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"),
);
} }
}, [ }, [
queue, queue,
@@ -190,7 +185,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
(itemsNotDownloaded.length === 1 && !selectedMediaSource?.Id) (itemsNotDownloaded.length === 1 && !selectedMediaSource?.Id)
) { ) {
throw new Error( throw new Error(
"DownloadItem ~ initiateDownload: No api or user or item", "DownloadItem ~ initiateDownload: No api or user or item"
); );
} }
let mediaSource = selectedMediaSource; let mediaSource = selectedMediaSource;
@@ -199,11 +194,10 @@ export const DownloadItems: React.FC<DownloadProps> = ({
for (const item of items) { for (const item of items) {
if (itemsNotDownloaded.length > 1) { if (itemsNotDownloaded.length > 1) {
const defaults = getDefaultPlaySettings(item, settings!); ({ mediaSource, audioIndex, subtitleIndex } = getDefaultPlaySettings(
mediaSource = defaults.mediaSource; item,
audioIndex = defaults.audioIndex; settings!
subtitleIndex = defaults.subtitleIndex; ));
// Keep using the selected bitrate for consistency across all downloads
} }
const res = await getStreamUrl({ const res = await getStreamUrl({
@@ -221,7 +215,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
if (!res) { if (!res) {
Alert.alert( Alert.alert(
t("home.downloads.something_went_wrong"), t("home.downloads.something_went_wrong"),
t("home.downloads.could_not_get_stream_url_from_jellyfin"), t("home.downloads.could_not_get_stream_url_from_jellyfin")
); );
continue; continue;
} }
@@ -251,7 +245,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
usingOptimizedServer, usingOptimizedServer,
startBackgroundDownload, startBackgroundDownload,
startRemuxing, startRemuxing,
], ]
); );
const renderBackdrop = useCallback( const renderBackdrop = useCallback(
@@ -262,7 +256,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
appearsOnIndex={0} appearsOnIndex={0}
/> />
), ),
[], []
); );
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
@@ -275,7 +269,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
setSelectedAudioStream(audioIndex ?? 0); setSelectedAudioStream(audioIndex ?? 0);
setSelectedSubtitleStream(subtitleIndex ?? -1); setSelectedSubtitleStream(subtitleIndex ?? -1);
setMaxBitrate(bitrate); setMaxBitrate(bitrate);
}, [items, itemsNotDownloaded, settings]), }, [items, itemsNotDownloaded, settings])
); );
const renderButtonContent = () => { const renderButtonContent = () => {
@@ -283,18 +277,18 @@ export const DownloadItems: React.FC<DownloadProps> = ({
return progress === 0 ? ( return progress === 0 ? (
<Loader /> <Loader />
) : ( ) : (
<View className='-rotate-45'> <View className="-rotate-45">
<ProgressCircle <ProgressCircle
size={24} size={24}
fill={progress} fill={progress}
width={4} width={4}
tintColor='#9334E9' tintColor="#9334E9"
backgroundColor='#bdc3c7' backgroundColor="#bdc3c7"
/> />
</View> </View>
); );
} else if (itemsQueued) { } else if (itemsQueued) {
return <Ionicons name='hourglass' size={24} color='white' />; return <Ionicons name="hourglass" size={24} color="white" />;
} else if (allItemsDownloaded) { } else if (allItemsDownloaded) {
return <DownloadedIconComponent />; return <DownloadedIconComponent />;
} else { } else {
@@ -332,19 +326,16 @@ export const DownloadItems: React.FC<DownloadProps> = ({
backdropComponent={renderBackdrop} backdropComponent={renderBackdrop}
> >
<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">
<View> <View>
<Text className='font-bold text-2xl text-neutral-100'> <Text className="font-bold text-2xl text-neutral-100">
{title} {title}
</Text> </Text>
<Text className='text-neutral-300'> <Text className="text-neutral-300">
{subtitle || {subtitle || t("item_card.download.download_x_item", {item_count: itemsNotDownloaded.length})}
t("item_card.download.download_x_item", {
item_count: itemsNotDownloaded.length,
})}
</Text> </Text>
</View> </View>
<View className='flex flex-col space-y-2 w-full items-start'> <View className="flex flex-col space-y-2 w-full items-start">
<BitrateSelector <BitrateSelector
inverted inverted
onChange={setMaxBitrate} onChange={setMaxBitrate}
@@ -358,7 +349,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
selected={selectedMediaSource} selected={selectedMediaSource}
/> />
{selectedMediaSource && ( {selectedMediaSource && (
<View className='flex flex-col space-y-2'> <View className="flex flex-col space-y-2">
<AudioTrackSelector <AudioTrackSelector
source={selectedMediaSource} source={selectedMediaSource}
onChange={setSelectedAudioStream} onChange={setSelectedAudioStream}
@@ -375,14 +366,14 @@ export const DownloadItems: React.FC<DownloadProps> = ({
)} )}
</View> </View>
<Button <Button
className='mt-auto' className="mt-auto"
onPress={acceptDownloadOptions} onPress={acceptDownloadOptions}
color='purple' color="purple"
> >
{t("item_card.download.download_button")} {t("item_card.download.download_button")}
</Button> </Button>
<View className='opacity-70 text-center w-full flex items-center'> <View className="opacity-70 text-center w-full flex items-center">
<Text className='text-xs'> <Text className="text-xs">
{usingOptimizedServer {usingOptimizedServer
? t("item_card.download.using_optimized_server") ? t("item_card.download.using_optimized_server")
: t("item_card.download.using_default_method")} : t("item_card.download.using_default_method")}
@@ -399,23 +390,19 @@ export const DownloadSingleItem: React.FC<{
size?: "default" | "large"; size?: "default" | "large";
item: BaseItemDto; item: BaseItemDto;
}> = ({ item, size = "default" }) => { }> = ({ item, size = "default" }) => {
if (Platform.isTV) return;
return ( return (
<DownloadItems <DownloadItems
size={size} size={size}
title={ title={item.Type == "Episode"
item.Type == "Episode" ? t("item_card.download.download_episode")
? t("item_card.download.download_episode") : t("item_card.download.download_movie")}
: t("item_card.download.download_movie")
}
subtitle={item.Name!} subtitle={item.Name!}
items={[item]} items={[item]}
MissingDownloadIconComponent={() => ( MissingDownloadIconComponent={() => (
<Ionicons name='cloud-download-outline' size={24} color='white' /> <Ionicons name="cloud-download-outline" size={24} color="white" />
)} )}
DownloadedIconComponent={() => ( DownloadedIconComponent={() => (
<Ionicons name='cloud-download' size={26} color='#9333ea' /> <Ionicons name="cloud-download" size={26} color="#9333ea" />
)} )}
/> />
); );

View File

@@ -1,57 +1,44 @@
// GenreTags.tsx // GenreTags.tsx
import type React from "react"; import React from "react";
import { import {StyleProp, TextStyle, View, ViewProps} from "react-native";
type StyleProp,
type TextStyle,
View,
type ViewProps,
} from "react-native";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
interface TagProps { interface TagProps {
tags?: string[]; tags?: string[];
textClass?: ViewProps["className"]; textClass?: ViewProps["className"]
} }
export const Tag: React.FC< export const Tag: React.FC<{ text: string, textClass?: ViewProps["className"], textStyle?: StyleProp<TextStyle>} & ViewProps> = ({
{ text,
text: string; textClass,
textClass?: ViewProps["className"]; textStyle,
textStyle?: StyleProp<TextStyle>; ...props
} & ViewProps }) => {
> = ({ text, textClass, textStyle, ...props }) => {
return ( return (
<View className='bg-neutral-800 rounded-full px-2 py-1' {...props}> <View className="bg-neutral-800 rounded-full px-2 py-1" {...props}>
<Text className={textClass} style={textStyle}> <Text className={textClass} style={textStyle}>{text}</Text>
{text}
</Text>
</View> </View>
); );
}; };
export const Tags: React.FC< export const Tags: React.FC<TagProps & ViewProps> = ({ tags, textClass = "text-xs", ...props }) => {
TagProps & { tagProps?: ViewProps } & ViewProps
> = ({ tags, textClass = "text-xs", tagProps, ...props }) => {
if (!tags || tags.length === 0) return null; if (!tags || tags.length === 0) return null;
return ( return (
<View <View className={`flex flex-row flex-wrap gap-1 ${props.className}`} {...props}>
className={`flex flex-row flex-wrap gap-1 ${props.className}`}
{...props}
>
{tags.map((tag, idx) => ( {tags.map((tag, idx) => (
<View key={idx}> <View key={idx}>
<Tag key={idx} textClass={textClass} text={tag} {...tagProps} /> <Tag key={idx} textClass={textClass} text={tag}/>
</View> </View>
))} ))}
</View> </View>
); );
}; };
export const GenreTags: React.FC<{ genres?: string[] }> = ({ genres }) => { export const GenreTags: React.FC<{ genres?: string[]}> = ({ genres }) => {
return ( return (
<View className='mt-2'> <View className="mt-2">
<Tags tags={genres} /> <Tags tags={genres}/>
</View> </View>
); );
}; };

View File

@@ -1,8 +1,8 @@
import { tc } from "@/utils/textTools"; import React from "react";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import type React from "react";
import { View } from "react-native"; import { View } from "react-native";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { tc } from "@/utils/textTools";
type ItemCardProps = { type ItemCardProps = {
item: BaseItemDto; item: BaseItemDto;
@@ -10,13 +10,13 @@ type ItemCardProps = {
export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => { export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
return ( return (
<View className='mt-2 flex flex-col'> <View className="mt-2 flex flex-col">
{item.Type === "Episode" ? ( {item.Type === "Episode" ? (
<> <>
<Text numberOfLines={1} ellipsizeMode='tail' className=''> <Text numberOfLines={1} className="">
{item.Name} {item.Name}
</Text> </Text>
<Text numberOfLines={1} className='text-xs opacity-50'> <Text numberOfLines={1} className="text-xs opacity-50">
{`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`} {`S${item.ParentIndexNumber?.toString()}:E${item.IndexNumber?.toString()}`}
{" - "} {" - "}
{item.SeriesName} {item.SeriesName}
@@ -24,10 +24,8 @@ export const ItemCardText: React.FC<ItemCardProps> = ({ item }) => {
</> </>
) : ( ) : (
<> <>
<Text numberOfLines={1} ellipsizeMode='tail'> <Text numberOfLines={2}>{item.Name}</Text>
{item.Name} <Text className="text-xs opacity-50">{item.ProductionYear}</Text>
</Text>
<Text className='text-xs opacity-50'>{item.ProductionYear}</Text>
</> </>
)} )}
</View> </View>

View File

@@ -1,5 +1,5 @@
import { AudioTrackSelector } from "@/components/AudioTrackSelector"; import { AudioTrackSelector } from "@/components/AudioTrackSelector";
import { type Bitrate, BitrateSelector } from "@/components/BitrateSelector"; import { Bitrate, BitrateSelector } from "@/components/BitrateSelector";
import { DownloadSingleItem } from "@/components/DownloadItem"; import { DownloadSingleItem } from "@/components/DownloadItem";
import { OverviewText } from "@/components/OverviewText"; import { OverviewText } from "@/components/OverviewText";
import { ParallaxScrollView } from "@/components/ParallaxPage"; import { ParallaxScrollView } from "@/components/ParallaxPage";
@@ -15,26 +15,28 @@ import { SeasonEpisodesCarousel } from "@/components/series/SeasonEpisodesCarous
import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings"; import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
import { useImageColors } from "@/hooks/useImageColors"; import { useImageColors } from "@/hooks/useImageColors";
import { useOrientation } from "@/hooks/useOrientation"; import { useOrientation } from "@/hooks/useOrientation";
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { apiAtom } from "@/providers/JellyfinProvider"; import { apiAtom } from "@/providers/JellyfinProvider";
import { SubtitleHelper } from "@/utils/SubtitleHelper";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById"; import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
import type { import {
BaseItemDto, BaseItemDto,
MediaSourceInfo, MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { Image } from "expo-image"; import { Image } from "expo-image";
import { useNavigation } from "expo-router"; import { useNavigation } from "expo-router";
import * as ScreenOrientation from "@/packages/expo-screen-orientation";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React, { useEffect, useMemo, useState } from "react"; import React, { lazy, useEffect, useMemo, useState } from "react";
import { Platform, View } from "react-native"; import { Platform, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useSafeAreaInsets } from "react-native-safe-area-context";
import { AddToFavorites } from "./AddToFavorites"; // const Chromecast = !Platform.isTV ? require("./Chromecast") : null;
const Chromecast = lazy(() => import("./Chromecast"));
import { ItemHeader } from "./ItemHeader"; import { ItemHeader } from "./ItemHeader";
import { ItemTechnicalDetails } from "./ItemTechnicalDetails"; import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
import { MediaSourceSelector } from "./MediaSourceSelector"; import { MediaSourceSelector } from "./MediaSourceSelector";
import { MoreMoviesWithActor } from "./MoreMoviesWithActor"; import { MoreMoviesWithActor } from "./MoreMoviesWithActor";
const Chromecast = !Platform.isTV ? require("./Chromecast") : null; import { AddToFavorites } from "./AddToFavorites";
export type SelectedOptions = { export type SelectedOptions = {
bitrate: Bitrate; bitrate: Bitrate;
@@ -86,19 +88,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
navigation.setOptions({ navigation.setOptions({
headerRight: () => headerRight: () =>
item && ( item && (
<View className='flex flex-row items-center space-x-2'> <View className="flex flex-row items-center space-x-2">
<Chromecast.Chromecast <Chromecast background="blur" width={22} height={22} />
background='blur'
width={22}
height={22}
/>
{item.Type !== "Program" && ( {item.Type !== "Program" && (
<View className='flex flex-row items-center space-x-2'> <View className="flex flex-row items-center space-x-2">
{!Platform.isTV && ( <DownloadSingleItem item={item} size="large" />
<DownloadSingleItem item={item} size='large' /> <PlayedStatus items={[item]} size="large" />
)} <AddToFavorites item={item} type="item" />
<PlayedStatus items={[item]} size='large' />
<AddToFavorites item={item} />
</View> </View>
)} )}
</View> </View>
@@ -119,11 +115,42 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
const loading = useMemo(() => { const loading = useMemo(() => {
return Boolean(logoUrl && loadingLogo); return Boolean(logoUrl && loadingLogo);
}, [loadingLogo, logoUrl]); }, [loadingLogo, logoUrl]);
const [isTranscoding, setIsTranscoding] = useState(false);
const [previouslyChosenSubtitleIndex, setPreviouslyChosenSubtitleIndex] =
useState<number | undefined>(selectedOptions?.subtitleIndex);
useEffect(() => {
const isTranscoding = Boolean(selectedOptions?.bitrate.value);
if (isTranscoding) {
setPreviouslyChosenSubtitleIndex(selectedOptions?.subtitleIndex);
const subHelper = new SubtitleHelper(
selectedOptions?.mediaSource?.MediaStreams ?? []
);
const newSubtitleIndex = subHelper.getMostCommonSubtitleByName(
selectedOptions?.subtitleIndex
);
setSelectedOptions((prev) => ({
...prev!,
subtitleIndex: newSubtitleIndex ?? -1,
}));
}
if (!isTranscoding && previouslyChosenSubtitleIndex !== undefined) {
setSelectedOptions((prev) => ({
...prev!,
subtitleIndex: previouslyChosenSubtitleIndex,
}));
}
setIsTranscoding(isTranscoding);
}, [selectedOptions?.bitrate]);
if (!selectedOptions) return null; if (!selectedOptions) return null;
return ( return (
<View <View
className='flex-1 relative' className="flex-1 relative"
style={{ style={{
paddingLeft: insets.left, paddingLeft: insets.left,
paddingRight: insets.right, paddingRight: insets.right,
@@ -165,22 +192,23 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
</> </>
} }
> >
<View className='flex flex-col bg-transparent shrink'> <View className="flex flex-col bg-transparent shrink">
<View className='flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink'> {/* {!Platform.isTV && ( */}
<ItemHeader item={item} className='mb-4' /> <View className="flex flex-col px-4 w-full space-y-2 pt-2 mb-2 shrink">
<ItemHeader item={item} className="mb-4" />
{item.Type !== "Program" && !Platform.isTV && ( {item.Type !== "Program" && !Platform.isTV && (
<View className='flex flex-row items-center justify-start w-full h-16'> <View className="flex flex-row items-center justify-start w-full h-16">
<BitrateSelector <BitrateSelector
className='mr-1' className="mr-1"
onChange={(val) => onChange={(val) =>
setSelectedOptions( setSelectedOptions(
(prev) => prev && { ...prev, bitrate: val }, (prev) => prev && { ...prev, bitrate: val }
) )
} }
selected={selectedOptions.bitrate} selected={selectedOptions.bitrate}
/> />
<MediaSourceSelector <MediaSourceSelector
className='mr-1' className="mr-1"
item={item} item={item}
onChange={(val) => onChange={(val) =>
setSelectedOptions( setSelectedOptions(
@@ -188,13 +216,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
prev && { prev && {
...prev, ...prev,
mediaSource: val, mediaSource: val,
}, }
) )
} }
selected={selectedOptions.mediaSource} selected={selectedOptions.mediaSource}
/> />
<AudioTrackSelector <AudioTrackSelector
className='mr-1' className="mr-1"
source={selectedOptions.mediaSource} source={selectedOptions.mediaSource}
onChange={(val) => { onChange={(val) => {
setSelectedOptions( setSelectedOptions(
@@ -202,12 +230,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
prev && { prev && {
...prev, ...prev,
audioIndex: val, audioIndex: val,
}, }
); );
}} }}
selected={selectedOptions.audioIndex} selected={selectedOptions.audioIndex}
/> />
<SubtitleTrackSelector <SubtitleTrackSelector
isTranscoding={isTranscoding}
source={selectedOptions.mediaSource} source={selectedOptions.mediaSource}
onChange={(val) => onChange={(val) =>
setSelectedOptions( setSelectedOptions(
@@ -215,7 +244,7 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
prev && { prev && {
...prev, ...prev,
subtitleIndex: val, subtitleIndex: val,
}, }
) )
} }
selected={selectedOptions.subtitleIndex} selected={selectedOptions.subtitleIndex}
@@ -223,11 +252,13 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
</View> </View>
)} )}
{/* {!Platform.isTV && ( */}
<PlayButton <PlayButton
className='grow' className="grow"
selectedOptions={selectedOptions} selectedOptions={selectedOptions}
item={item} item={item}
/> />
{/* )} */}
</View> </View>
{item.Type === "Episode" && ( {item.Type === "Episode" && (
@@ -235,24 +266,24 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
)} )}
<ItemTechnicalDetails source={selectedOptions.mediaSource} /> <ItemTechnicalDetails source={selectedOptions.mediaSource} />
<OverviewText text={item.Overview} className='px-4 mb-4' /> <OverviewText text={item.Overview} className="px-4 mb-4" />
{item.Type !== "Program" && ( {item.Type !== "Program" && (
<> <>
{item.Type === "Episode" && ( {item.Type === "Episode" && (
<CurrentSeries item={item} className='mb-4' /> <CurrentSeries item={item} className="mb-4" />
)} )}
<CastAndCrew item={item} className='mb-4' loading={loading} /> <CastAndCrew item={item} className="mb-4" loading={loading} />
{item.People && item.People.length > 0 && ( {item.People && item.People.length > 0 && (
<View className='mb-4'> <View className="mb-4">
{item.People.slice(0, 3).map((person, idx) => ( {item.People.slice(0, 3).map((person, idx) => (
<MoreMoviesWithActor <MoreMoviesWithActor
currentItem={item} currentItem={item}
key={idx} key={idx}
actorId={person.Id!} actorId={person.Id!}
className='mb-4' className="mb-4"
/> />
))} ))}
</View> </View>
@@ -265,5 +296,5 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
</ParallaxScrollView> </ParallaxScrollView>
</View> </View>
); );
}, }
); );

View File

@@ -1,9 +1,9 @@
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import type React from "react"; import React from "react";
import { View, type ViewProps } from "react-native"; import { View, ViewProps } from "react-native";
import { GenreTags } from "./GenreTags"; import { GenreTags } from "./GenreTags";
import { Ratings } from "./Ratings";
import { MoviesTitleHeader } from "./movies/MoviesTitleHeader"; import { MoviesTitleHeader } from "./movies/MoviesTitleHeader";
import { Ratings } from "./Ratings";
import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader"; import { EpisodeTitleHeader } from "./series/EpisodeTitleHeader";
import { ItemActions } from "./series/SeriesActions"; import { ItemActions } from "./series/SeriesActions";
@@ -15,21 +15,21 @@ export const ItemHeader: React.FC<Props> = ({ item, ...props }) => {
if (!item) if (!item)
return ( return (
<View <View
className='flex flex-col space-y-1.5 w-full items-start h-32' className="flex flex-col space-y-1.5 w-full items-start h-32"
{...props} {...props}
> >
<View className='w-1/3 h-6 bg-neutral-900 rounded' /> <View className="w-1/3 h-6 bg-neutral-900 rounded" />
<View className='w-2/3 h-8 bg-neutral-900 rounded' /> <View className="w-2/3 h-8 bg-neutral-900 rounded" />
<View className='w-2/3 h-4 bg-neutral-900 rounded' /> <View className="w-2/3 h-4 bg-neutral-900 rounded" />
<View className='w-1/4 h-4 bg-neutral-900 rounded' /> <View className="w-1/4 h-4 bg-neutral-900 rounded" />
</View> </View>
); );
return ( return (
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<View className='flex flex-row items-center justify-between'> <View className="flex flex-row items-center justify-between">
<Ratings item={item} className='mb-2' /> <Ratings item={item} className="mb-2" />
<ItemActions item={item} /> <ItemActions item={item} />
</View> </View>
{item.Type === "Episode" && ( {item.Type === "Episode" && (

View File

@@ -1,23 +1,21 @@
import { formatBitrate } from "@/utils/bitrate";
import { Ionicons } from "@expo/vector-icons"; import { Ionicons } from "@expo/vector-icons";
import { import {
BottomSheetBackdrop,
type BottomSheetBackdropProps,
BottomSheetModal,
BottomSheetScrollView,
BottomSheetView,
} from "@gorhom/bottom-sheet";
import type {
MediaSourceInfo, MediaSourceInfo,
MediaStream, type MediaStream,
} from "@jellyfin/sdk/lib/generated-client"; } from "@jellyfin/sdk/lib/generated-client";
import type React from "react"; import React, { useMemo, useRef } from "react";
import { useMemo, useRef } from "react";
import { useTranslation } from "react-i18next";
import { TouchableOpacity, View } from "react-native"; import { TouchableOpacity, View } from "react-native";
import { Badge } from "./Badge"; import { Badge } from "./Badge";
import { Button } from "./Button";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
import {
BottomSheetModal,
BottomSheetBackdropProps,
BottomSheetBackdrop,
BottomSheetView,
BottomSheetScrollView,
} from "@gorhom/bottom-sheet";
import { Button } from "./Button";
import { useTranslation } from "react-i18next";
interface Props { interface Props {
source?: MediaSourceInfo; source?: MediaSourceInfo;
@@ -28,13 +26,13 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<View className='px-4 mt-2 mb-4'> <View className="px-4 mt-2 mb-4">
<Text className='text-lg font-bold mb-4'>{t("item_card.video")}</Text> <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
<TouchableOpacity onPress={() => bottomSheetModalRef.current?.present()}> <TouchableOpacity onPress={() => bottomSheetModalRef.current?.present()}>
<View className='flex flex-row space-x-2'> <View className="flex flex-row space-x-2">
<VideoStreamInfo source={source} /> <VideoStreamInfo source={source} />
</View> </View>
<Text className='text-purple-600'>{t("item_card.more_details")}</Text> <Text className="text-purple-600">{t("item_card.more_details")}</Text>
</TouchableOpacity> </TouchableOpacity>
<BottomSheetModal <BottomSheetModal
ref={bottomSheetModalRef} ref={bottomSheetModalRef}
@@ -54,37 +52,31 @@ export const ItemTechnicalDetails: React.FC<Props> = ({ source, ...props }) => {
)} )}
> >
<BottomSheetScrollView> <BottomSheetScrollView>
<View className='flex flex-col space-y-2 p-4 mb-4'> <View className="flex flex-col space-y-2 p-4 mb-4">
<View className=''> <View className="">
<Text className='text-lg font-bold mb-4'> <Text className="text-lg font-bold mb-4">{t("item_card.video")}</Text>
{t("item_card.video")} <View className="flex flex-row space-x-2">
</Text>
<View className='flex flex-row space-x-2'>
<VideoStreamInfo source={source} /> <VideoStreamInfo source={source} />
</View> </View>
</View> </View>
<View className=''> <View className="">
<Text className='text-lg font-bold mb-2'> <Text className="text-lg font-bold mb-2">{t("item_card.audio")}</Text>
{t("item_card.audio")}
</Text>
<AudioStreamInfo <AudioStreamInfo
audioStreams={ audioStreams={
source?.MediaStreams?.filter( source?.MediaStreams?.filter(
(stream) => stream.Type === "Audio", (stream) => stream.Type === "Audio"
) || [] ) || []
} }
/> />
</View> </View>
<View className=''> <View className="">
<Text className='text-lg font-bold mb-2'> <Text className="text-lg font-bold mb-2">{t("item_card.subtitles")}</Text>
{t("item_card.subtitles")}
</Text>
<SubtitleStreamInfo <SubtitleStreamInfo
subtitleStreams={ subtitleStreams={
source?.MediaStreams?.filter( source?.MediaStreams?.filter(
(stream) => stream.Type === "Subtitle", (stream) => stream.Type === "Subtitle"
) || [] ) || []
} }
/> />
@@ -102,25 +94,25 @@ const SubtitleStreamInfo = ({
subtitleStreams: MediaStream[]; subtitleStreams: MediaStream[];
}) => { }) => {
return ( return (
<View className='flex flex-col'> <View className="flex flex-col">
{subtitleStreams.map((stream, index) => ( {subtitleStreams.map((stream, index) => (
<View key={stream.Index} className='flex flex-col'> <View key={stream.Index} className="flex flex-col">
<Text className='text-xs mb-3 text-neutral-400'> <Text className="text-xs mb-3 text-neutral-400">
{stream.DisplayTitle} {stream.DisplayTitle}
</Text> </Text>
<View className='flex flex-row flex-wrap gap-2'> <View className="flex flex-row flex-wrap gap-2">
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='language-outline' size={16} color='white' /> <Ionicons name="language-outline" size={16} color="white" />
} }
text={stream.Language} text={stream.Language}
/> />
<Badge <Badge
variant='gray' variant="gray"
text={stream.Codec} text={stream.Codec}
iconLeft={ iconLeft={
<Ionicons name='layers-outline' size={16} color='white' /> <Ionicons name="layers-outline" size={16} color="white" />
} }
/> />
</View> </View>
@@ -132,40 +124,40 @@ const SubtitleStreamInfo = ({
const AudioStreamInfo = ({ audioStreams }: { audioStreams: MediaStream[] }) => { const AudioStreamInfo = ({ audioStreams }: { audioStreams: MediaStream[] }) => {
return ( return (
<View className='flex flex-col'> <View className="flex flex-col">
{audioStreams.map((audioStreams, index) => ( {audioStreams.map((audioStreams, index) => (
<View key={index} className='flex flex-col'> <View key={index} className="flex flex-col">
<Text className='mb-3 text-neutral-400 text-xs'> <Text className="mb-3 text-neutral-400 text-xs">
{audioStreams.DisplayTitle} {audioStreams.DisplayTitle}
</Text> </Text>
<View className='flex-row flex-wrap gap-2'> <View className="flex-row flex-wrap gap-2">
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='language-outline' size={16} color='white' /> <Ionicons name="language-outline" size={16} color="white" />
} }
text={audioStreams.Language} text={audioStreams.Language}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons <Ionicons
name='musical-notes-outline' name="musical-notes-outline"
size={16} size={16}
color='white' color="white"
/> />
} }
text={audioStreams.Codec} text={audioStreams.Codec}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={<Ionicons name='mic-outline' size={16} color='white' />} iconLeft={<Ionicons name="mic-outline" size={16} color="white" />}
text={audioStreams.ChannelLayout} text={audioStreams.ChannelLayout}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='speedometer-outline' size={16} color='white' /> <Ionicons name="speedometer-outline" size={16} color="white" />
} }
text={formatBitrate(audioStreams.BitRate)} text={formatBitrate(audioStreams.BitRate)}
/> />
@@ -181,48 +173,48 @@ const VideoStreamInfo = ({ source }: { source?: MediaSourceInfo }) => {
const videoStream = useMemo(() => { const videoStream = useMemo(() => {
return source.MediaStreams?.find( return source.MediaStreams?.find(
(stream) => stream.Type === "Video", (stream) => stream.Type === "Video"
) as MediaStream; ) as MediaStream;
}, [source.MediaStreams]); }, [source.MediaStreams]);
if (!videoStream) return null; if (!videoStream) return null;
return ( return (
<View className='flex-row flex-wrap gap-2'> <View className="flex-row flex-wrap gap-2">
<Badge <Badge
variant='gray' variant="gray"
iconLeft={<Ionicons name='film-outline' size={16} color='white' />} iconLeft={<Ionicons name="film-outline" size={16} color="white" />}
text={formatFileSize(source.Size)} text={formatFileSize(source.Size)}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={<Ionicons name='film-outline' size={16} color='white' />} iconLeft={<Ionicons name="film-outline" size={16} color="white" />}
text={`${videoStream.Width}x${videoStream.Height}`} text={`${videoStream.Width}x${videoStream.Height}`}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='color-palette-outline' size={16} color='white' /> <Ionicons name="color-palette-outline" size={16} color="white" />
} }
text={videoStream.VideoRange} text={videoStream.VideoRange}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='code-working-outline' size={16} color='white' /> <Ionicons name="code-working-outline" size={16} color="white" />
} }
text={videoStream.Codec} text={videoStream.Codec}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Ionicons name='speedometer-outline' size={16} color='white' /> <Ionicons name="speedometer-outline" size={16} color="white" />
} }
text={formatBitrate(videoStream.BitRate)} text={formatBitrate(videoStream.BitRate)}
/> />
<Badge <Badge
variant='gray' variant="gray"
iconLeft={<Ionicons name='play-outline' size={16} color='white' />} iconLeft={<Ionicons name="play-outline" size={16} color="white" />}
text={`${videoStream.AverageFrameRate?.toFixed(0)} fps`} text={`${videoStream.AverageFrameRate?.toFixed(0)} fps`}
/> />
</View> </View>
@@ -234,8 +226,15 @@ const formatFileSize = (bytes?: number | null) => {
const sizes = ["Bytes", "KB", "MB", "GB", "TB"]; const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
if (bytes === 0) return "0 Byte"; if (bytes === 0) return "0 Byte";
const i = Number.parseInt( const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)).toString());
Math.floor(Math.log(bytes) / Math.log(1024)).toString(),
);
return Math.round((bytes / Math.pow(1024, i)) * 100) / 100 + " " + sizes[i]; return Math.round((bytes / Math.pow(1024, i)) * 100) / 100 + " " + sizes[i];
}; };
const formatBitrate = (bitrate?: number | null) => {
if (!bitrate) return "N/A";
const sizes = ["bps", "Kbps", "Mbps", "Gbps", "Tbps"];
if (bitrate === 0) return "0 bps";
const i = parseInt(Math.floor(Math.log(bitrate) / Math.log(1000)).toString());
return Math.round((bitrate / Math.pow(1000, i)) * 100) / 100 + " " + sizes[i];
};

View File

@@ -1,10 +1,10 @@
import React from "react";
import { View, Text, TouchableOpacity } from "react-native";
import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery"; import { useJellyfinDiscovery } from "@/hooks/useJellyfinDiscovery";
import type React from "react";
import { useTranslation } from "react-i18next";
import { Text, TouchableOpacity, View } from "react-native";
import { Button } from "./Button"; import { Button } from "./Button";
import { ListGroup } from "./list/ListGroup"; import { ListGroup } from "./list/ListGroup";
import { ListItem } from "./list/ListItem"; import { ListItem } from "./list/ListItem";
import { useTranslation } from "react-i18next";
interface Props { interface Props {
onServerSelect?: (server: { address: string; serverName?: string }) => void; onServerSelect?: (server: { address: string; serverName?: string }) => void;
@@ -15,17 +15,15 @@ const JellyfinServerDiscovery: React.FC<Props> = ({ onServerSelect }) => {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<View className='mt-2'> <View className="mt-2">
<Button onPress={startDiscovery} color='black'> <Button onPress={startDiscovery} color="black">
<Text className='text-white text-center'> <Text className="text-white text-center">
{isSearching {isSearching ? t("server.searching") : t("server.search_for_local_servers")}
? t("server.searching")
: t("server.search_for_local_servers")}
</Text> </Text>
</Button> </Button>
{servers.length ? ( {servers.length ? (
<ListGroup title={t("server.servers")} className='mt-4'> <ListGroup title={t("server.servers")} className="mt-4">
{servers.map((server) => ( {servers.map((server) => (
<ListItem <ListItem
key={server.address} key={server.address}

View File

@@ -1,6 +1,6 @@
import { import {
ActivityIndicator, ActivityIndicator,
type ActivityIndicatorProps, ActivityIndicatorProps,
Platform, Platform,
View, View,
} from "react-native"; } from "react-native";

View File

@@ -1,12 +1,12 @@
import type { import {
BaseItemDto, BaseItemDto,
MediaSourceInfo, MediaSourceInfo,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { useMemo } from "react"; import { useMemo } from "react";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import { useTranslation } from "react-i18next";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
import { useTranslation } from "react-i18next";
interface Props extends React.ComponentProps<typeof View> { interface Props extends React.ComponentProps<typeof View> {
item: BaseItemDto; item: BaseItemDto;
@@ -24,9 +24,9 @@ export const MediaSourceSelector: React.FC<Props> = ({
const selectedName = useMemo( const selectedName = useMemo(
() => () =>
item.MediaSources?.find((x) => x.Id === selected?.Id)?.MediaStreams?.find( item.MediaSources?.find((x) => x.Id === selected?.Id)?.MediaStreams?.find(
(x) => x.Type === "Video", (x) => x.Type === "Video"
)?.DisplayTitle || "", )?.DisplayTitle || "",
[item, selected], [item, selected]
); );
const { t } = useTranslation(); const { t } = useTranslation();
@@ -54,26 +54,26 @@ export const MediaSourceSelector: React.FC<Props> = ({
return ( return (
<View <View
className='flex shrink' className="flex shrink"
style={{ style={{
minWidth: 50, minWidth: 50,
}} }}
> >
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<Text className='opacity-50 mb-1 text-xs'> <Text className="opacity-50 mb-1 text-xs">
{t("item_card.video")} {t("item_card.video")}
</Text> </Text>
<TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center'> <TouchableOpacity className="bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center">
<Text numberOfLines={1}>{selectedName}</Text> <Text numberOfLines={1}>{selectedName}</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={true} loop={true}
side='bottom' side="bottom"
align='start' align="start"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={8} collisionPadding={8}

View File

@@ -1,17 +1,17 @@
import { ItemCardText } from "@/components/ItemCardText"; import React from "react";
import { HorizontalScroll } from "@/components/common/HorrizontalScroll"; import { View, ViewProps } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { HorizontalScroll } from "@/components/common/HorrizontalScroll";
import { TouchableItemRouter } from "@/components/common/TouchableItemRouter"; import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
import MoviePoster from "@/components/posters/MoviePoster"; import MoviePoster from "@/components/posters/MoviePoster";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { ItemCardText } from "@/components/ItemCardText";
import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import type React from "react"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useQuery } from "@tanstack/react-query";
import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { View, type ViewProps } from "react-native";
interface Props extends ViewProps { interface Props extends ViewProps {
actorId: string; actorId: string;
@@ -77,8 +77,8 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
return ( return (
<View {...props}> <View {...props}>
<Text className='text-lg font-bold mb-2 px-4'> <Text className="text-lg font-bold mb-2 px-4">
{t("item_card.more_with", { name: actor?.Name })} {t("item_card.more_with", {name: actor?.Name})}
</Text> </Text>
<HorizontalScroll <HorizontalScroll
data={items} data={items}
@@ -88,7 +88,7 @@ export const MoreMoviesWithActor: React.FC<Props> = ({
<TouchableItemRouter <TouchableItemRouter
key={idx} key={idx}
item={item} item={item}
className='flex flex-col w-28' className="flex flex-col w-28"
> >
<View> <View>
<MoviePoster item={item} /> <MoviePoster item={item} />

View File

@@ -1,8 +1,8 @@
import { TouchableOpacity, View, ViewProps } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import { tc } from "@/utils/textTools"; import { tc } from "@/utils/textTools";
import { useState } from "react"; import { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { TouchableOpacity, View, type ViewProps } from "react-native";
interface Props extends ViewProps { interface Props extends ViewProps {
text?: string | null; text?: string | null;
@@ -20,22 +20,20 @@ export const OverviewText: React.FC<Props> = ({
if (!text) return null; if (!text) return null;
return ( return (
<View className='flex flex-col' {...props}> <View className="flex flex-col" {...props}>
<Text className='text-lg font-bold mb-2'>{t("item_card.overview")}</Text> <Text className="text-lg font-bold mb-2">{t("item_card.overview")}</Text>
<TouchableOpacity <TouchableOpacity
onPress={() => onPress={() =>
setLimit((prev) => setLimit((prev) =>
prev === characterLimit ? text.length : characterLimit, prev === characterLimit ? text.length : characterLimit
) )
} }
> >
<View> <View>
<Text>{tc(text, limit)}</Text> <Text>{tc(text, limit)}</Text>
{text.length > characterLimit && ( {text.length > characterLimit && (
<Text className='text-purple-600 mt-1'> <Text className="text-purple-600 mt-1">
{limit === characterLimit {limit === characterLimit ? t("item_card.show_more") : t("item_card.show_less")}
? t("item_card.show_more")
: t("item_card.show_less")}
</Text> </Text>
)} )}
</View> </View>

View File

@@ -1,11 +1,6 @@
import { LinearGradient } from "expo-linear-gradient"; import { LinearGradient } from "expo-linear-gradient";
import type { PropsWithChildren, ReactElement } from "react"; import { type PropsWithChildren, type ReactElement } from "react";
import { import {NativeScrollEvent, NativeSyntheticEvent, View, ViewProps} from "react-native";
type NativeScrollEvent,
NativeSyntheticEvent,
View,
type ViewProps,
} from "react-native";
import Animated, { import Animated, {
interpolate, interpolate,
useAnimatedRef, useAnimatedRef,
@@ -40,40 +35,36 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
translateY: interpolate( translateY: interpolate(
scrollOffset.value, scrollOffset.value,
[-headerHeight, 0, headerHeight], [-headerHeight, 0, headerHeight],
[-headerHeight / 2, 0, headerHeight * 0.75], [-headerHeight / 2, 0, headerHeight * 0.75]
), ),
}, },
{ {
scale: interpolate( scale: interpolate(
scrollOffset.value, scrollOffset.value,
[-headerHeight, 0, headerHeight], [-headerHeight, 0, headerHeight],
[2, 1, 1], [2, 1, 1]
), ),
}, },
], ],
}; };
}); });
function isCloseToBottom({
layoutMeasurement, function isCloseToBottom({layoutMeasurement, contentOffset, contentSize}: NativeScrollEvent) {
contentOffset, return layoutMeasurement.height + contentOffset.y >= contentSize.height - 20;
contentSize,
}: NativeScrollEvent) {
return (
layoutMeasurement.height + contentOffset.y >= contentSize.height - 20
);
} }
return ( return (
<View className='flex-1' {...props}> <View className="flex-1" {...props}>
<Animated.ScrollView <Animated.ScrollView
style={{ style={{
position: "relative", position: "relative",
}} }}
ref={scrollRef} ref={scrollRef}
scrollEventThrottle={16} scrollEventThrottle={16}
onScroll={(e) => { onScroll={e => {
if (isCloseToBottom(e.nativeEvent)) onEndReached?.(); if (isCloseToBottom(e.nativeEvent))
onEndReached?.()
}} }}
> >
{logo && ( {logo && (
@@ -82,7 +73,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
top: headerHeight - 200, top: headerHeight - 200,
height: 130, height: 130,
}} }}
className='absolute left-0 w-full z-40 px-4 flex justify-center items-center' className="absolute left-0 w-full z-40 px-4 flex justify-center items-center"
> >
{logo} {logo}
</View> </View>
@@ -104,7 +95,7 @@ export const ParallaxScrollView: React.FC<PropsWithChildren<Props>> = ({
style={{ style={{
top: -50, top: -50,
}} }}
className='relative flex-1 bg-transparent pb-24' className="relative flex-1 bg-transparent pb-24"
> >
<LinearGradient <LinearGradient
// Background Linear Gradient // Background Linear Gradient

View File

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

View File

@@ -1,22 +1,18 @@
import { useHaptic } from "@/hooks/useHaptic"; import { Platform } from "react-native";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { itemThemeColorAtom } from "@/utils/atoms/primaryColor"; import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl"; import { getParentBackdropImageUrl } from "@/utils/jellyfin/image/getParentBackdropImageUrl";
import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl"; import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl"; import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
import { chromecast } from "@/utils/profiles/chromecast";
import { chromecasth265 } from "@/utils/profiles/chromecasth265";
import ios from "@/utils/profiles/ios"; import ios from "@/utils/profiles/ios";
import { runtimeTicksToMinutes } from "@/utils/time"; import { runtimeTicksToMinutes } from "@/utils/time";
import { useActionSheet } from "@expo/react-native-action-sheet"; import { useActionSheet } from "@expo/react-native-action-sheet";
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 { 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 { Platform, Pressable } from "react-native";
import { Alert, TouchableOpacity, View } from "react-native"; import { Alert, TouchableOpacity, View } from "react-native";
import CastContext, { import CastContext, {
CastButton, CastButton,
@@ -34,8 +30,13 @@ import Animated, {
useSharedValue, useSharedValue,
withTiming, withTiming,
} from "react-native-reanimated"; } from "react-native-reanimated";
import type { Button } from "./Button"; import { Button } from "./Button";
import type { SelectedOptions } from "./ItemContent"; import { SelectedOptions } from "./ItemContent";
const chromecastProfile = !Platform.isTV
? require("@/utils/profiles/chromecast")
: null;
import { useTranslation } from "react-i18next";
import { useHaptic } from "@/hooks/useHaptic";
interface Props extends React.ComponentProps<typeof Button> { interface Props extends React.ComponentProps<typeof Button> {
item: BaseItemDto; item: BaseItemDto;
@@ -71,14 +72,17 @@ export const PlayButton: React.FC<Props> = ({
const lightHapticFeedback = useHaptic("light"); const lightHapticFeedback = useHaptic("light");
const goToPlayer = useCallback( const goToPlayer = useCallback(
(q: string) => { (q: string, bitrateValue: number | undefined) => {
router.push(`/player/direct-player?${q}`); if (!bitrateValue) {
router.push(`/player/direct-player?${q}`);
return;
}
router.push(`/player/transcoding-player?${q}`);
}, },
[router], [router]
); );
const onPress = useCallback(async () => { const onPress = useCallback(async () => {
console.log("onPress");
if (!item) return; if (!item) return;
lightHapticFeedback(); lightHapticFeedback();
@@ -94,7 +98,7 @@ export const PlayButton: React.FC<Props> = ({
const queryString = queryParams.toString(); const queryString = queryParams.toString();
if (!client) { if (!client) {
goToPlayer(queryString); goToPlayer(queryString, selectedOptions.bitrate?.value);
return; return;
} }
@@ -113,19 +117,16 @@ export const PlayButton: React.FC<Props> = ({
switch (selectedIndex) { switch (selectedIndex) {
case 0: case 0:
await CastContext.getPlayServicesState().then(async (state) => { if (!Platform.isTV) {
if (state && state !== PlayServicesState.SUCCESS) { await CastContext.getPlayServicesState().then(async (state) => {
CastContext.showPlayServicesErrorDialog(state); if (state && state !== PlayServicesState.SUCCESS)
} else { CastContext.showPlayServicesErrorDialog(state);
// Check if user wants H265 for Chromecast else {
const enableH265 = settings.enableH265ForChromecast; // Get a new URL with the Chromecast device profile:
// Get a new URL with the Chromecast device profile
try {
const data = await getStreamUrl({ const data = await getStreamUrl({
api, api,
item, item,
deviceProfile: enableH265 ? chromecasth265 : chromecast, deviceProfile: chromecastProfile,
startTimeTicks: item?.UserData?.PlaybackPositionTicks!, startTimeTicks: item?.UserData?.PlaybackPositionTicks!,
userId: user?.Id, userId: user?.Id,
audioStreamIndex: selectedOptions.audioIndex, audioStreamIndex: selectedOptions.audioIndex,
@@ -134,13 +135,11 @@ export const PlayButton: React.FC<Props> = ({
subtitleStreamIndex: selectedOptions.subtitleIndex, subtitleStreamIndex: selectedOptions.subtitleIndex,
}); });
console.log("URL: ", data?.url, enableH265);
if (!data?.url) { if (!data?.url) {
console.warn("No URL returned from getStreamUrl", data); console.warn("No URL returned from getStreamUrl", data);
Alert.alert( Alert.alert(
t("player.client_error"), t("player.client_error"),
t("player.could_not_create_stream_for_chromecast"), t("player.could_not_create_stream_for_chromecast")
); );
return; return;
} }
@@ -170,36 +169,36 @@ export const PlayButton: React.FC<Props> = ({
], ],
} }
: item.Type === "Movie" : item.Type === "Movie"
? { ? {
type: "movie", type: "movie",
title: item.Name || "", title: item.Name || "",
subtitle: item.Overview || "", subtitle: item.Overview || "",
images: [ images: [
{ {
url: getPrimaryImageUrl({ url: getPrimaryImageUrl({
api, api,
item, item,
quality: 90, quality: 90,
width: 2000, width: 2000,
})!, })!,
}, },
], ],
} }
: { : {
type: "generic", type: "generic",
title: item.Name || "", title: item.Name || "",
subtitle: item.Overview || "", subtitle: item.Overview || "",
images: [ images: [
{ {
url: getPrimaryImageUrl({ url: getPrimaryImageUrl({
api, api,
item, item,
quality: 90, quality: 90,
width: 2000, width: 2000,
})!, })!,
}, },
], ],
}, },
}, },
startTime: 0, startTime: 0,
}) })
@@ -210,19 +209,17 @@ export const PlayButton: React.FC<Props> = ({
} }
CastContext.showExpandedControls(); CastContext.showExpandedControls();
}); });
} catch (e) {
console.log(e);
} }
} });
}); }
break; break;
case 1: case 1:
goToPlayer(queryString); goToPlayer(queryString, selectedOptions.bitrate?.value);
break; break;
case cancelButtonIndex: case cancelButtonIndex:
break; break;
} }
}, }
); );
}, [ }, [
item, item,
@@ -243,7 +240,7 @@ export const PlayButton: React.FC<Props> = ({
return userData.PlaybackPositionTicks > 0 return userData.PlaybackPositionTicks > 0
? Math.max( ? Math.max(
(userData.PlaybackPositionTicks / item.RunTimeTicks) * 100, (userData.PlaybackPositionTicks / item.RunTimeTicks) * 100,
MIN_PLAYBACK_WIDTH, MIN_PLAYBACK_WIDTH
) )
: 0; : 0;
} }
@@ -260,7 +257,7 @@ export const PlayButton: React.FC<Props> = ({
easing: Easing.bezier(0.7, 0, 0.3, 1.0), easing: Easing.bezier(0.7, 0, 0.3, 1.0),
}); });
}, },
[item], [item]
); );
useAnimatedReaction( useAnimatedReaction(
@@ -273,7 +270,7 @@ export const PlayButton: React.FC<Props> = ({
easing: Easing.bezier(0.9, 0, 0.31, 0.99), easing: Easing.bezier(0.9, 0, 0.31, 0.99),
}); });
}, },
[colorAtom], [colorAtom]
); );
useEffect(() => { useEffect(() => {
@@ -294,7 +291,7 @@ export const PlayButton: React.FC<Props> = ({
backgroundColor: interpolateColor( backgroundColor: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.primary, endColor.value.primary], [startColor.value.primary, endColor.value.primary]
), ),
})); }));
@@ -302,7 +299,7 @@ export const PlayButton: React.FC<Props> = ({
backgroundColor: interpolateColor( backgroundColor: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.primary, endColor.value.primary], [startColor.value.primary, endColor.value.primary]
), ),
})); }));
@@ -310,7 +307,7 @@ export const PlayButton: React.FC<Props> = ({
width: `${interpolate( width: `${interpolate(
widthProgress.value, widthProgress.value,
[0, 1], [0, 1],
[startWidth.value, targetWidth.value], [startWidth.value, targetWidth.value]
)}%`, )}%`,
})); }));
@@ -318,7 +315,7 @@ export const PlayButton: React.FC<Props> = ({
color: interpolateColor( color: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.text, endColor.value.text], [startColor.value.text, endColor.value.text]
), ),
})); }));
/** /**
@@ -326,62 +323,75 @@ export const PlayButton: React.FC<Props> = ({
*/ */
return ( return (
<TouchableOpacity <View>
disabled={!item} <TouchableOpacity
accessibilityLabel='Play button' disabled={!item}
accessibilityHint='Tap to play the media' accessibilityLabel="Play button"
onPress={onPress} accessibilityHint="Tap to play the media"
className={`relative`} onPress={onPress}
{...props} className={`relative`}
> {...props}
<View className='absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden'>
<Animated.View
style={[
animatedPrimaryStyle,
animatedWidthStyle,
{
height: "100%",
},
]}
/>
</View>
<Animated.View
style={[animatedAverageStyle, { opacity: 0.5 }]}
className='absolute w-full h-full top-0 left-0 rounded-xl'
/>
<View
style={{
borderWidth: 1,
borderColor: colorAtom.primary,
borderStyle: "solid",
}}
className='flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full '
> >
<View className='flex flex-row items-center space-x-2'> <View className="absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden">
<Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}> <Animated.View
{runtimeTicksToMinutes(item?.RunTimeTicks)} style={[
</Animated.Text> animatedPrimaryStyle,
<Animated.Text style={animatedTextStyle}> animatedWidthStyle,
<Ionicons name='play-circle' size={24} /> {
</Animated.Text> height: "100%",
{client && ( },
<Animated.Text style={animatedTextStyle}> ]}
<Feather name='cast' size={22} /> />
<CastButton tintColor='transparent' />
</Animated.Text>
)}
{!client && settings?.openInVLC && (
<Animated.Text style={animatedTextStyle}>
<MaterialCommunityIcons
name='vlc'
size={18}
color={animatedTextStyle.color}
/>
</Animated.Text>
)}
</View> </View>
</View>
</TouchableOpacity> <Animated.View
style={[animatedAverageStyle, { opacity: 0.5 }]}
className="absolute w-full h-full top-0 left-0 rounded-xl"
/>
<View
style={{
borderWidth: 1,
borderColor: colorAtom.primary,
borderStyle: "solid",
}}
className="flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full "
>
<View className="flex flex-row items-center space-x-2">
<Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
{runtimeTicksToMinutes(item?.RunTimeTicks)}
</Animated.Text>
<Animated.Text style={animatedTextStyle}>
<Ionicons name="play-circle" size={24} />
</Animated.Text>
{client && (
<Animated.Text style={animatedTextStyle}>
<Feather name="cast" size={22} />
<CastButton tintColor="transparent" />
</Animated.Text>
)}
{!client && settings?.openInVLC && (
<Animated.Text style={animatedTextStyle}>
<MaterialCommunityIcons
name="vlc"
size={18}
color={animatedTextStyle.color}
/>
</Animated.Text>
)}
</View>
</View>
</TouchableOpacity>
{/* <View className="mt-2 flex flex-row items-center">
<Ionicons
name="information-circle"
size={12}
className=""
color={"#9BA1A6"}
/>
<Text className="text-neutral-500 ml-1">
{directStream ? "Direct stream" : "Transcoded stream"}
</Text>
</View> */}
</View>
); );
}; };

View File

@@ -1,16 +1,14 @@
import { useHaptic } from "@/hooks/useHaptic"; import { Platform } from "react-native";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import { itemThemeColorAtom } from "@/utils/atoms/primaryColor"; import { itemThemeColorAtom } from "@/utils/atoms/primaryColor";
import { useSettings } from "@/utils/atoms/settings"; import { useSettings } from "@/utils/atoms/settings";
import { runtimeTicksToMinutes } from "@/utils/time"; import { runtimeTicksToMinutes } from "@/utils/time";
import { useActionSheet } from "@expo/react-native-action-sheet"; import { useActionSheet } from "@expo/react-native-action-sheet";
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 { 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 { Platform } from "react-native";
import { Alert, TouchableOpacity, View } from "react-native"; import { Alert, TouchableOpacity, View } from "react-native";
import Animated, { import Animated, {
Easing, Easing,
@@ -22,8 +20,10 @@ import Animated, {
useSharedValue, useSharedValue,
withTiming, withTiming,
} from "react-native-reanimated"; } from "react-native-reanimated";
import type { Button } from "./Button"; import { Button } from "./Button";
import type { SelectedOptions } from "./ItemContent"; import { SelectedOptions } from "./ItemContent";
import { useTranslation } from "react-i18next";
import { useHaptic } from "@/hooks/useHaptic";
interface Props extends React.ComponentProps<typeof Button> { interface Props extends React.ComponentProps<typeof Button> {
item: BaseItemDto; item: BaseItemDto;
@@ -57,14 +57,17 @@ export const PlayButton: React.FC<Props> = ({
const lightHapticFeedback = useHaptic("light"); const lightHapticFeedback = useHaptic("light");
const goToPlayer = useCallback( const goToPlayer = useCallback(
(q: string) => { (q: string, bitrateValue: number | undefined) => {
router.push(`/player/direct-player?${q}`); if (!bitrateValue) {
router.push(`/player/direct-player?${q}`);
return;
}
router.push(`/player/transcoding-player?${q}`);
}, },
[router], [router]
); );
const onPress = () => { const onPress = useCallback(async () => {
console.log("onpress");
if (!item) return; if (!item) return;
lightHapticFeedback(); lightHapticFeedback();
@@ -78,9 +81,17 @@ export const PlayButton: React.FC<Props> = ({
}); });
const queryString = queryParams.toString(); const queryString = queryParams.toString();
goToPlayer(queryString); goToPlayer(queryString, selectedOptions.bitrate?.value);
return; return;
}; }, [
item,
settings,
api,
user,
router,
showActionSheetWithOptions,
selectedOptions,
]);
const derivedTargetWidth = useDerivedValue(() => { const derivedTargetWidth = useDerivedValue(() => {
if (!item || !item.RunTimeTicks) return 0; if (!item || !item.RunTimeTicks) return 0;
@@ -89,7 +100,7 @@ export const PlayButton: React.FC<Props> = ({
return userData.PlaybackPositionTicks > 0 return userData.PlaybackPositionTicks > 0
? Math.max( ? Math.max(
(userData.PlaybackPositionTicks / item.RunTimeTicks) * 100, (userData.PlaybackPositionTicks / item.RunTimeTicks) * 100,
MIN_PLAYBACK_WIDTH, MIN_PLAYBACK_WIDTH
) )
: 0; : 0;
} }
@@ -106,7 +117,7 @@ export const PlayButton: React.FC<Props> = ({
easing: Easing.bezier(0.7, 0, 0.3, 1.0), easing: Easing.bezier(0.7, 0, 0.3, 1.0),
}); });
}, },
[item], [item]
); );
useAnimatedReaction( useAnimatedReaction(
@@ -119,7 +130,7 @@ export const PlayButton: React.FC<Props> = ({
easing: Easing.bezier(0.9, 0, 0.31, 0.99), easing: Easing.bezier(0.9, 0, 0.31, 0.99),
}); });
}, },
[colorAtom], [colorAtom]
); );
useEffect(() => { useEffect(() => {
@@ -140,7 +151,7 @@ export const PlayButton: React.FC<Props> = ({
backgroundColor: interpolateColor( backgroundColor: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.primary, endColor.value.primary], [startColor.value.primary, endColor.value.primary]
), ),
})); }));
@@ -148,7 +159,7 @@ export const PlayButton: React.FC<Props> = ({
backgroundColor: interpolateColor( backgroundColor: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.primary, endColor.value.primary], [startColor.value.primary, endColor.value.primary]
), ),
})); }));
@@ -156,7 +167,7 @@ export const PlayButton: React.FC<Props> = ({
width: `${interpolate( width: `${interpolate(
widthProgress.value, widthProgress.value,
[0, 1], [0, 1],
[startWidth.value, targetWidth.value], [startWidth.value, targetWidth.value]
)}%`, )}%`,
})); }));
@@ -164,7 +175,7 @@ export const PlayButton: React.FC<Props> = ({
color: interpolateColor( color: interpolateColor(
colorChangeProgress.value, colorChangeProgress.value,
[0, 1], [0, 1],
[startColor.value.text, endColor.value.text], [startColor.value.text, endColor.value.text]
), ),
})); }));
/** /**
@@ -172,55 +183,69 @@ export const PlayButton: React.FC<Props> = ({
*/ */
return ( return (
<TouchableOpacity <View>
accessibilityLabel='Play button' <TouchableOpacity
accessibilityHint='Tap to play the media' disabled={!item}
onPress={onPress} accessibilityLabel="Play button"
className={`relative`} accessibilityHint="Tap to play the media"
{...props} onPress={onPress}
> className={`relative`}
<View className='absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden'> {...props}
<Animated.View
style={[
animatedPrimaryStyle,
animatedWidthStyle,
{
height: "100%",
},
]}
/>
</View>
<Animated.View
style={[animatedAverageStyle, { opacity: 0.5 }]}
className='absolute w-full h-full top-0 left-0 rounded-xl'
/>
<View
style={{
borderWidth: 1,
borderColor: colorAtom.primary,
borderStyle: "solid",
}}
className='flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full '
> >
<View className='flex flex-row items-center space-x-2'> <View className="absolute w-full h-full top-0 left-0 rounded-xl z-10 overflow-hidden">
<Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}> <Animated.View
{runtimeTicksToMinutes(item?.RunTimeTicks)} style={[
</Animated.Text> animatedPrimaryStyle,
<Animated.Text style={animatedTextStyle}> animatedWidthStyle,
<Ionicons name='play-circle' size={24} /> {
</Animated.Text> height: "100%",
{settings?.openInVLC && ( },
<Animated.Text style={animatedTextStyle}> ]}
<MaterialCommunityIcons />
name='vlc'
size={18}
color={animatedTextStyle.color}
/>
</Animated.Text>
)}
</View> </View>
</View>
</TouchableOpacity> <Animated.View
style={[animatedAverageStyle, { opacity: 0.5 }]}
className="absolute w-full h-full top-0 left-0 rounded-xl"
/>
<View
style={{
borderWidth: 1,
borderColor: colorAtom.primary,
borderStyle: "solid",
}}
className="flex flex-row items-center justify-center bg-transparent rounded-xl z-20 h-12 w-full "
>
<View className="flex flex-row items-center space-x-2">
<Animated.Text style={[animatedTextStyle, { fontWeight: "bold" }]}>
{runtimeTicksToMinutes(item?.RunTimeTicks)}
</Animated.Text>
<Animated.Text style={animatedTextStyle}>
<Ionicons name="play-circle" size={24} />
</Animated.Text>
{settings?.openInVLC && (
<Animated.Text style={animatedTextStyle}>
<MaterialCommunityIcons
name="vlc"
size={18}
color={animatedTextStyle.color}
/>
</Animated.Text>
)}
</View>
</View>
</TouchableOpacity>
{/* <View className="mt-2 flex flex-row items-center">
<Ionicons
name="information-circle"
size={12}
className=""
color={"#9BA1A6"}
/>
<Text className="text-neutral-500 ml-1">
{directStream ? "Direct stream" : "Transcoded stream"}
</Text>
</View> */}
</View>
); );
}; };

View File

@@ -1,8 +1,8 @@
import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed"; import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useQueryClient } from "@tanstack/react-query"; import { useQueryClient } from "@tanstack/react-query";
import type React from "react"; import React from "react";
import { View, type ViewProps } from "react-native"; import { View, ViewProps } from "react-native";
import { RoundButton } from "./RoundButton"; import { RoundButton } from "./RoundButton";
interface Props extends ViewProps { interface Props extends ViewProps {
@@ -18,7 +18,7 @@ export const PlayedStatus: React.FC<Props> = ({ items, ...props }) => {
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: ["item", item.Id], queryKey: ["item", item.Id],
}); });
}); })
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: ["resumeItems"], queryKey: ["resumeItems"],
}); });
@@ -53,7 +53,7 @@ export const PlayedStatus: React.FC<Props> = ({ items, ...props }) => {
icon={allPlayed ? "checkmark" : "checkmark"} icon={allPlayed ? "checkmark" : "checkmark"}
onPress={async () => { onPress={async () => {
console.log(allPlayed); console.log(allPlayed);
await markAsPlayedStatus(!allPlayed); await markAsPlayedStatus(!allPlayed)
}} }}
size={props.size} size={props.size}
/> />

View File

@@ -1,10 +1,9 @@
import type React from "react"; import React, { useMemo } from "react";
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { View } from "react-native"; import { View } from "react-native";
import { useMMKVString } from "react-native-mmkv"; import { useMMKVString } from "react-native-mmkv";
import { ListGroup } from "./list/ListGroup"; import { ListGroup } from "./list/ListGroup";
import { ListItem } from "./list/ListItem"; import { ListItem } from "./list/ListItem";
import { useTranslation } from "react-i18next";
interface Server { interface Server {
address: string; address: string;
@@ -30,7 +29,7 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
return ( return (
<View> <View>
<ListGroup title={t("server.previous_servers")} className='mt-4'> <ListGroup title={t("server.previous_servers")} className="mt-4">
{previousServers.map((s) => ( {previousServers.map((s) => (
<ListItem <ListItem
key={s.address} key={s.address}
@@ -44,7 +43,7 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
setPreviousServers("[]"); setPreviousServers("[]");
}} }}
title={t("server.clear_button")} title={t("server.clear_button")}
textColor='red' textColor="red"
/> />
</ListGroup> </ListGroup>
</View> </View>

View File

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

View File

@@ -1,18 +1,12 @@
import { useJellyseerr } from "@/hooks/useJellyseerr"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { MediaType } from "@/utils/jellyseerr/server/constants/media"; import { View, ViewProps } from "react-native";
import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
import type {
MovieResult,
TvResult,
} from "@/utils/jellyseerr/server/models/Search";
import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
import { Ionicons } from "@expo/vector-icons";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { useQuery } from "@tanstack/react-query";
import { Image } from "expo-image";
import { useMemo } from "react";
import { View, type ViewProps } from "react-native";
import { Badge } from "./Badge"; import { Badge } from "./Badge";
import { Ionicons } from "@expo/vector-icons";
import { Image } from "expo-image";
import { MovieResult, TvResult } from "@/utils/jellyseerr/server/models/Search";
import { useJellyseerr } from "@/hooks/useJellyseerr";
import { useQuery } from "@tanstack/react-query";
import { MediaType } from "@/utils/jellyseerr/server/constants/media";
interface Props extends ViewProps { interface Props extends ViewProps {
item?: BaseItemDto | null; item?: BaseItemDto | null;
@@ -21,21 +15,21 @@ interface Props extends ViewProps {
export const Ratings: React.FC<Props> = ({ item, ...props }) => { export const Ratings: React.FC<Props> = ({ item, ...props }) => {
if (!item) return null; if (!item) return null;
return ( return (
<View className='flex flex-row items-center mt-2 space-x-2' {...props}> <View className="flex flex-row items-center mt-2 space-x-2" {...props}>
{item.OfficialRating && ( {item.OfficialRating && (
<Badge text={item.OfficialRating} variant='gray' /> <Badge text={item.OfficialRating} variant="gray" />
)} )}
{item.CommunityRating && ( {item.CommunityRating && (
<Badge <Badge
text={item.CommunityRating.toFixed(1)} text={item.CommunityRating.toFixed(1)}
variant='gray' variant="gray"
iconLeft={<Ionicons name='star' size={14} color='gold' />} iconLeft={<Ionicons name="star" size={14} color="gold" />}
/> />
)} )}
{item.CriticRating && ( {item.CriticRating && (
<Badge <Badge
text={item.CriticRating} text={item.CriticRating}
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Image <Image
source={ source={
@@ -55,17 +49,14 @@ export const Ratings: React.FC<Props> = ({ item, ...props }) => {
); );
}; };
export const JellyserrRatings: React.FC<{ export const JellyserrRatings: React.FC<{ result: MovieResult | TvResult }> = ({
result: MovieResult | TvResult | TvDetails | MovieDetails; result,
}> = ({ result }) => { }) => {
const { jellyseerrApi, getMediaType } = useJellyseerr(); const { jellyseerrApi } = useJellyseerr();
const mediaType = useMemo(() => getMediaType(result), [result]);
const { data, isLoading } = useQuery({ const { data, isLoading } = useQuery({
queryKey: ["jellyseerr", result.id, mediaType, "ratings"], queryKey: ["jellyseerr", result.id, result.mediaType, "ratings"],
queryFn: async () => { queryFn: async () => {
return mediaType === MediaType.MOVIE return result.mediaType === MediaType.MOVIE
? jellyseerrApi?.movieRatings(result.id) ? jellyseerrApi?.movieRatings(result.id)
: jellyseerrApi?.tvRatings(result.id); : jellyseerrApi?.tvRatings(result.id);
}, },
@@ -79,14 +70,14 @@ export const JellyserrRatings: React.FC<{
!!result.voteCount || !!result.voteCount ||
(data?.criticsRating && !!data?.criticsScore) || (data?.criticsRating && !!data?.criticsScore) ||
(data?.audienceRating && !!data?.audienceScore)) && ( (data?.audienceRating && !!data?.audienceScore)) && (
<View className='flex flex-row flex-wrap space-x-1'> <View className="flex flex-row flex-wrap space-x-1">
{data?.criticsRating && !!data?.criticsScore && ( {data?.criticsRating && !!data?.criticsScore && (
<Badge <Badge
text={`${data.criticsScore}%`} text={`${data.criticsScore}%`}
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Image <Image
className='mr-1' className="mr-1"
source={ source={
data?.criticsRating === "Rotten" data?.criticsRating === "Rotten"
? require("@/utils/jellyseerr/src/assets/rt_rotten.svg") ? require("@/utils/jellyseerr/src/assets/rt_rotten.svg")
@@ -103,10 +94,10 @@ export const JellyserrRatings: React.FC<{
{data?.audienceRating && !!data?.audienceScore && ( {data?.audienceRating && !!data?.audienceScore && (
<Badge <Badge
text={`${data.audienceScore}%`} text={`${data.audienceScore}%`}
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Image <Image
className='mr-1' className="mr-1"
source={ source={
data?.audienceRating === "Spilled" data?.audienceRating === "Spilled"
? require("@/utils/jellyseerr/src/assets/rt_aud_rotten.svg") ? require("@/utils/jellyseerr/src/assets/rt_aud_rotten.svg")
@@ -123,10 +114,10 @@ export const JellyserrRatings: React.FC<{
{!!result.voteCount && ( {!!result.voteCount && (
<Badge <Badge
text={`${Math.round(result.voteAverage * 10)}%`} text={`${Math.round(result.voteAverage * 10)}%`}
variant='gray' variant="gray"
iconLeft={ iconLeft={
<Image <Image
className='mr-1' className="mr-1"
source={require("@/utils/jellyseerr/src/assets/tmdb_logo.svg")} source={require("@/utils/jellyseerr/src/assets/tmdb_logo.svg")}
style={{ style={{
width: 14, width: 14,

View File

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

View File

@@ -1,23 +1,18 @@
import MoviePoster from "@/components/posters/MoviePoster"; import MoviePoster from "@/components/posters/MoviePoster";
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import { getLibraryApi } from "@jellyfin/sdk/lib/utils/api"; import { getLibraryApi } from "@jellyfin/sdk/lib/utils/api";
import { useQuery } from "@tanstack/react-query"; 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 { useMemo } from "react"; import { useMemo } from "react";
import { useTranslation } from "react-i18next"; import { ScrollView, TouchableOpacity, View, ViewProps } from "react-native";
import { import { Text } from "./common/Text";
ScrollView,
TouchableOpacity,
View,
type ViewProps,
} from "react-native";
import { ItemCardText } from "./ItemCardText"; import { ItemCardText } from "./ItemCardText";
import { Loader } from "./Loader"; import { Loader } from "./Loader";
import { HorizontalScroll } from "./common/HorrizontalScroll"; import { HorizontalScroll } from "./common/HorrizontalScroll";
import { Text } from "./common/Text";
import { TouchableItemRouter } from "./common/TouchableItemRouter"; import { TouchableItemRouter } from "./common/TouchableItemRouter";
import { useTranslation } from "react-i18next";
interface SimilarItemsProps extends ViewProps { interface SimilarItemsProps extends ViewProps {
itemId?: string | null; itemId?: string | null;
@@ -44,19 +39,17 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
return response.data.Items || []; return response.data.Items || [];
}, },
enabled: !!api && !!user?.Id, enabled: !!api && !!user?.Id,
staleTime: Number.POSITIVE_INFINITY, staleTime: Infinity,
}); });
const movies = useMemo( const movies = useMemo(
() => similarItems?.filter((i) => i.Type === "Movie") || [], () => similarItems?.filter((i) => i.Type === "Movie") || [],
[similarItems], [similarItems]
); );
return ( return (
<View {...props}> <View {...props}>
<Text className='px-4 text-lg font-bold mb-2'> <Text className="px-4 text-lg font-bold mb-2">{t("item_card.similar_items")}</Text>
{t("item_card.similar_items")}
</Text>
<HorizontalScroll <HorizontalScroll
data={movies} data={movies}
loading={isLoading} loading={isLoading}
@@ -66,7 +59,7 @@ export const SimilarItems: React.FC<SimilarItemsProps> = ({
<TouchableItemRouter <TouchableItemRouter
key={idx} key={idx}
item={item} item={item}
className='flex flex-col w-28' className="flex flex-col w-28"
> >
<View> <View>
<MoviePoster item={item} /> <MoviePoster item={item} />

View File

@@ -1,40 +1,49 @@
import { tc } from "@/utils/textTools"; import { tc } from "@/utils/textTools";
import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models"; import { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models";
import { useMemo } from "react"; import { useMemo } from "react";
import { Platform, TouchableOpacity, View } from "react-native"; import { Platform, TouchableOpacity, View } from "react-native";
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import { useTranslation } from "react-i18next";
import { Text } from "./common/Text"; import { Text } from "./common/Text";
import { SubtitleHelper } from "@/utils/SubtitleHelper";
import { useTranslation } from "react-i18next";
interface Props extends React.ComponentProps<typeof View> { interface Props extends React.ComponentProps<typeof View> {
source?: MediaSourceInfo; source?: MediaSourceInfo;
onChange: (value: number) => void; onChange: (value: number) => void;
selected?: number | undefined; selected?: number | undefined;
isTranscoding?: boolean;
} }
export const SubtitleTrackSelector: React.FC<Props> = ({ export const SubtitleTrackSelector: React.FC<Props> = ({
source, source,
onChange, onChange,
selected, selected,
isTranscoding,
...props ...props
}) => { }) => {
if (Platform.isTV) return null; if (Platform.isTV) return null;
const subtitleStreams = useMemo(() => { const subtitleStreams = useMemo(() => {
return source?.MediaStreams?.filter((x) => x.Type === "Subtitle"); const subtitleHelper = new SubtitleHelper(source?.MediaStreams ?? []);
}, [source]);
if (isTranscoding && Platform.OS === "ios") {
return subtitleHelper.getUniqueSubtitles();
}
return subtitleHelper.getSubtitles();
}, [source, isTranscoding]);
const selectedSubtitleSteam = useMemo( const selectedSubtitleSteam = useMemo(
() => subtitleStreams?.find((x) => x.Index === selected), () => subtitleStreams.find((x) => x.Index === selected),
[subtitleStreams, selected], [subtitleStreams, selected]
); );
if (subtitleStreams?.length === 0) return null; if (subtitleStreams.length === 0) return null;
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<View <View
className='flex col shrink justify-start place-self-start items-start' className="flex col shrink justify-start place-self-start items-start"
style={{ style={{
minWidth: 60, minWidth: 60,
maxWidth: 200, maxWidth: 200,
@@ -42,12 +51,12 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
> >
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
<View className='flex flex-col ' {...props}> <View className="flex flex-col " {...props}>
<Text numberOfLines={1} className='opacity-50 mb-1 text-xs'> <Text className="opacity-50 mb-1 text-xs">
{t("item_card.subtitles")} {t("item_card.subtitles")}
</Text> </Text>
<TouchableOpacity className='bg-neutral-900 h-10 rounded-xl border-neutral-800 border px-3 py-2 flex flex-row items-center justify-between'> <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 className=' '> <Text className=" ">
{selectedSubtitleSteam {selectedSubtitleSteam
? tc(selectedSubtitleSteam?.DisplayTitle, 7) ? tc(selectedSubtitleSteam?.DisplayTitle, 7)
: t("item_card.none")} : t("item_card.none")}
@@ -57,8 +66,8 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={true} loop={true}
side='bottom' side="bottom"
align='start' align="start"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={8} collisionPadding={8}

View File

@@ -1,4 +1,4 @@
import { StyleSheet, Text, type TextProps } from "react-native"; import { Text, type TextProps, StyleSheet } from "react-native";
export type ThemedTextProps = TextProps & { export type ThemedTextProps = TextProps & {
lightColor?: string; lightColor?: string;

View File

@@ -1,5 +1,5 @@
import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models"; import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
import type React from "react"; import React from "react";
import { View } from "react-native"; import { View } from "react-native";
export const WatchedIndicator: React.FC<{ item: BaseItemDto }> = ({ item }) => { export const WatchedIndicator: React.FC<{ item: BaseItemDto }> = ({ item }) => {
@@ -7,7 +7,7 @@ export const WatchedIndicator: React.FC<{ item: BaseItemDto }> = ({ item }) => {
<> <>
{item.UserData?.Played === false && {item.UserData?.Played === false &&
(item.Type === "Movie" || item.Type === "Episode") && ( (item.Type === "Movie" || item.Type === "Episode") && (
<View className='bg-purple-600 w-8 h-8 absolute -top-4 -right-4 rotate-45'></View> <View className="bg-purple-600 w-8 h-8 absolute -top-4 -right-4 rotate-45"></View>
)} )}
</> </>
); );

View File

@@ -1,12 +1,10 @@
import * as React from "react"; import * as React from 'react';
import renderer from "react-test-renderer"; import renderer from 'react-test-renderer';
import { ThemedText } from "../ThemedText"; import { ThemedText } from '../ThemedText';
it(`renders correctly`, () => { it(`renders correctly`, () => {
const tree = renderer const tree = renderer.create(<ThemedText>Snapshot test!</ThemedText>).toJSON();
.create(<ThemedText>Snapshot test!</ThemedText>)
.toJSON();
expect(tree).toMatchSnapshot(); expect(tree).toMatchSnapshot();
}); });

View File

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

View File

@@ -1,5 +1,5 @@
import { useMemo } from "react"; import { useMemo } from "react";
import { StyleSheet, View, type ViewProps } from "react-native"; import { StyleSheet, View, ViewProps } from "react-native";
const getItemStyle = (index: number, numColumns: number) => { const getItemStyle = (index: number, numColumns: number) => {
const alignItems = (() => { const alignItems = (() => {
@@ -29,7 +29,7 @@ export const ColumnItem = ({
...rest ...rest
}: ColumnItemProps) => { }: ColumnItemProps) => {
return ( return (
<View className='flex flex-col mb-2 p-4' style={{ width: "33.3%" }}> <View className="flex flex-col mb-2 p-4" style={{ width: "33.3%" }}>
<View <View
className={` className={`
`} `}

View File

@@ -1,13 +1,13 @@
const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null; const DropdownMenu = !Platform.isTV ? require("zeego/dropdown-menu") : null;
import { Platform, TouchableOpacity, View, ViewProps } from "react-native";
import { Text } from "@/components/common/Text"; import { Text } from "@/components/common/Text";
import DisabledSetting from "@/components/settings/DisabledSetting";
import React, { import React, {
type PropsWithChildren, PropsWithChildren,
type ReactNode, ReactNode,
useEffect, useEffect,
useState, useState,
} from "react"; } from "react";
import { Platform, TouchableOpacity, View, type ViewProps } from "react-native"; import DisabledSetting from "@/components/settings/DisabledSetting";
interface Props<T> { interface Props<T> {
data: T[]; data: T[];
@@ -18,10 +18,10 @@ interface Props<T> {
title: string | ReactNode; title: string | ReactNode;
label: string; label: string;
onSelected: (...item: T[]) => void; onSelected: (...item: T[]) => void;
multiple?: boolean; multi?: boolean;
} }
const Dropdown = <T,>({ const Dropdown = <T extends unknown>({
data, data,
disabled, disabled,
placeholderText, placeholderText,
@@ -30,7 +30,7 @@ const Dropdown = <T,>({
title, title,
label, label,
onSelected, onSelected,
multiple = false, multi = false,
...props ...props
}: PropsWithChildren<Props<T> & ViewProps>) => { }: PropsWithChildren<Props<T> & ViewProps>) => {
if (Platform.isTV) return null; if (Platform.isTV) return null;
@@ -47,10 +47,10 @@ const Dropdown = <T,>({
<DropdownMenu.Root> <DropdownMenu.Root>
<DropdownMenu.Trigger> <DropdownMenu.Trigger>
{typeof title === "string" ? ( {typeof title === "string" ? (
<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 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 style={{}} className='' numberOfLines={1}> <Text style={{}} className="" numberOfLines={1}>
{selected?.length !== undefined {selected?.length !== undefined
? selected.map(titleExtractor).join(",") ? selected.map(titleExtractor).join(",")
: placeholderText} : placeholderText}
@@ -63,8 +63,8 @@ const Dropdown = <T,>({
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content <DropdownMenu.Content
loop={false} loop={false}
side='bottom' side="bottom"
align='center' align="center"
alignOffset={0} alignOffset={0}
avoidCollisions={true} avoidCollisions={true}
collisionPadding={0} collisionPadding={0}
@@ -72,7 +72,7 @@ const Dropdown = <T,>({
> >
<DropdownMenu.Label>{label}</DropdownMenu.Label> <DropdownMenu.Label>{label}</DropdownMenu.Label>
{data.map((item, idx) => {data.map((item, idx) =>
multiple ? ( multi ? (
<DropdownMenu.CheckboxItem <DropdownMenu.CheckboxItem
value={ value={
selected?.some((s) => keyExtractor(s) == keyExtractor(item)) selected?.some((s) => keyExtractor(s) == keyExtractor(item))
@@ -80,7 +80,7 @@ const Dropdown = <T,>({
: "off" : "off"
} }
key={keyExtractor(item)} key={keyExtractor(item)}
onValueChange={(next: "on" | "off", previous: "on" | "off") => { onValueChange={(next, previous) =>
setSelected((p) => { setSelected((p) => {
const prev = p || []; const prev = p || [];
if (next == "on") { if (next == "on") {
@@ -88,11 +88,11 @@ const Dropdown = <T,>({
} }
return [ return [
...prev.filter( ...prev.filter(
(p) => keyExtractor(p) !== keyExtractor(item), (p) => keyExtractor(p) !== keyExtractor(item)
), ),
]; ];
}); })
}} }
> >
<DropdownMenu.ItemTitle> <DropdownMenu.ItemTitle>
{titleExtractor(item)} {titleExtractor(item)}
@@ -107,7 +107,7 @@ const Dropdown = <T,>({
{titleExtractor(item)} {titleExtractor(item)}
</DropdownMenu.ItemTitle> </DropdownMenu.ItemTitle>
</DropdownMenu.Item> </DropdownMenu.Item>
), )
)} )}
</DropdownMenu.Content> </DropdownMenu.Content>
</DropdownMenu.Root> </DropdownMenu.Root>

View File

@@ -1,14 +1,14 @@
import { Text } from "@/components/common/Text";
import { Ionicons } from "@expo/vector-icons";
import { BlurView, type BlurViewProps } from "expo-blur";
import { useRouter } from "expo-router";
import { import {
Platform, Platform,
TouchableOpacity, TouchableOpacity,
type TouchableOpacityProps, TouchableOpacityProps,
View, View,
ViewProps, ViewProps,
} from "react-native"; } from "react-native";
import { Text } from "@/components/common/Text";
import { useRouter } from "expo-router";
import { Ionicons } from "@expo/vector-icons";
import { BlurView, BlurViewProps } from "expo-blur";
interface Props extends BlurViewProps { interface Props extends BlurViewProps {
background?: "blur" | "transparent"; background?: "blur" | "transparent";
@@ -31,13 +31,13 @@ export const HeaderBackButton: React.FC<Props> = ({
<BlurView <BlurView
{...props} {...props}
intensity={100} intensity={100}
className='overflow-hidden rounded-full p-2' className="overflow-hidden rounded-full p-2"
> >
<Ionicons <Ionicons
className='drop-shadow-2xl' className="drop-shadow-2xl"
name='arrow-back' name="arrow-back"
size={24} size={24}
color='white' color="white"
/> />
</BlurView> </BlurView>
</TouchableOpacity> </TouchableOpacity>
@@ -46,14 +46,14 @@ export const HeaderBackButton: React.FC<Props> = ({
return ( return (
<TouchableOpacity <TouchableOpacity
onPress={() => router.back()} onPress={() => router.back()}
className=' bg-neutral-800/80 rounded-full p-2' className=" bg-neutral-800/80 rounded-full p-2"
{...touchableOpacityProps} {...touchableOpacityProps}
> >
<Ionicons <Ionicons
className='drop-shadow-2xl' className="drop-shadow-2xl"
name='arrow-back' name="arrow-back"
size={24} size={24}
color='white' color="white"
/> />
</TouchableOpacity> </TouchableOpacity>
); );

View File

@@ -1,6 +1,6 @@
import { FlashList, type FlashListProps } from "@shopify/flash-list"; import { FlashList, FlashListProps } from "@shopify/flash-list";
import React, { forwardRef, useImperativeHandle, useRef } from "react"; import React, { forwardRef, useImperativeHandle, useRef } from "react";
import { View, type ViewStyle } from "react-native"; import { View, ViewStyle } from "react-native";
import { Text } from "./Text"; import { Text } from "./Text";
type PartialExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>; type PartialExcept<T, K extends keyof T> = Partial<T> & Pick<T, K>;
@@ -44,7 +44,7 @@ export const HorizontalScroll = forwardRef<
noItemsText, noItemsText,
...props ...props
}: HorizontalScrollProps<T>, }: HorizontalScrollProps<T>,
ref: React.ForwardedRef<HorizontalScrollRef>, ref: React.ForwardedRef<HorizontalScrollRef>
) => { ) => {
const flashListRef = useRef<FlashList<T>>(null); const flashListRef = useRef<FlashList<T>>(null);
@@ -66,16 +66,16 @@ export const HorizontalScroll = forwardRef<
item: T; item: T;
index: number; index: number;
}) => ( }) => (
<View className='mr-2'> <View className="mr-2">
<React.Fragment>{renderItem(item, index)}</React.Fragment> <React.Fragment>{renderItem(item, index)}</React.Fragment>
</View> </View>
); );
if (!data || loading) { if (!data || loading) {
return ( return (
<View className='px-4 mb-2'> <View className="px-4 mb-2">
<View className='bg-neutral-950 h-24 w-full rounded-md mb-2'></View> <View className="bg-neutral-950 h-24 w-full rounded-md mb-2"></View>
<View className='bg-neutral-950 h-10 w-full rounded-md mb-1'></View> <View className="bg-neutral-950 h-10 w-full rounded-md mb-1"></View>
</View> </View>
); );
} }
@@ -95,8 +95,8 @@ export const HorizontalScroll = forwardRef<
}} }}
keyExtractor={keyExtractor} keyExtractor={keyExtractor}
ListEmptyComponent={() => ( ListEmptyComponent={() => (
<View className='flex-1 justify-center items-center'> <View className="flex-1 justify-center items-center">
<Text className='text-center text-gray-500'> <Text className="text-center text-gray-500">
{noItemsText || "No data available"} {noItemsText || "No data available"}
</Text> </Text>
</View> </View>
@@ -104,5 +104,5 @@ export const HorizontalScroll = forwardRef<
{...props} {...props}
/> />
); );
}, }
); );

View File

@@ -1,14 +1,13 @@
import { apiAtom, userAtom } from "@/providers/JellyfinProvider"; import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
import type { import {
BaseItemDto, BaseItemDto,
BaseItemDtoQueryResult, BaseItemDtoQueryResult,
} from "@jellyfin/sdk/lib/generated-client/models"; } from "@jellyfin/sdk/lib/generated-client/models";
import { FlashList, type FlashListProps } from "@shopify/flash-list"; import { FlashList, FlashListProps } from "@shopify/flash-list";
import { useInfiniteQuery } from "@tanstack/react-query"; import { useInfiniteQuery } from "@tanstack/react-query";
import { t } from "i18next";
import { useAtom } from "jotai"; import { useAtom } from "jotai";
import React, { useEffect, useMemo } from "react"; import React, { useEffect, useMemo } from "react";
import { View, type ViewStyle } from "react-native"; import { View, ViewStyle } from "react-native";
import Animated, { import Animated, {
useAnimatedStyle, useAnimatedStyle,
useSharedValue, useSharedValue,
@@ -16,6 +15,7 @@ import Animated, {
} from "react-native-reanimated"; } from "react-native-reanimated";
import { Loader } from "../Loader"; import { Loader } from "../Loader";
import { Text } from "./Text"; import { Text } from "./Text";
import { t } from "i18next";
interface HorizontalScrollProps interface HorizontalScrollProps
extends Omit<FlashListProps<BaseItemDto>, "renderItem" | "data" | "style"> { extends Omit<FlashListProps<BaseItemDto>, "renderItem" | "data" | "style"> {
@@ -70,7 +70,7 @@ export function InfiniteHorizontalScroll({
const totalItems = lastPage.TotalRecordCount; const totalItems = lastPage.TotalRecordCount;
const accumulatedItems = pages.reduce( const accumulatedItems = pages.reduce(
(acc, curr) => acc + (curr?.Items?.length || 0), (acc, curr) => acc + (curr?.Items?.length || 0),
0, 0
); );
if (accumulatedItems < totalItems) { if (accumulatedItems < totalItems) {
@@ -118,7 +118,7 @@ export function InfiniteHorizontalScroll({
<FlashList <FlashList
data={flatData} data={flatData}
renderItem={({ item, index }) => ( renderItem={({ item, index }) => (
<View className='mr-2'> <View className="mr-2">
<React.Fragment>{renderItem(item, index)}</React.Fragment> <React.Fragment>{renderItem(item, index)}</React.Fragment>
</View> </View>
)} )}
@@ -136,10 +136,8 @@ export function InfiniteHorizontalScroll({
}} }}
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
ListEmptyComponent={ ListEmptyComponent={
<View className='flex-1 justify-center items-center'> <View className="flex-1 justify-center items-center">
<Text className='text-center text-gray-500'> <Text className="text-center text-gray-500">{t("item_card.no_data_available")}</Text>
{t("item_card.no_data_available")}
</Text>
</View> </View>
} }
{...props} {...props}

View File

@@ -1,35 +1,32 @@
import React from "react"; import React from "react";
import { import {Platform, TextInput, TextInputProps, TouchableOpacity} from "react-native";
Platform,
TextInput,
type TextInputProps,
TouchableOpacity,
} from "react-native";
export function Input(props: TextInputProps) { export function Input(props: TextInputProps) {
const { style, ...otherProps } = props; const { style, ...otherProps } = props;
const inputRef = React.useRef<TextInput>(null); const inputRef = React.useRef<TextInput>(null);
return Platform.isTV ? ( return Platform.isTV ? (
<TouchableOpacity onFocus={() => inputRef?.current?.focus?.()}> <TouchableOpacity
<TextInput onFocus={() => inputRef?.current?.focus?.()}
ref={inputRef} >
className='p-4 rounded-xl bg-neutral-900' <TextInput
allowFontScaling={false} ref={inputRef}
style={[{ color: "white" }, style]} className="p-4 rounded-xl bg-neutral-900"
placeholderTextColor={"#9CA3AF"} allowFontScaling={false}
clearButtonMode='while-editing' style={[{ color: "white" }, style]}
{...otherProps} placeholderTextColor={"#9CA3AF"}
/> clearButtonMode="while-editing"
</TouchableOpacity> {...otherProps}
/>
</TouchableOpacity>
) : ( ) : (
<TextInput <TextInput
ref={inputRef} ref={inputRef}
className='p-4 rounded-xl bg-neutral-900' className="p-4 rounded-xl bg-neutral-900"
allowFontScaling={false} allowFontScaling={false}
style={[{ color: "white" }, style]} style={[{ color: "white" }, style]}
placeholderTextColor={"#9CA3AF"} placeholderTextColor={"#9CA3AF"}
clearButtonMode='while-editing' clearButtonMode="while-editing"
{...otherProps} {...otherProps}
/> />
); )
} }

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