fix

Co-authored-by: herrrta <73949927+herrrta@users.noreply.github.com>

README.md

@@ -18,6 +18,7 @@ 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.
 - 📥 **Download media** (Experimental): Save your media locally and watch it offline.
 - 📡 **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.
 
 ## 🧪 Experimental Features
@@ -37,7 +38,7 @@ Chromecast support is still in development, and we're working on improving it. C
 The Jellyfin Plugin for Streamyfin is a plugin you install into Jellyfin that hold all settings for the client Streamyfin. This allows you to syncronize settings accross all your users, like:
 
 - Auto log in to Jellyseerr without the user having to do anythin
-- Choose the default languages 
+- Choose the default languages
 - Set download method and search provider
 - Customize homescreen
 - And more...
@@ -67,7 +68,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.
 
- **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
 
@@ -122,7 +123,85 @@ Streamyfin is developed by [Fredrik Burmester](https://github.com/fredrikburmest
 
 ## ✨ Acknowledgements
 
-I'd like to thank the following people and projects for their contributions to Streamyfin:
+### Core Developers
+
+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.
 - [Jellyfin TS SDK](https://github.com/jellyfin/jellyfin-sdk-typescript) for the TypeScript SDK.

app.json

@@ -7,10 +7,6 @@
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
     "userInterfaceStyle": "dark",
-    "splash": {
-      "image": "./assets/images/splash.png",
-      "resizeMode": "contain"
-    },
     "jsEngine": "hermes",
     "assetBundlePatterns": [
       "**/*"
@@ -74,16 +70,13 @@
         {
           "ios": {
             "deploymentTarget": "15.6",
-            "useFrameworks": "static",
-            "newArchEnabled": false
+            "useFrameworks": "static"
           },
           "android": {
-            "newArchEnabled": false,
-            "android": {
-              "compileSdkVersion": 34,
-              "targetSdkVersion": 34,
-              "buildToolsVersion": "34.0.0"
-            },
+            "compileSdkVersion": 35,
+            "targetSdkVersion": 35,
+            "buildToolsVersion": "35.0.0",
+            "kotlinVersion": "2.0.21",
             "minSdkVersion": 24,
             "usesCleartextTraffic": true,
             "packagingOptions": {
@@ -129,6 +122,17 @@
       ],
       [
         "./plugins/withTrustLocalCerts.js"
+      ],
+      [
+        "./plugins/withGradleProperties.js"
+      ],
+      [
+        "expo-splash-screen",
+        {
+          "backgroundColor": "#2e2e2e",
+          "image": "./assets/images/StreamyFinFinal.png",
+          "imageWidth": 100
+        }
       ]
     ],
     "experiments": {
@@ -148,6 +152,7 @@
     },
     "updates": {
       "url": "https://u.expo.dev/e79219d1-797f-4fbe-9fa1-cfd360690a68"
-    }
+    },
+    "newArchEnabled": false
   }
 }

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

@@ -3,9 +3,7 @@ import { Feather } from "@expo/vector-icons";
 import { Stack, useRouter } from "expo-router";
 import { Platform, TouchableOpacity, View } from "react-native";
 import { useTranslation } from "react-i18next";
-import { lazy } from "react";
-// const Chromecast = !Platform.isTV ? require("@/components/Chromecast") : null;
-const Chromecast = lazy(() => import("@/components/Chromecast"));
+const Chromecast = !Platform.isTV ? require("@/components/Chromecast") : null;
 
 export default function IndexLayout() {
   const router = useRouter();
@@ -28,7 +26,7 @@ export default function IndexLayout() {
             <View className="flex flex-row items-center space-x-2">
               {!Platform.isTV && (
                 <>
-                  <Chromecast />
+                  <Chromecast.Chromecast />
                   <TouchableOpacity
                     onPress={() => {
                       router.push("/(auth)/settings");

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

@@ -153,7 +153,7 @@ export default function IndexLayout() {
                       disabled={settings.libraryOptions.imageStyle === "poster"}
                       key="show-titles-option"
                       value={settings.libraryOptions.showTitles}
-                      onValueChange={(newValue) => {
+                      onValueChange={(newValue: string) => {
                         if (settings.libraryOptions.imageStyle === "poster")
                           return;
                         updateSettings({
@@ -172,7 +172,7 @@ export default function IndexLayout() {
                     <DropdownMenu.CheckboxItem
                       key="show-stats-option"
                       value={settings.libraryOptions.showStats}
-                      onValueChange={(newValue) => {
+                      onValueChange={(newValue: string) => {
                         updateSettings({
                           libraryOptions: {
                             ...settings.libraryOptions,

app/(auth)/player/_layout.tsx

@@ -1,8 +1,28 @@
 import { Stack } from "expo-router";
-import React from "react";
+import React, { useEffect } from "react";
 import { SystemBars } from "react-native-edge-to-edge";
+import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { useSettings } from "@/utils/atoms/settings";
 
 export default function Layout() {
+  const [settings] = useSettings();
+
+  useEffect(() => {
+    if (settings.defaultVideoOrientation) {
+      ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
+    }
+
+    return () => {
+      if (settings.autoRotate === true) {
+        ScreenOrientation.unlockAsync();
+      } else {
+        ScreenOrientation.lockAsync(
+          ScreenOrientation.OrientationLock.PORTRAIT_UP
+        );
+      }
+    };
+  }, [settings]);
+
   return (
     <>
       <SystemBars hidden />

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

@@ -55,6 +55,7 @@ import { useTranslation } from "react-i18next";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 export default function page() {
+  console.log("Direct Player");
   const videoRef = useRef<VlcPlayerViewRef>(null);
   const user = useAtomValue(userAtom);
   const api = useAtomValue(apiAtom);
@@ -70,9 +71,9 @@ export default function page() {
   const progress = useSharedValue(0);
   const isSeeking = useSharedValue(false);
   const cacheProgress = useSharedValue(0);
-
+  let getDownloadedItem = null;
   if (!Platform.isTV) {
-    const getDownloadedItem  = downloadProvider.useDownload();
+    getDownloadedItem = downloadProvider.useDownload();
   }
 
   const revalidateProgressCache = useInvalidatePlaybackProgressCache();
@@ -116,7 +117,7 @@ export default function page() {
     queryKey: ["item", itemId],
     queryFn: async () => {
       if (offline && !Platform.isTV) {
-        const item = await getDownloadedItem(itemId);
+        const item = await getDownloadedItem.getDownloadedItem(itemId);
         if (item) return item.item;
       }
 
@@ -139,7 +140,7 @@ export default function page() {
     queryKey: ["stream-url", itemId, mediaSourceId, bitrateValue],
     queryFn: async () => {
       if (offline && !Platform.isTV) {
-        const data = await getDownloadedItem(itemId);
+        const data = await getDownloadedItem.getDownloadedItem(itemId);
         if (!data?.mediaSource) return null;
 
         const url = await getDownloadedFileUrl(data.item.Id!);
@@ -303,9 +304,6 @@ export default function page() {
     [item?.Id, isPlaying, api, isPlaybackStopped, audioIndex, subtitleIndex]
   );
 
-  useOrientation();
-  useOrientationSettings();
-
   useWebSocket({
     isPlaying: isPlaying,
     togglePlay: togglePlay,
@@ -386,16 +384,18 @@ export default function page() {
 
   const allSubs =
     stream?.mediaSource.MediaStreams?.filter(
-      (sub) => sub.Type === "Subtitle"
+      (sub: { Type: string }) => sub.Type === "Subtitle"
     ) || [];
   const chosenSubtitleTrack = allSubs.find(
-    (sub) => sub.Index === subtitleIndex
+    (sub: { Index: number }) => sub.Index === subtitleIndex
   );
   const allAudio =
     stream?.mediaSource.MediaStreams?.filter(
-      (audio) => audio.Type === "Audio"
+      (audio: { Type: string }) => audio.Type === "Audio"
     ) || [];
-  const chosenAudioTrack = allAudio.find((audio) => audio.Index === audioIndex);
+  const chosenAudioTrack = allAudio.find(
+    (audio: { Index: number | undefined }) => audio.Index === audioIndex
+  );
 
   // Direct playback CASE
   if (!bitrateValue) {

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

@@ -42,6 +42,8 @@ import { SubtitleHelper } from "@/utils/SubtitleHelper";
 import { useTranslation } from "react-i18next";
 
 const Player = () => {
+  console.log("Transcoding Player");
+
   const api = useAtomValue(apiAtom);
   const user = useAtomValue(userAtom);
   const [settings] = useSettings();
@@ -295,9 +297,6 @@ const Player = () => {
     ]
   );
 
-  useOrientation();
-  useOrientationSettings();
-
   useWebSocket({
     isPlaying: isPlaying,
     togglePlay: togglePlay,

app/_layout.tsx

@@ -64,22 +64,24 @@ function useNotificationObserver() {
   useEffect(() => {
     let isMounted = true;
 
-    function redirect(notification: Notifications.Notification) {
+    function redirect(notification: typeof Notifications.Notification) {
       const url = notification.request.content.data?.url;
       if (url) {
         router.push(url);
       }
     }
 
-    Notifications.getLastNotificationResponseAsync().then((response) => {
-      if (!isMounted || !response?.notification) {
-        return;
+    Notifications.getLastNotificationResponseAsync().then(
+      (response: { notification: any }) => {
+        if (!isMounted || !response?.notification) {
+          return;
+        }
+        redirect(response?.notification);
       }
-      redirect(response?.notification);
-    });
+    );
 
     const subscription = Notifications.addNotificationResponseReceivedListener(
-      (response) => {
+      (response: { notification: any }) => {
         redirect(response.notification);
       }
     );
@@ -127,7 +129,7 @@ if (!Platform.isTV) {
         const downloadUrl = url + "download/" + job.id;
         const tasks = await BackGroundDownloader.checkForExistingDownloads();
 
-        if (tasks.find((task) => task.id === job.id)) {
+        if (tasks.find((task: { id: string }) => task.id === job.id)) {
           console.log("TaskManager ~ Download already in progress: ", job.id);
           continue;
         }
@@ -163,9 +165,9 @@ if (!Platform.isTV) {
               trigger: null,
             });
           })
-          .error((error) => {
+          .error((error: any) => {
             console.log("TaskManager ~ Download error: ", job.id, error);
-            completeHandler(job.id);
+            BackGroundDownloader.completeHandler(job.id);
             Notifications.scheduleNotificationAsync({
               content: {
                 title: job.item.Name,
@@ -269,12 +271,15 @@ function Layout() {
     }, []);
 
     useEffect(() => {
-      if (settings?.autoRotate === true)
-        ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.DEFAULT);
-      else
+      // If the user has auto rotate enabled, unlock the orientation
+      if (settings.autoRotate === true) {
+        ScreenOrientation.unlockAsync();
+      } else {
+        // If the user has auto rotate disabled, lock the orientation to portrait
         ScreenOrientation.lockAsync(
           ScreenOrientation.OrientationLock.PORTRAIT_UP
         );
+      }
     }, [settings]);
 
     useEffect(() => {

components/Chromecast.tsx

@@ -17,7 +17,7 @@ interface Props extends ViewProps {
   background?: "blur" | "transparent";
 }
 
-export default function Chromecast({
+export function Chromecast({
   width = 48,
   height = 48,
   background = "transparent",

components/ItemContent.tsx

@@ -27,11 +27,10 @@ import { Image } from "expo-image";
 import { useNavigation } from "expo-router";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { useAtom } from "jotai";
-import React, { lazy, useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Platform, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-// const Chromecast = !Platform.isTV ? require("./Chromecast") : null;
-const Chromecast = lazy(() => import("./Chromecast"));
+const Chromecast = !Platform.isTV ? require("./Chromecast") : null;
 import { ItemHeader } from "./ItemHeader";
 import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
 import { MediaSourceSelector } from "./MediaSourceSelector";
@@ -89,7 +88,11 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
           headerRight: () =>
             item && (
               <View className="flex flex-row items-center space-x-2">
-                <Chromecast background="blur" width={22} height={22} />
+                <Chromecast.Chromecast
+                  background="blur"
+                  width={22}
+                  height={22}
+                />
                 {item.Type !== "Program" && (
                   <View className="flex flex-row items-center space-x-2">
                     <DownloadSingleItem item={item} size="large" />

components/downloads/ActiveDownloads.tsx

@@ -9,7 +9,7 @@ const BackGroundDownloader = !Platform.isTV
   : null;
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
-const FFmpegKit = !Platform.isTV ? require("ffmpeg-kit-react-native") : null;
+const FFmpegKitProvider = !Platform.isTV ? require("ffmpeg-kit-react-native") : null;
 import { useAtom } from "jotai";
 import {
   ActivityIndicator,
@@ -42,7 +42,7 @@ export const ActiveDownloads: React.FC<Props> = ({ ...props }) => {
     <View {...props} className="bg-neutral-900 p-4 rounded-2xl">
       <Text className="text-lg font-bold mb-2">{t("home.downloads.active_downloads")}</Text>
       <View className="space-y-2">
-        {processes?.map((p) => (
+        {processes?.map((p: JobStatus) => (
           <DownloadCard key={p.item.Id} process={p} />
         ))}
       </View>
@@ -80,8 +80,8 @@ const DownloadCard = ({ process, ...props }: DownloadCardProps) => {
           await queryClient.refetchQueries({ queryKey: ["jobs"] });
         }
       } else {
-        FFmpegKit.cancel(Number(id));
-        setProcesses((prev) => prev.filter((p) => p.id !== id));
+        FFmpegKitProvider.FFmpegKit.cancel(Number(id));
+        setProcesses((prev: any[]) => prev.filter((p: { id: string; }) => p.id !== id));
       }
     },
     onSuccess: () => {

hooks/useHaptic.ts

@@ -20,7 +20,7 @@ export const useHaptic = (feedbackType: HapticFeedbackType = "selection") => {
   }
 
   const createHapticHandler = useCallback(
-    (type: Haptics.ImpactFeedbackStyle) => {
+    (type: typeof Haptics.ImpactFeedbackStyle) => {
       return Platform.OS === "web" || Platform.isTV
         ? () => {}
         : () => Haptics.impactAsync(type);
@@ -28,7 +28,7 @@ export const useHaptic = (feedbackType: HapticFeedbackType = "selection") => {
     []
   );
   const createNotificationFeedback = useCallback(
-    (type: Haptics.NotificationFeedbackType) => {
+    (type: typeof Haptics.NotificationFeedbackType) => {
       return Platform.OS === "web" || Platform.isTV
         ? () => {}
         : () => Haptics.notificationAsync(type);

hooks/useImageColors.ts

@@ -70,7 +70,7 @@ export const useImageColors = ({
         fallback: "#fff",
         cache: false,
       })
-        .then((colors) => {
+        .then((colors: { platform: string; dominant: string; vibrant: string; detail: string; primary: string; }) => {
           let primary: string = "#fff";
           let text: string = "#000";
           let backup: string = "#fff";
@@ -104,7 +104,7 @@ export const useImageColors = ({
             storage.set(`${source.uri}-text`, text);
           }
         })
-        .catch((error) => {
+        .catch((error: any) => {
           console.error("Error getting colors", error);
         });
     }

hooks/useRemuxHlsToMp4.ts

@@ -9,8 +9,9 @@ import {
 import { useQueryClient } from "@tanstack/react-query";
 import * as FileSystem from "expo-file-system";
 import { useRouter } from "expo-router";
+
 // import { FFmpegKit, FFmpegSession, Statistics } from "ffmpeg-kit-react-native";
-const FFmpegKit = !Platform.isTV ? require("ffmpeg-kit-react-native") : null;
+const FFMPEGKitReactNative = !Platform.isTV ? require("ffmpeg-kit-react-native") : null;
 import { useAtomValue } from "jotai";
 import { useCallback } from "react";
 import { toast } from "sonner-native";
@@ -22,6 +23,9 @@ import { JobStatus } from "@/utils/optimize-server";
 import { Platform } from "react-native";
 import { useTranslation } from "react-i18next";
 
+type FFmpegSession = typeof FFMPEGKitReactNative.FFmpegSession;
+type Statistics = typeof FFMPEGKitReactNative.Statistics
+const FFmpegKit = FFMPEGKitReactNative.FFmpegKit;
 const createFFmpegCommand = (url: string, output: string) => [
   "-y", // overwrite output files without asking
   "-thread_queue_size 512", // https://ffmpeg.org/ffmpeg.html#toc-Advanced-options
@@ -96,8 +100,8 @@ export const useRemuxHlsToMp4 = () => {
           toast.success(t("home.downloads.toasts.download_completed"));
         }
 
-        setProcesses((prev) => {
-          return prev.filter((process) => process.itemId !== item.Id);
+        setProcesses((prev: any[]) => {
+          return prev.filter((process: { itemId: string | undefined; }) => process.itemId !== item.Id);
         });
       } catch (e) {
         console.error(e);
@@ -121,8 +125,8 @@ export const useRemuxHlsToMp4 = () => {
         totalFrames > 0 ? Math.floor((processedFrames / totalFrames) * 100) : 0;
 
       if (!item.Id) throw new Error("Item is undefined");
-      setProcesses((prev) => {
-        return prev.map((process) => {
+      setProcesses((prev: any[]) => {
+        return prev.map((process: { itemId: string | undefined; }) => {
           if (process.itemId === item.Id) {
             return {
               ...process,
@@ -181,13 +185,13 @@ export const useRemuxHlsToMp4 = () => {
         };
 
         writeInfoLog(`useRemuxHlsToMp4 ~ startRemuxing for item ${item.Name}`);
-        setProcesses((prev) => [...prev, job]);
+        setProcesses((prev: any) => [...prev, job]);
 
         await FFmpegKit.executeAsync(
           createFFmpegCommand(url, output).join(" "),
-          (session) => completeCallback(session, item),
+          (session: any) => completeCallback(session, item),
           undefined,
-          (s) => statisticsCallback(s, item)
+          (s: any) => statisticsCallback(s, item)
         );
       } catch (e) {
         const error = e as Error;
@@ -196,8 +200,8 @@ export const useRemuxHlsToMp4 = () => {
           `useRemuxHlsToMp4 ~ remuxing failed for item: ${item.Name}, 
           Error: ${error.message}, Stack: ${error.stack}`
         );
-        setProcesses((prev) => {
-          return prev.filter((process) => process.itemId !== item.Id);
+        setProcesses((prev: any[]) => {
+          return prev.filter((process: { itemId: string | undefined; }) => process.itemId !== item.Id);
         });
         throw error; // Re-throw the error to propagate it to the caller
       }

modules/vlc-player/android/build.gradle

@@ -1,12 +1,17 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+  id 'com.android.library'
+  id 'kotlin-android'
+  id 'kotlin-kapt'
+}
 
 group = 'expo.modules.vlcplayer'
 version = '0.6.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+def kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.25'
+
 apply from: expoModulesCorePlugin
+
 applyKotlinExpoModulesCorePlugin()
 useCoreDependencies()
 useExpoPublishing()
@@ -37,8 +42,8 @@ if (useManagedAndroidSdkVersions) {
 }
 
 dependencies {
-  implementation 'org.videolan.android:libvlc-all:3.6.0-eap12'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.31"
+  implementation 'org.videolan.android:libvlc-all:3.6.0'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 }
 
 android {

package.json

@@ -10,122 +10,121 @@
     "ios:tv": "EXPO_TV=1 expo run:ios",
     "android": "EXPO_TV=0 expo run:android",
     "android:tv": "EXPO_TV=1 expo run:android",
-    "prebuild": "EXPO_TV=0 expo prebuild --clean",
-    "prebuild:tv": "EXPO_TV=1 expo prebuild --clean",
-    "prebuild:tv-new": "EXPO_TV=1 node ./scripts/symlink-native-dirs.js; EXPO_TV=1 expo prebuild --clean",
+    "prebuild": "EXPO_TV=0 bun run clean",
+    "prebuild:tv": "EXPO_TV=1 bun run clean",
+    "prebuild:tv-new": "EXPO_TV=1 node ./scripts/symlink-native-dirs.js; bun run prebuild:tv",
     "test": "jest --watchAll",
     "lint": "expo lint",
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@bottom-tabs/react-navigation": "0.8.3",
-    "@config-plugins/ffmpeg-kit-react-native": "^8.0.0",
-    "@expo/config-plugins": "~8.0.0",
+    "@bottom-tabs/react-navigation": "0.8.6",
+    "@config-plugins/ffmpeg-kit-react-native": "^9.0.0",
+    "@expo/config-plugins": "~9.0.15",
     "@expo/react-native-action-sheet": "^4.1.0",
     "@expo/vector-icons": "^14.0.4",
-    "@futurejj/react-native-visibility-sensor": "^1.3.5",
-    "@gorhom/bottom-sheet": "^4.6.4",
+    "@futurejj/react-native-visibility-sensor": "^1.3.10",
+    "@gorhom/bottom-sheet": "^5.1.0",
     "@jellyfin/sdk": "^0.11.0",
     "@kesha-antonov/react-native-background-downloader": "3.2.6",
-    "@react-native-async-storage/async-storage": "1.23.1",
-    "@react-native-community/netinfo": "11.3.1",
-    "@react-native-menu/menu": "^1.1.6",
-    "@react-navigation/bottom-tabs": "^7.0.0",
-    "@react-navigation/material-top-tabs": "^6.6.14",
-    "@react-navigation/native": "^6.1.18",
-    "@shopify/flash-list": "1.6.4",
-    "@tanstack/react-query": "^5.59.20",
-    "@types/lodash": "^4.17.13",
+    "@react-native-async-storage/async-storage": "2.1.1",
+    "@react-native-community/netinfo": "11.4.1",
+    "@react-native-menu/menu": "^1.2.2",
+    "@react-navigation/bottom-tabs": "^7.2.0",
+    "@react-navigation/material-top-tabs": "^7.1.0",
+    "@react-navigation/native": "^7.0.14",
+    "@shopify/flash-list": "1.7.3",
+    "@tanstack/react-query": "^5.66.0",
+    "@types/lodash": "^4.17.15",
     "@types/react-native-vector-icons": "^6.4.18",
     "@types/uuid": "^10.0.0",
     "add": "^2.0.6",
-    "axios": "^1.7.7",
-    "expo": "^51",
-    "expo-asset": "~10.0.10",
-    "expo-background-fetch": "~12.0.1",
-    "expo-blur": "~13.0.3",
-    "expo-brightness": "~12.0.1",
-    "expo-build-properties": "~0.12.5",
-    "expo-constants": "~16.0.2",
-    "expo-crypto": "~13.0.2",
-    "expo-dev-client": "~4.0.29",
-    "expo-device": "~6.0.2",
-    "expo-font": "~12.0.10",
-    "expo-haptics": "~13.0.1",
-    "expo-image": "~1.13.0",
-    "expo-keep-awake": "~13.0.2",
-    "expo-linear-gradient": "~13.0.2",
-    "expo-linking": "~6.3.1",
+    "axios": "^1.7.9",
+    "expo": "^52.0.31",
+    "expo-asset": "~11.0.3",
+    "expo-background-fetch": "~13.0.5",
+    "expo-blur": "~14.0.3",
+    "expo-brightness": "~13.0.3",
+    "expo-build-properties": "~0.13.2",
+    "expo-constants": "~17.0.5",
+    "expo-crypto": "~14.0.2",
+    "expo-dev-client": "~5.0.11",
+    "expo-device": "~7.0.2",
+    "expo-font": "~13.0.3",
+    "expo-haptics": "~14.0.1",
+    "expo-image": "~2.0.4",
+    "expo-keep-awake": "~14.0.2",
+    "expo-linear-gradient": "~14.0.2",
+    "expo-linking": "~7.0.5",
     "expo-localization": "~16.0.1",
-    "expo-network": "~6.0.1",
-    "expo-notifications": "~0.28.19",
-    "expo-router": "~3.5.24",
-    "expo-screen-orientation": "~7.0.5",
-    "expo-sensors": "~13.0.9",
-    "expo-splash-screen": "~0.27.7",
-    "expo-status-bar": "~1.12.1",
-    "expo-system-ui": "~3.0.7",
-    "expo-task-manager": "~11.8.2",
-    "expo-updates": "~0.25.28",
-    "expo-web-browser": "~13.0.3",
+    "expo-network": "~7.0.5",
+    "expo-notifications": "~0.29.13",
+    "expo-router": "~4.0.17",
+    "expo-screen-orientation": "~8.0.4",
+    "expo-sensors": "~14.0.2",
+    "expo-splash-screen": "~0.29.21",
+    "expo-status-bar": "~2.0.1",
+    "expo-system-ui": "~4.0.8",
+    "expo-task-manager": "~12.0.5",
+    "expo-updates": "~0.26.17",
+    "expo-web-browser": "~14.0.2",
     "ffmpeg-kit-react-native": "^6.0.2",
     "i18next": "^24.2.2",
-    "install": "^0.13.0",
-    "jotai": "^2.10.1",
+    "jotai": "^2.11.3",
     "lodash": "^4.17.21",
     "nativewind": "^2.0.11",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-native": "npm:react-native-tvos@~0.74.5-0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-native": "npm:react-native-tvos@~0.77.0-0",
     "react-i18next": "^15.4.0",
-    "react-native-awesome-slider": "^2.5.6",
-    "react-native-bottom-tabs": "0.8.3",
+    "react-native-awesome-slider": "^2.9.0",
+    "react-native-bottom-tabs": "0.8.6",
     "react-native-circular-progress": "^1.4.1",
-    "react-native-compressor": "^1.9.0",
+    "react-native-compressor": "^1.10.3",
     "react-native-country-flag": "^2.0.2",
-    "react-native-device-info": "^14.0.1",
-    "react-native-edge-to-edge": "^1.1.3",
-    "react-native-gesture-handler": "~2.16.1",
+    "react-native-device-info": "^14.0.4",
+    "react-native-edge-to-edge": "^1.4.3",
+    "react-native-gesture-handler": "~2.23.0",
     "react-native-get-random-values": "^1.11.0",
     "react-native-google-cast": "^4.8.3",
     "react-native-image-colors": "^2.4.0",
-    "react-native-ios-context-menu": "^2.5.2",
-    "react-native-ios-utilities": "4.5.3",
+    "react-native-ios-context-menu": "^3.1.0",
+    "react-native-ios-utilities": "5.1.1",
     "react-native-mmkv": "^2.12.2",
-    "react-native-pager-view": "6.3.0",
+    "react-native-pager-view": "6.7.0",
     "react-native-progress": "^5.0.1",
-    "react-native-reanimated": "~3.10.1",
-    "react-native-reanimated-carousel": "4.0.0-canary.22",
-    "react-native-safe-area-context": "4.10.5",
-    "react-native-screens": "3.31.1",
-    "react-native-svg": "15.2.0",
-    "react-native-tab-view": "^3.5.2",
+    "react-native-reanimated": "~3.16.7",
+    "react-native-reanimated-carousel": "3.5.1",
+    "react-native-safe-area-context": "5.2.0",
+    "react-native-screens": "4.6.0",
+    "react-native-svg": "15.11.1",
+    "react-native-tab-view": "^4.0.5",
     "react-native-udp": "^4.1.7",
     "react-native-uitextview": "^1.4.0",
     "react-native-url-polyfill": "^2.0.0",
-    "react-native-uuid": "^2.0.2",
-    "react-native-video": "6.8.2",
-    "react-native-volume-manager": "^1.10.0",
+    "react-native-uuid": "^2.0.3",
+    "react-native-video": "6.10.0",
+    "react-native-volume-manager": "^2.0.8",
     "react-native-web": "~0.19.13",
-    "react-native-webview": "13.8.6",
-    "sonner-native": "^0.14.2",
+    "react-native-webview": "13.13.2",
+    "sonner-native": "^0.17.0",
     "tailwindcss": "3.3.2",
     "use-debounce": "^10.0.4",
-    "uuid": "^10.0.0",
-    "zeego": "^1.10.0",
-    "zod": "^3.23.8"
+    "uuid": "^11.0.5",
+    "zeego": "^2.0.4",
+    "zod": "^3.24.1"
   },
   "devDependencies": {
     "@react-native-community/cli": "15.1.3",
     "@react-native-tvos/config-tv": "^0.1.1",
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.26.8",
     "@types/jest": "^29.5.14",
-    "@types/react": "~18.2.79",
-    "@types/react-test-renderer": "^18.0.7",
+    "@types/react": "~19.0.8",
+    "@types/react-test-renderer": "^19.0.0",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
-    "react-test-renderer": "18.2.0",
-    "typescript": "~5.3.3"
+    "react-test-renderer": "19.0.0",
+    "typescript": "~5.7.3"
   },
   "private": true,
   "expo": {

plugins/withGradleProperties.js

@@ -0,0 +1,40 @@
+const { withGradleProperties } = require('expo/config-plugins');
+
+function setGradlePropertiesValue(config, key, value) {
+  return withGradleProperties(config, exportedConfig => {
+    const props = exportedConfig.modResults;
+    const keyIdx = props.findIndex(item => item.type === 'property' && item.key === key);
+    const property = {
+      type: 'property',
+      key,
+      value
+    };
+
+    if (keyIdx >= 0) {
+      props.splice(keyIdx, 1, property);
+    }
+    else {
+      props.push(property);
+    }
+
+    return exportedConfig;
+  });
+}
+
+module.exports = function withCustomPlugin(config) {
+  // Expo 52 is not setting this
+  // https://github.com/expo/expo/issues/32558
+  config = setGradlePropertiesValue(
+      config,
+      'android.enableJetifier',
+      'true',
+  );
+
+  // Increase memory
+  config = setGradlePropertiesValue(
+      config,
+      'org.gradle.jvmargs',
+      '-Xmx4096m -XX:MaxMetaspaceSize=1024m',
+  );
+  return config;
+};

utils/atoms/settings.ts

@@ -157,53 +157,53 @@ export type StreamyfinPluginConfig = {
   settings: PluginLockableSettings;
 };
 
-const loadSettings = (): Settings => {
-  const defaultValues: Settings = {
-    home: null,
-    autoRotate: true,
-    forceLandscapeInVideoPlayer: false,
-    deviceProfile: "Expo",
-    mediaListCollectionIds: [],
-    preferedLanguage: undefined,
-    searchEngine: "Jellyfin",
-    marlinServerUrl: "",
-    openInVLC: false,
-    downloadQuality: DownloadOptions[0],
-    libraryOptions: {
-      display: "list",
-      cardStyle: "detailed",
-      imageStyle: "cover",
-      showTitles: true,
-      showStats: true,
-    },
-    defaultAudioLanguage: null,
-    playDefaultAudioTrack: true,
-    rememberAudioSelections: true,
-    defaultSubtitleLanguage: null,
-    subtitleMode: SubtitlePlaybackMode.Default,
-    rememberSubtitleSelections: true,
-    showHomeTitles: true,
-    defaultVideoOrientation: ScreenOrientation.OrientationLock.DEFAULT,
-    forwardSkipTime: 30,
-    rewindSkipTime: 10,
-    optimizedVersionsServerUrl: null,
-    downloadMethod: DownloadMethod.Remux,
-    autoDownload: false,
-    showCustomMenuLinks: false,
-    disableHapticFeedback: false,
-    subtitleSize: Platform.OS === "ios" ? 60 : 100,
-    remuxConcurrentLimit: 1,
-    safeAreaInControlsEnabled: true,
-    jellyseerrServerUrl: undefined,
-    hiddenLibraries: [],
-  };
+const defaultValues: Settings = {
+  home: null,
+  autoRotate: true,
+  forceLandscapeInVideoPlayer: false,
+  deviceProfile: "Expo",
+  mediaListCollectionIds: [],
+  preferedLanguage: undefined,
+  searchEngine: "Jellyfin",
+  marlinServerUrl: "",
+  openInVLC: false,
+  downloadQuality: DownloadOptions[0],
+  libraryOptions: {
+    display: "list",
+    cardStyle: "detailed",
+    imageStyle: "cover",
+    showTitles: true,
+    showStats: true,
+  },
+  defaultAudioLanguage: null,
+  playDefaultAudioTrack: true,
+  rememberAudioSelections: true,
+  defaultSubtitleLanguage: null,
+  subtitleMode: SubtitlePlaybackMode.Default,
+  rememberSubtitleSelections: true,
+  showHomeTitles: true,
+  defaultVideoOrientation: ScreenOrientation.OrientationLock.DEFAULT,
+  forwardSkipTime: 30,
+  rewindSkipTime: 10,
+  optimizedVersionsServerUrl: null,
+  downloadMethod: DownloadMethod.Remux,
+  autoDownload: false,
+  showCustomMenuLinks: false,
+  disableHapticFeedback: false,
+  subtitleSize: Platform.OS === "ios" ? 60 : 100,
+  remuxConcurrentLimit: 1,
+  safeAreaInControlsEnabled: true,
+  jellyseerrServerUrl: undefined,
+  hiddenLibraries: [],
+};
 
+const loadSettings = (): Partial<Settings> => {
   try {
     const jsonValue = storage.getString("settings");
     const loadedValues: Partial<Settings> =
       jsonValue != null ? JSON.parse(jsonValue) : {};
 
-    return { ...defaultValues, ...loadedValues };
+    return loadedValues;
   } catch (error) {
     console.error("Failed to load settings:", error);
     return defaultValues;
@@ -222,7 +222,7 @@ const saveSettings = (settings: Settings) => {
   storage.set("settings", jsonValue);
 };
 
-export const settingsAtom = atom<Settings | null>(null);
+export const settingsAtom = atom<Partial<Settings> | null>(null);
 export const pluginSettingsAtom = atom(
   storage.get<PluginLockableSettings>(STREAMYFIN_PLUGIN_SETTINGS)
 );
@@ -262,7 +262,7 @@ export const useSettings = () => {
 
   const updateSettings = (update: Partial<Settings>) => {
     if (settings) {
-      const newSettings = { ...settings, ...update };
+      const newSettings = { ..._settings, ...update };
 
       setSettings(newSettings);
       saveSettings(newSettings);
@@ -271,7 +271,7 @@ export const useSettings = () => {
 
   // We do not want to save over users pre-existing settings in case admin ever removes/unlocks a setting.
   // If admin sets locked to false but provides a value,
-  //  use user settings first and fallback on admin setting if required.
+  // use user settings first and fallback on admin setting if required.
   const settings: Settings = useMemo(() => {
     let unlockedPluginDefaults = {} as Settings;
     const overrideSettings = Object.entries(pluginSettings || {}).reduce(
@@ -300,12 +300,8 @@ export const useSettings = () => {
       {} as Settings
     );
 
-    // Update settings with plugin defined defaults
-    if (Object.keys(unlockedPluginDefaults).length > 0) {
-      updateSettings(unlockedPluginDefaults);
-    }
-
     return {
+      ...defaultValues,
       ..._settings,
       ...overrideSettings,
     };