fix: marlin search settings

components/settings/DownloadSettings.tsx

@@ -5,13 +5,13 @@ import { Ionicons } from "@expo/vector-icons";
 import { useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "expo-router";
 import React from "react";
-import { Switch, TouchableOpacity } from "react-native";
+import { Switch, TouchableOpacity, View } from "react-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
-export const DownloadSettings: React.FC = () => {
+export const DownloadSettings: React.FC = ({ ...props }) => {
   const [settings, updateSettings] = useSettings();
   const { setProcesses } = useDownload();
   const router = useRouter();
@@ -20,84 +20,92 @@ export const DownloadSettings: React.FC = () => {
   if (!settings) return null;
 
   return (
-    <ListGroup title="Downloads">
-      <ListItem title="Download method">
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger>
-            <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
-              <Text className="mr-1 text-[#8E8D91]">
-                {settings.downloadMethod === "remux" ? "Default" : "Optimized"}
-              </Text>
-              <Ionicons name="chevron-expand-sharp" size={18} color="#5A5960" />
-            </TouchableOpacity>
-          </DropdownMenu.Trigger>
-          <DropdownMenu.Content
-            loop={true}
-            side="bottom"
-            align="start"
-            alignOffset={0}
-            avoidCollisions={true}
-            collisionPadding={8}
-            sideOffset={8}
-          >
-            <DropdownMenu.Label>Methods</DropdownMenu.Label>
-            <DropdownMenu.Item
-              key="1"
-              onSelect={() => {
-                updateSettings({ downloadMethod: "remux" });
-                setProcesses([]);
-              }}
+    <View {...props} className="mb-4">
+      <ListGroup title="Downloads">
+        <ListItem title="Download method">
+          <DropdownMenu.Root>
+            <DropdownMenu.Trigger>
+              <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
+                <Text className="mr-1 text-[#8E8D91]">
+                  {settings.downloadMethod === "remux"
+                    ? "Default"
+                    : "Optimized"}
+                </Text>
+                <Ionicons
+                  name="chevron-expand-sharp"
+                  size={18}
+                  color="#5A5960"
+                />
+              </TouchableOpacity>
+            </DropdownMenu.Trigger>
+            <DropdownMenu.Content
+              loop={true}
+              side="bottom"
+              align="start"
+              alignOffset={0}
+              avoidCollisions={true}
+              collisionPadding={8}
+              sideOffset={8}
             >
-              <DropdownMenu.ItemTitle>Default</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="2"
-              onSelect={() => {
-                updateSettings({ downloadMethod: "optimized" });
-                setProcesses([]);
-                queryClient.invalidateQueries({ queryKey: ["search"] });
-              }}
-            >
-              <DropdownMenu.ItemTitle>Optimized</DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          </DropdownMenu.Content>
-        </DropdownMenu.Root>
-      </ListItem>
+              <DropdownMenu.Label>Methods</DropdownMenu.Label>
+              <DropdownMenu.Item
+                key="1"
+                onSelect={() => {
+                  updateSettings({ downloadMethod: "remux" });
+                  setProcesses([]);
+                }}
+              >
+                <DropdownMenu.ItemTitle>Default</DropdownMenu.ItemTitle>
+              </DropdownMenu.Item>
+              <DropdownMenu.Item
+                key="2"
+                onSelect={() => {
+                  updateSettings({ downloadMethod: "optimized" });
+                  setProcesses([]);
+                  queryClient.invalidateQueries({ queryKey: ["search"] });
+                }}
+              >
+                <DropdownMenu.ItemTitle>Optimized</DropdownMenu.ItemTitle>
+              </DropdownMenu.Item>
+            </DropdownMenu.Content>
+          </DropdownMenu.Root>
+        </ListItem>
 
-      <ListItem
-        title="Remux max download"
-        disabled={settings.downloadMethod !== "remux"}
-      >
-        <Stepper
-          value={settings.remuxConcurrentLimit}
-          step={1}
-          min={1}
-          max={4}
-          onUpdate={(value) =>
-            updateSettings({
-              remuxConcurrentLimit: value as Settings["remuxConcurrentLimit"],
-            })
-          }
-        />
-      </ListItem>
+        <ListItem
+          title="Remux max download"
+          disabled={settings.downloadMethod !== "remux"}
+        >
+          <Stepper
+            value={settings.remuxConcurrentLimit}
+            step={1}
+            min={1}
+            max={4}
+            onUpdate={(value) =>
+              updateSettings({
+                remuxConcurrentLimit: value as Settings["remuxConcurrentLimit"],
+              })
+            }
+          />
+        </ListItem>
 
-      <ListItem
-        title="Auto download"
-        disabled={settings.downloadMethod !== "optimized"}
-      >
-        <Switch
+        <ListItem
+          title="Auto download"
           disabled={settings.downloadMethod !== "optimized"}
-          value={settings.autoDownload}
-          onValueChange={(value) => updateSettings({ autoDownload: value })}
-        />
-      </ListItem>
+        >
+          <Switch
+            disabled={settings.downloadMethod !== "optimized"}
+            value={settings.autoDownload}
+            onValueChange={(value) => updateSettings({ autoDownload: value })}
+          />
+        </ListItem>
 
-      <ListItem
-        disabled={settings.downloadMethod !== "optimized"}
-        onPress={() => router.push("/settings/optimized-server/page")}
-        showArrow
-        title="Optimized Versions Server"
-      ></ListItem>
-    </ListGroup>
+        <ListItem
+          disabled={settings.downloadMethod !== "optimized"}
+          onPress={() => router.push("/settings/optimized-server/page")}
+          showArrow
+          title="Optimized Versions Server"
+        ></ListItem>
+      </ListGroup>
+    </View>
   );
 };

components/settings/OtherSettings.tsx

@@ -1,11 +1,5 @@
-import { Stepper } from "@/components/inputs/Stepper";
-import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import {
-  ScreenOrientationEnum,
-  Settings,
-  useSettings,
-} from "@/utils/atoms/settings";
+import { ScreenOrientationEnum, useSettings } from "@/utils/atoms/settings";
 import {
   BACKGROUND_FETCH_TASK,
   registerBackgroundFetchAsync,
@@ -15,22 +9,13 @@ import { Ionicons } from "@expo/vector-icons";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import * as BackgroundFetch from "expo-background-fetch";
-import { useRouter } from "expo-router";
 import * as ScreenOrientation from "expo-screen-orientation";
 import * as TaskManager from "expo-task-manager";
 import { useAtom } from "jotai";
 import React, { useEffect, useState } from "react";
-import {
-  Linking,
-  Switch,
-  TouchableOpacity,
-  View,
-  ViewProps,
-} from "react-native";
+import { Linking, Switch, TouchableOpacity, ViewProps } from "react-native";
 import { toast } from "sonner-native";
 import * as DropdownMenu from "zeego/dropdown-menu";
-import { Button } from "../Button";
-import { Input } from "../common/Input";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
@@ -76,6 +61,8 @@ export const OtherSettings: React.FC = () => {
   /**********************
    *********************/
 
+  const queryClient = useQueryClient();
+
   const {
     data: mediaListCollections,
     isLoading: isLoadingMediaListCollections,
@@ -258,129 +245,6 @@ export const OtherSettings: React.FC = () => {
           )}
         </ListGroup>
       )}
-
-      <ListItem title="Search engine">
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger>
-            <TouchableOpacity className="flex flex-row items-center justify-between py-3 pl-3">
-              <Text className="mr-1 text-[#8E8D91]">
-                {settings.searchEngine}
-              </Text>
-              <Ionicons name="chevron-expand-sharp" size={18} color="#5A5960" />
-            </TouchableOpacity>
-          </DropdownMenu.Trigger>
-          <DropdownMenu.Content
-            loop={true}
-            side="bottom"
-            align="start"
-            alignOffset={0}
-            avoidCollisions={true}
-            collisionPadding={8}
-            sideOffset={8}
-          >
-            <DropdownMenu.Label>Orientation</DropdownMenu.Label>
-            <DropdownMenu.Item
-              key="1"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.DEFAULT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.DEFAULT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="2"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.PORTRAIT_UP,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.PORTRAIT_UP
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="3"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.LANDSCAPE_LEFT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.LANDSCAPE_LEFT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-            <DropdownMenu.Item
-              key="4"
-              onSelect={() => {
-                updateSettings({
-                  defaultVideoOrientation:
-                    ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT,
-                });
-              }}
-            >
-              <DropdownMenu.ItemTitle>
-                {
-                  ScreenOrientationEnum[
-                    ScreenOrientation.OrientationLock.LANDSCAPE_RIGHT
-                  ]
-                }
-              </DropdownMenu.ItemTitle>
-            </DropdownMenu.Item>
-          </DropdownMenu.Content>
-        </DropdownMenu.Root>
-      </ListItem>
-
-      {settings.searchEngine === "Marlin" && (
-        <ListItem title="Marlin Server URL">
-          <View className="flex flex-row items-center space-x-2">
-            <Input
-              placeholder="Marlin Server URL..."
-              defaultValue={settings.marlinServerUrl}
-              value={marlinUrl}
-              keyboardType="url"
-              returnKeyType="done"
-              autoCapitalize="none"
-              textContentType="URL"
-              onChangeText={(text) => setMarlinUrl(text)}
-            />
-            <Button
-              color="purple"
-              className="shrink w-16 h-12"
-              onPress={() => {
-                updateSettings({
-                  marlinServerUrl: marlinUrl.endsWith("/")
-                    ? marlinUrl
-                    : marlinUrl + "/",
-                });
-              }}
-            >
-              Save
-            </Button>
-          </View>
-        </ListItem>
-      )}
-
       <ListItem
         title="Show Custom Menu Links"
         onPress={() =>

components/settings/PluginSettings.tsx

@@ -0,0 +1,30 @@
+import { useSettings } from "@/utils/atoms/settings";
+import { useRouter } from "expo-router";
+import React from "react";
+import { View } from "react-native";
+import { ListGroup } from "../list/ListGroup";
+import { ListItem } from "../list/ListItem";
+
+export const PluginSettings = () => {
+  const [settings, updateSettings] = useSettings();
+
+  const router = useRouter();
+
+  if (!settings) return null;
+  return (
+    <View>
+      <ListGroup title="Plugins">
+        <ListItem
+          onPress={() => router.push("/settings/jellyseerr/page")}
+          title={"Jellyseerr Settings"}
+          showArrow
+        />
+        <ListItem
+          onPress={() => router.push("/settings/marlin-search/page")}
+          title="Marlin Search"
+          showArrow
+        />
+      </ListGroup>
+    </View>
+  );
+};