Merge branch 'master' into master

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

@@ -25,10 +25,9 @@ export default function IndexLayout() {
                 onPress={() => {
                   router.push("/(auth)/settings");
                 }}
+                className="p-2 "
               >
-                <View className="h-10 aspect-square flex items-center justify-center rounded">
-                  <Feather name="settings" color={"white"} size={22} />
-                </View>
+                <Feather name="settings" color={"white"} size={22} />
               </TouchableOpacity>
             </View>
           ),

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

@@ -211,43 +211,34 @@ export default function index() {
     if (!api || !user?.Id) return [];
 
     const ss: Section[] = [
-      {
-        title: "Continue Watching",
-        queryKey: ["resumeItems", user.Id],
-        queryFn: async () =>
-          (
-            await getItemsApi(api).getResumeItems({
-              userId: user.Id,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-      {
-        title: "Next Up",
-        queryKey: ["nextUp-all", user?.Id],
-        queryFn: async () =>
-          (
-            await getTvShowsApi(api).getNextUp({
-              userId: user?.Id,
-              fields: ["MediaSourceCount"],
-              limit: 20,
-              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
-            })
-          ).data.Items || [],
-        type: "ScrollingCollectionList",
-        orientation: "horizontal",
-      },
-      ...(mediaListCollections?.map(
-        (ml) =>
-          ({
-            title: ml.Name || "",
-            queryKey: ["mediaList", ml.Id],
-            queryFn: async () => ml,
-            type: "MediaListSection",
-          } as MediaListSection)
-      ) || []),
+      // {
+      //   title: "Continue Watching",
+      //   queryKey: ["resumeItems", user.Id],
+      //   queryFn: async () =>
+      //     (
+      //       await getItemsApi(api).getResumeItems({
+      //         userId: user.Id,
+      //         enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+      //       })
+      //     ).data.Items || [],
+      //   type: "ScrollingCollectionList",
+      //   orientation: "horizontal",
+      // },
+      // {
+      //   title: "Next Up",
+      //   queryKey: ["nextUp-all", user?.Id],
+      //   queryFn: async () =>
+      //     (
+      //       await getTvShowsApi(api).getNextUp({
+      //         userId: user?.Id,
+      //         fields: ["MediaSourceCount"],
+      //         limit: 20,
+      //         enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+      //       })
+      //     ).data.Items || [],
+      //   type: "ScrollingCollectionList",
+      //   orientation: "horizontal",
+      // },
       {
         title: "Recently Added in Movies",
         queryKey: ["recentlyAddedInMovies", user?.Id, movieCollectionId],
@@ -282,6 +273,15 @@ export default function index() {
           ).data || [],
         type: "ScrollingCollectionList",
       },
+      ...(mediaListCollections?.map(
+        (ml) =>
+          ({
+            title: ml.Name || "",
+            queryKey: ["mediaList", ml.Id],
+            queryFn: async () => ml,
+            type: "MediaListSection",
+          } as MediaListSection)
+      ) || []),
       {
         title: "Suggested Movies",
         queryKey: ["suggestedMovies", user?.Id],
@@ -371,7 +371,7 @@ export default function index() {
 
   const insets = useSafeAreaInsets();
 
-  if (e1 || e2)
+  if (e1 || e2 || !api)
     return (
       <View className="flex flex-col items-center justify-center h-full -mt-6">
         <Text className="text-3xl font-bold mb-2">Oops!</Text>
@@ -395,39 +395,69 @@ export default function index() {
       refreshControl={
         <RefreshControl refreshing={loading} onRefresh={refetch} />
       }
+      key={"home"}
+      contentContainerStyle={{
+        paddingLeft: insets.left,
+        paddingRight: insets.right,
+      }}
+      className="flex flex-col space-y-4 mb-20"
     >
-      <View
-        style={{
-          paddingLeft: insets.left,
-          paddingRight: insets.right,
-        }}
-        className="flex flex-col pt-4 pb-24 gap-y-2"
-      >
-        <LargeMovieCarousel />
+      <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}
-              />
-            );
-          } else if (section.type === "MediaListSection") {
-            return (
-              <MediaListSection
-                key={index}
-                queryKey={section.queryKey}
-                queryFn={section.queryFn}
-              />
-            );
-          }
-          return null;
-        })}
-      </View>
+      <ScrollingCollectionList
+        key="nextUp"
+        title={"Next Up"}
+        queryKey={["nextUp-all", user?.Id]}
+        queryFn={async () =>
+          (
+            await getTvShowsApi(api).getNextUp({
+              userId: user?.Id,
+              fields: ["MediaSourceCount"],
+              limit: 20,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+            })
+          ).data.Items|| []
+        }
+        orientation={"horizontal"}
+      />
+
+      <ScrollingCollectionList
+        key="continueWatching"
+        title={"Continue Watching"}
+        queryKey={["continueWatching", user?.Id]}
+        queryFn={async () =>
+          (
+            await getItemsApi(api).getResumeItems({
+              userId: user?.Id,
+              enableImageTypes: ["Primary", "Backdrop", "Thumb"],
+            })
+          ).data.Items || []
+        }
+        orientation={"horizontal"}
+      />
+
+      {sections.map((section, index) => {
+        if (section.type === "ScrollingCollectionList") {
+          return (
+            <ScrollingCollectionList
+              key={index}
+              title={section.title}
+              queryKey={section.queryKey}
+              queryFn={section.queryFn}
+              orientation={section.orientation}
+            />
+          );
+        } else if (section.type === "MediaListSection") {
+          return (
+            <MediaListSection
+              key={index}
+              queryKey={section.queryKey}
+              queryFn={section.queryFn}
+            />
+          );
+        }
+        return null;
+      })}
     </ScrollView>
   );
 }

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

@@ -91,9 +91,7 @@ export default function settings() {
           <Text className="font-bold text-lg mb-2">Tests</Text>
           <Button
             onPress={() => {
-              toast.success("Download started", {
-                invert: true,
-              });
+              toast.success("Download started");
             }}
             color="black"
           >

app/(auth)/play.tsx

@@ -0,0 +1,48 @@
+import { FullScreenVideoPlayer } from "@/components/FullScreenVideoPlayer";
+import { useSettings } from "@/utils/atoms/settings";
+import * as NavigationBar from "expo-navigation-bar";
+import { StatusBar } from "expo-status-bar";
+import { useEffect, useState } from "react";
+import { Platform, View, ViewProps } from "react-native";
+import * as ScreenOrientation from "expo-screen-orientation";
+
+interface Props extends ViewProps {}
+
+export default function page() {
+  const [settings] = useSettings();
+
+  useEffect(() => {
+    if (settings?.autoRotate) {
+      // Don't need to do anything
+    } else if (settings?.defaultVideoOrientation) {
+      ScreenOrientation.lockAsync(settings.defaultVideoOrientation);
+    }
+
+    if (Platform.OS === "android") {
+      NavigationBar.setVisibilityAsync("hidden");
+      NavigationBar.setBehaviorAsync("overlay-swipe");
+    }
+
+    return () => {
+      if (settings?.autoRotate) {
+        ScreenOrientation.unlockAsync();
+      } else {
+        ScreenOrientation.lockAsync(
+          ScreenOrientation.OrientationLock.PORTRAIT_UP
+        );
+      }
+
+      if (Platform.OS === "android") {
+        NavigationBar.setVisibilityAsync("visible");
+        NavigationBar.setBehaviorAsync("inset-swipe");
+      }
+    };
+  }, [settings]);
+
+  return (
+    <View className="">
+      <StatusBar hidden />
+      <FullScreenVideoPlayer />
+    </View>
+  );
+}

app/_layout.tsx

@@ -120,14 +120,33 @@ function Layout() {
                           title: "",
                         }}
                       />
+                      <Stack.Screen
+                        name="(auth)/play"
+                        options={{
+                          headerShown: false,
+                          title: "",
+                          animation: "fade",
+                        }}
+                      />
                       <Stack.Screen
                         name="login"
                         options={{ headerShown: false, title: "Login" }}
                       />
                       <Stack.Screen name="+not-found" />
                     </Stack>
-                    <FullScreenVideoPlayer />
-                    <Toaster />
+                    <Toaster
+                      duration={2000}
+                      toastOptions={{
+                        style: {
+                          backgroundColor: "#262626",
+                          borderColor: "#363639",
+                          borderWidth: 1,
+                        },
+                        titleStyle: {
+                          color: "white",
+                        },
+                      }}
+                    />
                   </ThemeProvider>
                 </PlaybackProvider>
               </JellyfinProvider>