fix: turn into hook

Removed resumable items from next up

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Streamyfin",
     "slug": "streamyfin",
-    "version": "0.17.0",
+    "version": "0.18.0",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "scheme": "streamyfin",
@@ -33,7 +33,7 @@
     },
     "android": {
       "jsEngine": "hermes",
-      "versionCode": 43,
+      "versionCode": 46,
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/adaptive_icon.png"
       },

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

@@ -264,6 +264,7 @@ export default function index() {
               fields: ["MediaSourceCount"],
               limit: 20,
               enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+              enableResumable: false,
             })
           ).data.Items || [],
         type: "ScrollingCollectionList",

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

@@ -143,7 +143,9 @@ export default function settings() {
                 >
                   {log.level}
                 </Text>
-                <Text className="text-xs">{log.message}</Text>
+                <Text uiTextView selectable className="text-xs">
+                  {log.message}
+                </Text>
               </View>
             ))}
             {logs?.length === 0 && (

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

@@ -32,7 +32,6 @@ import {
   tagsFilterAtom,
   yearFilterAtom,
 } from "@/utils/atoms/filters";
-import { orientationAtom } from "@/utils/atoms/orientation";
 import {
   BaseItemDto,
   BaseItemDtoQueryResult,
@@ -44,6 +43,7 @@ import {
 } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useOrientation } from "@/hooks/useOrientation";
 
 const MemoizedTouchableItemRouter = React.memo(TouchableItemRouter);
 
@@ -60,12 +60,13 @@ const Page = () => {
   const [selectedTags, setSelectedTags] = useAtom(tagsFilterAtom);
   const [sortBy, _setSortBy] = useAtom(sortByAtom);
   const [sortOrder, _setSortOrder] = useAtom(sortOrderAtom);
-  const [orientation] = useAtom(orientationAtom);
   const [sortByPreference, setSortByPreference] = useAtom(sortByPreferenceAtom);
   const [sortOrderPreference, setOderByPreference] = useAtom(
     sortOrderPreferenceAtom
   );
 
+  const { orientation } = useOrientation();
+
   useEffect(() => {
     const sop = getSortOrderPreference(libraryId, sortOrderPreference);
     if (sop) {
@@ -106,11 +107,12 @@ const Page = () => {
     [libraryId, sortOrderPreference]
   );
 
-  const getNumberOfColumns = useCallback(() => {
-    if (orientation === ScreenOrientation.Orientation.PORTRAIT_UP) return 3;
-    if (screenWidth < 600) return 5;
-    if (screenWidth < 960) return 6;
-    if (screenWidth < 1280) return 7;
+  const nrOfCols = useMemo(() => {
+    if (screenWidth < 300) return 2;
+    if (screenWidth < 500) return 3;
+    if (screenWidth < 800) return 5;
+    if (screenWidth < 1000) return 6;
+    if (screenWidth < 1500) return 7;
     return 6;
   }, [screenWidth, orientation]);
 
@@ -219,7 +221,7 @@ const Page = () => {
 
   const renderItem = useCallback(
     ({ item, index }: { item: BaseItemDto; index: number }) => (
-      <MemoizedTouchableItemRouter
+      <TouchableItemRouter
         key={item.Id}
         style={{
           width: "100%",
@@ -230,10 +232,10 @@ const Page = () => {
         <View
           style={{
             alignSelf:
-              orientation === ScreenOrientation.Orientation.PORTRAIT_UP
-                ? index % 3 === 0
+              orientation === ScreenOrientation.OrientationLock.PORTRAIT_UP
+                ? index % nrOfCols === 0
                   ? "flex-end"
-                  : (index + 1) % 3 === 0
+                  : (index + 1) % nrOfCols === 0
                   ? "flex-start"
                   : "center"
                 : "center",
@@ -244,7 +246,7 @@ const Page = () => {
           <ItemPoster item={item} />
           <ItemCardText item={item} />
         </View>
-      </MemoizedTouchableItemRouter>
+      </TouchableItemRouter>
     ),
     [orientation]
   );
@@ -429,6 +431,7 @@ const Page = () => {
 
   return (
     <FlashList
+      key={orientation}
       ListEmptyComponent={
         <View className="flex flex-col items-center justify-center h-full">
           <Text className="font-bold text-xl text-neutral-500">No results</Text>
@@ -437,10 +440,10 @@ const Page = () => {
       contentInsetAdjustmentBehavior="automatic"
       data={flatData}
       renderItem={renderItem}
-      extraData={orientation}
+      extraData={[orientation, nrOfCols]}
       keyExtractor={keyExtractor}
       estimatedItemSize={244}
-      numColumns={getNumberOfColumns()}
+      numColumns={nrOfCols}
       onEndReached={() => {
         if (hasNextPage) {
           fetchNextPage();

app/(auth)/play-video.tsx

@@ -2,6 +2,7 @@ import { Controls } from "@/components/video-player/Controls";
 import { useAndroidNavigationBar } from "@/hooks/useAndroidNavigationBar";
 import { useOrientation } from "@/hooks/useOrientation";
 import { useOrientationSettings } from "@/hooks/useOrientationSettings";
+import useScreenDimensions from "@/hooks/useScreenDimensions";
 import { useWebSocket } from "@/hooks/useWebsockets";
 import { apiAtom } from "@/providers/JellyfinProvider";
 import {
@@ -17,16 +18,20 @@ import { getPlaystateApi } from "@jellyfin/sdk/lib/utils/api";
 import * as Haptics from "expo-haptics";
 import { useFocusEffect } from "expo-router";
 import { useAtomValue } from "jotai";
-import React, { useCallback, useMemo, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { Dimensions, Pressable, StatusBar, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import Video, {
   OnProgressData,
-  VideoRef,
-  SelectedTrack,
   SelectedTrackType,
+  VideoRef,
 } from "react-native-video";
-import { WithDefault } from "react-native/Libraries/Types/CodegenTypes";
 
 export default function page() {
   const { playSettings, playUrl, playSessionId } = usePlaySettings();
@@ -36,8 +41,7 @@ export default function page() {
   const poster = usePoster(playSettings, api);
   const videoSource = useVideoSource(playSettings, api, poster, playUrl);
   const firstTime = useRef(true);
-
-  const screenDimensions = Dimensions.get("screen");
+  const screenDimensions = useScreenDimensions();
 
   const [isPlaybackStopped, setIsPlaybackStopped] = useState(false);
   const [showControls, setShowControls] = useState(true);
@@ -216,18 +220,28 @@ export default function page() {
   return (
     <View
       style={{
+        flex: 1,
+        flexDirection: "column",
+        justifyContent: "center",
+        alignItems: "center",
         width: screenDimensions.width,
         height: screenDimensions.height,
         position: "relative",
       }}
-      className="flex flex-col items-center justify-center"
     >
       <StatusBar hidden />
       <Pressable
         onPress={() => {
           setShowControls(!showControls);
         }}
-        className="absolute z-0 h-full w-full"
+        style={{
+          position: "absolute",
+          top: 0,
+          left: 0,
+          width: screenDimensions.width,
+          height: screenDimensions.height,
+          zIndex: 0,
+        }}
       >
         <Video
           ref={videoRef}

app/login.tsx

@@ -5,6 +5,7 @@ import { apiAtom, useJellyfin } from "@/providers/JellyfinProvider";
 import { Ionicons } from "@expo/vector-icons";
 import { PublicSystemInfo } from "@jellyfin/sdk/lib/generated-client";
 import { getSystemApi } from "@jellyfin/sdk/lib/utils/api";
+import { Image } from "expo-image";
 import { useLocalSearchParams } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useEffect, useState } from "react";
@@ -129,7 +130,7 @@ const Login: React.FC = () => {
           if (error.name === "AbortError") {
             console.log(`Request to ${protocol}${url} timed out`);
           } else {
-            console.error(`Error checking ${protocol}${url}:`, error);
+            console.log(`Error checking ${protocol}${url}:`, error);
           }
         }
       }
@@ -195,16 +196,18 @@ const Login: React.FC = () => {
           behavior={Platform.OS === "ios" ? "padding" : "height"}
           style={{ flex: 1, height: "100%" }}
         >
-          <View className="flex flex-col justify-between px-4 h-full gap-y-2">
-            <View></View>
-            <View>
+          <View className="flex flex-col w-full h-full relative items-center justify-center">
+            <View className="px-4 -mt-20">
               <View className="mb-4">
                 <Text className="text-3xl font-bold mb-1">
                   {serverName || "Streamyfin"}
                 </Text>
-                <Text className="text-neutral-500 mb-2">
-                  Server: {api.basePath}
-                </Text>
+                <View className="bg-neutral-900 rounded-xl p-4 mb-2 flex flex-row items-center justify-between">
+                  <Text className="">URL</Text>
+                  <Text numberOfLines={1} className="shrink">
+                    {api.basePath}
+                  </Text>
+                </View>
                 <Button
                   color="black"
                   onPress={() => {
@@ -261,11 +264,11 @@ const Login: React.FC = () => {
               <Text className="text-red-600 mb-2">{error}</Text>
             </View>
 
-            <View className="mt-auto mb-2">
+            <View className="absolute bottom-0 left-0 w-full px-4 mb-2">
               <Button
                 color="black"
                 onPress={handleQuickConnect}
-                className="mb-2"
+                className="w-full mb-2"
               >
                 Use Quick Connect
               </Button>
@@ -285,9 +288,17 @@ const Login: React.FC = () => {
         behavior={Platform.OS === "ios" ? "padding" : "height"}
         style={{ flex: 1 }}
       >
-        <View className="flex flex-col px-4 justify-between h-full">
-          <View></View>
-          <View className="flex flex-col gap-y-2">
+        <View className="flex flex-col h-full relative items-center justify-center w-full">
+          <View className="flex flex-col gap-y-2 px-4 w-full -mt-36">
+            <Image
+              style={{
+                width: 100,
+                height: 100,
+                marginLeft: -23,
+                marginBottom: -20,
+              }}
+              source={require("@/assets/images/StreamyFinFinal.png")}
+            />
             <Text className="text-3xl font-bold">Streamyfin</Text>
             <Text className="text-neutral-500">
               Connect to your Jellyfin server
@@ -303,14 +314,16 @@ const Login: React.FC = () => {
               maxLength={500}
             />
           </View>
-          <Button
-            loading={loadingServerCheck}
-            disabled={loadingServerCheck}
-            onPress={async () => await handleConnect(serverURL)}
-            className="mb-2"
-          >
-            Connect
-          </Button>
+          <View className="mb-2 absolute bottom-0 left-0 w-full px-4">
+            <Button
+              loading={loadingServerCheck}
+              disabled={loadingServerCheck}
+              onPress={async () => await handleConnect(serverURL)}
+              className="w-full grow"
+            >
+              Connect
+            </Button>
+          </View>
         </View>
       </KeyboardAvoidingView>
     </SafeAreaView>

components/ItemContent.tsx

@@ -26,7 +26,7 @@ import { useFocusEffect, useNavigation } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import { useAtom } from "jotai";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { View } from "react-native";
+import { Alert, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Chromecast } from "./Chromecast";
 import { ItemHeader } from "./ItemHeader";
@@ -59,6 +59,11 @@ export const ItemContent: React.FC<{ item: BaseItemDto }> = React.memo(
           audioIndex,
           subtitleIndex,
         });
+
+        if (!mediaSource) {
+          Alert.alert("Error", "No media source found for this item.");
+          navigation.goBack();
+        }
       }, [item, settings])
     );
 

components/ListItem.tsx

@@ -21,10 +21,10 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
       className="flex flex-row items-center justify-between bg-neutral-900 p-4"
       {...props}
     >
-      <View className="flex flex-col">
+      <View className="flex flex-col overflow-visible">
         <Text className="font-bold ">{title}</Text>
         {subTitle && (
-          <Text className="text-xs" selectable>
+          <Text uiTextView selectable className="text-xs">
             {subTitle}
           </Text>
         )}

components/common/HeaderBackButton.tsx

@@ -24,14 +24,14 @@ export const HeaderBackButton: React.FC<Props> = ({
 
   if (background === "transparent" && Platform.OS !== "android")
     return (
-      <BlurView
-        {...props}
-        intensity={100}
-        className="overflow-hidden rounded-full p-2"
+      <TouchableOpacity
+        onPress={() => router.back()}
+        {...touchableOpacityProps}
       >
-        <TouchableOpacity
-          onPress={() => router.back()}
-          {...touchableOpacityProps}
+        <BlurView
+          {...props}
+          intensity={100}
+          className="overflow-hidden rounded-full p-2"
         >
           <Ionicons
             className="drop-shadow-2xl"
@@ -39,8 +39,8 @@ export const HeaderBackButton: React.FC<Props> = ({
             size={24}
             color="white"
           />
-        </TouchableOpacity>
-      </BlurView>
+        </BlurView>
+      </TouchableOpacity>
     );
 
   return (

components/common/Input.tsx

@@ -10,9 +10,9 @@ export function Input(props: TextInputProps) {
       className="p-4 border border-neutral-800 rounded-xl bg-neutral-900"
       allowFontScaling={false}
       style={[{ color: "white" }, style]}
-      {...otherProps}
       placeholderTextColor={"#9CA3AF"}
       clearButtonMode="while-editing"
+      {...otherProps}
     />
   );
 }

components/common/Text.tsx

@@ -1,11 +1,16 @@
 import React from "react";
 import { TextProps } from "react-native";
-import { Text as DefaultText } from "react-native";
-export function Text(props: TextProps) {
+import { UITextView } from "react-native-uitextview";
+
+export function Text(
+  props: TextProps & {
+    uiTextView?: boolean;
+  }
+) {
   const { style, ...otherProps } = props;
 
   return (
-    <DefaultText
+    <UITextView
       allowFontScaling={false}
       style={[{ color: "white" }, style]}
       {...otherProps}

components/movies/MoviesTitleHeader.tsx

@@ -9,10 +9,10 @@ interface Props extends ViewProps {
 export const MoviesTitleHeader: React.FC<Props> = ({ item, ...props }) => {
   return (
     <View {...props}>
-      <Text className=" font-bold text-2xl mb-1" selectable>
+      <Text uiTextView selectable className="font-bold text-2xl mb-1">
         {item?.Name}
       </Text>
-      <Text className=" opacity-50">{item?.ProductionYear}</Text>
+      <Text className="opacity-50">{item?.ProductionYear}</Text>
     </View>
   );
 };

components/series/EpisodeTitleHeader.tsx

@@ -12,7 +12,7 @@ export const EpisodeTitleHeader: React.FC<Props> = ({ item, ...props }) => {
 
   return (
     <View {...props}>
-      <Text className="font-bold text-2xl" selectable>
+      <Text uiTextView className="font-bold text-2xl" selectable>
         {item?.Name}
       </Text>
       <View className="flex flex-row items-center mb-1">

components/video-player/Controls.tsx

@@ -123,17 +123,6 @@ export const Controls: React.FC<Props> = ({
 
   const wasPlayingRef = useRef(false);
 
-  const updateTimes = useCallback(
-    (currentProgress: number, maxValue: number) => {
-      const current = ticksToSeconds(currentProgress);
-      const remaining = ticksToSeconds(maxValue - currentProgress);
-
-      setCurrentTime(current);
-      setRemainingTime(remaining);
-    },
-    []
-  );
-
   const { showSkipButton, skipIntro } = useIntroSkipper(
     item.Id,
     currentTime,
@@ -180,6 +169,23 @@ export const Controls: React.FC<Props> = ({
     router.replace("/play-video");
   }, [nextItem, settings]);
 
+  const updateTimes = useCallback(
+    (currentProgress: number, maxValue: number) => {
+      const current = ticksToSeconds(currentProgress);
+      const remaining = ticksToSeconds(maxValue - currentProgress);
+
+      setCurrentTime(current);
+      setRemainingTime(remaining);
+
+      if (currentProgress === maxValue) {
+        setShowControls(true);
+        // Automatically play the next item if it exists
+        goToNextItem();
+      }
+    },
+    [goToNextItem]
+  );
+
   useAnimatedReaction(
     () => ({
       progress: progress.value,

eas.json

@@ -22,13 +22,13 @@
       }
     },
     "production": {
-      "channel": "0.17.0",
+      "channel": "0.18.0",
       "android": {
         "image": "latest"
       }
     },
     "production-apk": {
-      "channel": "0.17.0",
+      "channel": "0.18.0",
       "android": {
         "buildType": "apk",
         "image": "latest"

hooks/useScreenDimensions.ts

@@ -0,0 +1,27 @@
+import { useState, useEffect } from "react";
+import { Dimensions, ScaledSize } from "react-native";
+
+const useScreenDimensions = (): ScaledSize => {
+  const [screenDimensions, setScreenDimensions] = useState(
+    Dimensions.get("screen")
+  );
+
+  useEffect(() => {
+    const updateDimensions = () => {
+      setScreenDimensions(Dimensions.get("screen"));
+    };
+
+    const dimensionsListener = Dimensions.addEventListener(
+      "change",
+      updateDimensions
+    );
+
+    return () => {
+      dimensionsListener.remove();
+    };
+  }, []);
+
+  return screenDimensions;
+};
+
+export default useScreenDimensions;

package.json

@@ -82,6 +82,7 @@
     "react-native-screens": "3.31.1",
     "react-native-svg": "15.2.0",
     "react-native-tab-view": "^3.5.2",
+    "react-native-uitextview": "^1.4.0",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-uuid": "^2.0.2",
     "react-native-video": "^6.6.4",

providers/JellyfinProvider.tsx

@@ -52,7 +52,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
       setJellyfin(
         () =>
           new Jellyfin({
-            clientInfo: { name: "Streamyfin", version: "0.17.0" },
+            clientInfo: { name: "Streamyfin", version: "0.18.0" },
             deviceInfo: { name: Platform.OS === "ios" ? "iOS" : "Android", id },
           })
       );
@@ -86,7 +86,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
     return {
       authorization: `MediaBrowser Client="Streamyfin", Device=${
         Platform.OS === "android" ? "Android" : "iOS"
-      }, DeviceId="${deviceId}", Version="0.17.0"`,
+      }, DeviceId="${deviceId}", Version="0.18.0"`,
     };
   }, [deviceId]);
 

utils/jellyfin/getDefaultPlaySettings.ts

@@ -9,7 +9,7 @@ import { Settings } from "../atoms/settings";
 interface PlaySettings {
   item: BaseItemDto;
   bitrate: (typeof BITRATES)[0];
-  mediaSource: MediaSourceInfo | undefined;
+  mediaSource?: MediaSourceInfo | null;
   audioIndex?: number | null;
   subtitleIndex?: number | null;
 }
@@ -29,9 +29,8 @@ export function getDefaultPlaySettings(
   }
 
   // 1. Get first media source
-  const mediaSource = item.MediaSources?.[0];
 
-  if (!mediaSource) throw new Error("No media source found");
+  const mediaSource = item.MediaSources?.[0];
 
   // 2. Get default or preferred audio
   const defaultAudioIndex = mediaSource?.DefaultAudioStreamIndex;