Merge branch 'develop' into feature/newarch

2026-06-05 05:28:37 +01:00 · 2025-10-02 19:46:34 +02:00
parent 7e2cfb9790 08c7382191
commit a0725d89a0
21 changed files with 1815 additions and 332 deletions
--- a/app/(auth)/(tabs)/(home)/downloads/index.tsx
+++ b/app/(auth)/(tabs)/(home)/downloads/index.tsx
@@ -93,6 +93,19 @@ export default function page() {
    }
  }, [downloadedFiles]);

+  const otherMedia = useMemo(() => {
+    try {
+      return (
+        downloadedFiles?.filter(
+          (f) => f.item.Type !== "Movie" && f.item.Type !== "Episode",
+        ) || []
+      );
+    } catch {
+      setShowMigration(true);
+      return [];
+    }
+  }, [downloadedFiles]);
+
  useEffect(() => {
    navigation.setOptions({
      headerRight: () => (
@@ -131,8 +144,30 @@ export default function page() {
        writeToLog("ERROR", reason);
        toast.error(t("home.downloads.toasts.failed_to_delete_all_tvseries"));
      });
+  const deleteOtherMedia = () =>
+    Promise.all(
+      otherMedia.map((item) =>
+        deleteFileByType(item.item.Type)
+          .then(() =>
+            toast.success(
+              t("home.downloads.toasts.deleted_media_successfully", {
+                type: item.item.Type,
+              }),
+            ),
+          )
+          .catch((reason) => {
+            writeToLog("ERROR", reason);
+            toast.error(
+              t("home.downloads.toasts.failed_to_delete_media", {
+                type: item.item.Type,
+              }),
+            );
+          }),
+      ),
+    );
+
  const deleteAllMedia = async () =>
-    await Promise.all([deleteMovies(), deleteShows()]);
+    await Promise.all([deleteMovies(), deleteShows(), deleteOtherMedia()]);

  return (
    <>
@@ -241,6 +276,34 @@ export default function page() {
                </ScrollView>
              </View>
            )}
+
+            {otherMedia.length > 0 && (
+              <View className='mb-4'>
+                <View className='flex flex-row items-center justify-between mb-2 px-4'>
+                  <Text className='text-lg font-bold'>
+                    {t("home.downloads.other_media")}
+                  </Text>
+                  <View className='bg-purple-600 rounded-full h-6 w-6 flex items-center justify-center'>
+                    <Text className='text-xs font-bold'>
+                      {otherMedia?.length}
+                    </Text>
+                  </View>
+                </View>
+                <ScrollView horizontal showsHorizontalScrollIndicator={false}>
+                  <View className='px-4 flex flex-row'>
+                    {otherMedia?.map((item) => (
+                      <TouchableItemRouter
+                        item={item.item}
+                        isOffline
+                        key={item.item.Id}
+                      >
+                        <MovieCard item={item.item} />
+                      </TouchableItemRouter>
+                    ))}
+                  </View>
+                </ScrollView>
+              </View>
+            )}
            {downloadedFiles?.length === 0 && (
              <View className='flex px-4'>
                <Text className='opacity-50'>
@@ -276,6 +339,11 @@ export default function page() {
            <Button color='purple' onPress={deleteShows}>
              {t("home.downloads.delete_all_tvseries_button")}
            </Button>
+            {otherMedia.length > 0 && (
+              <Button color='purple' onPress={deleteOtherMedia}>
+                {t("home.downloads.delete_all_other_media_button")}
+              </Button>
+            )}
            <Button color='red' onPress={deleteAllMedia}>
              {t("home.downloads.delete_all_button")}
            </Button>
--- a/app/(auth)/(tabs)/(libraries)/_layout.tsx
+++ b/app/(auth)/(tabs)/(libraries)/_layout.tsx
@@ -23,112 +23,117 @@ export default function IndexLayout() {
          headerBlurEffect: "none",
          headerTransparent: Platform.OS === "ios",
          headerShadowVisible: false,
-          headerRight: () => (
-            <PlatformDropdown
-              trigger={
-                <Ionicons
-                  name='ellipsis-horizontal-outline'
-                  size={24}
-                  color='white'
-                />
-              }
-              title={t("library.options.display")}
-              groups={[
-                {
-                  title: t("library.options.display"),
-                  options: [
-                    {
-                      type: "radio",
-                      label: t("library.options.row"),
-                      value: "row",
-                      selected: settings.libraryOptions.display === "row",
-                      onPress: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            display: "row",
-                          },
-                        }),
-                    },
-                    {
-                      type: "radio",
-                      label: t("library.options.list"),
-                      value: "list",
-                      selected: settings.libraryOptions.display === "list",
-                      onPress: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            display: "list",
-                          },
-                        }),
-                    },
-                  ],
-                },
-                {
-                  title: t("library.options.image_style"),
-                  options: [
-                    {
-                      type: "radio",
-                      label: t("library.options.poster"),
-                      value: "poster",
-                      selected: settings.libraryOptions.imageStyle === "poster",
-                      onPress: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            imageStyle: "poster",
-                          },
-                        }),
-                    },
-                    {
-                      type: "radio",
-                      label: t("library.options.cover"),
-                      value: "cover",
-                      selected: settings.libraryOptions.imageStyle === "cover",
-                      onPress: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            imageStyle: "cover",
-                          },
-                        }),
-                    },
-                  ],
-                },
-                {
-                  title: "Options",
-                  options: [
-                    {
-                      type: "toggle",
-                      label: t("library.options.show_titles"),
-                      value: settings.libraryOptions.showTitles,
-                      onToggle: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            showTitles: !settings.libraryOptions.showTitles,
-                          },
-                        }),
-                      disabled: settings.libraryOptions.imageStyle === "poster",
-                    },
-                    {
-                      type: "toggle",
-                      label: t("library.options.show_stats"),
-                      value: settings.libraryOptions.showStats,
-                      onToggle: () =>
-                        updateSettings({
-                          libraryOptions: {
-                            ...settings.libraryOptions,
-                            showStats: !settings.libraryOptions.showStats,
-                          },
-                        }),
-                    },
-                  ],
-                },
-              ]}
-            />
-          ),
+          headerRight: () =>
+            !pluginSettings?.libraryOptions?.locked &&
+            !Platform.isTV && (
+              <PlatformDropdown
+                trigger={
+                  <Ionicons
+                    name='ellipsis-horizontal-outline'
+                    size={24}
+                    color='white'
+                  />
+                }
+                title={t("library.options.display")}
+                groups={[
+                  {
+                    title: t("library.options.display"),
+                    options: [
+                      {
+                        type: "radio",
+                        label: t("library.options.row"),
+                        value: "row",
+                        selected: settings.libraryOptions.display === "row",
+                        onPress: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              display: "row",
+                            },
+                          }),
+                      },
+                      {
+                        type: "radio",
+                        label: t("library.options.list"),
+                        value: "list",
+                        selected: settings.libraryOptions.display === "list",
+                        onPress: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              display: "list",
+                            },
+                          }),
+                      },
+                    ],
+                  },
+                  {
+                    title: t("library.options.image_style"),
+                    options: [
+                      {
+                        type: "radio",
+                        label: t("library.options.poster"),
+                        value: "poster",
+                        selected:
+                          settings.libraryOptions.imageStyle === "poster",
+                        onPress: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              imageStyle: "poster",
+                            },
+                          }),
+                      },
+                      {
+                        type: "radio",
+                        label: t("library.options.cover"),
+                        value: "cover",
+                        selected:
+                          settings.libraryOptions.imageStyle === "cover",
+                        onPress: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              imageStyle: "cover",
+                            },
+                          }),
+                      },
+                    ],
+                  },
+                  {
+                    title: "Options",
+                    options: [
+                      {
+                        type: "toggle",
+                        label: t("library.options.show_titles"),
+                        value: settings.libraryOptions.showTitles,
+                        onToggle: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              showTitles: !settings.libraryOptions.showTitles,
+                            },
+                          }),
+                        disabled:
+                          settings.libraryOptions.imageStyle === "poster",
+                      },
+                      {
+                        type: "toggle",
+                        label: t("library.options.show_stats"),
+                        value: settings.libraryOptions.showStats,
+                        onToggle: () =>
+                          updateSettings({
+                            libraryOptions: {
+                              ...settings.libraryOptions,
+                              showStats: !settings.libraryOptions.showStats,
+                            },
+                          }),
+                      },
+                    ],
+                  },
+                ]}
+              />
+            ),
        }}
      />
      <Stack.Screen
--- a/app/(auth)/player/direct-player.tsx
+++ b/app/(auth)/player/direct-player.tsx
@@ -22,6 +22,12 @@ import { BITRATES } from "@/components/BitrateSelector";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { Controls } from "@/components/video-player/controls/Controls";
+import {
+  OUTLINE_THICKNESS,
+  OutlineThickness,
+  VLC_COLORS,
+  VLCColor,
+} from "@/constants/SubtitleConstants";
 import { useHaptic } from "@/hooks/useHaptic";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
@@ -101,7 +107,7 @@ export default function page() {
    /** Playback position in ticks. */
    playbackPosition?: string;
  }>();
-  useSettings();
+  const { settings } = useSettings();

  const offline = offlineStr === "true";
  const playbackManager = usePlaybackManager();
@@ -560,8 +566,34 @@ export default function page() {
      ? allSubs.indexOf(chosenSubtitleTrack)
      : [...textSubs].reverse().indexOf(chosenSubtitleTrack);
    initOptions.push(`--sub-track=${finalIndex}`);
-  }

+    // Add VLC subtitle styling options from settings
+    const textColor = (settings.vlcTextColor ?? "White") as VLCColor;
+    const backgroundColor = (settings.vlcBackgroundColor ??
+      "Black") as VLCColor;
+    const outlineColor = (settings.vlcOutlineColor ?? "Black") as VLCColor;
+    const outlineThickness = (settings.vlcOutlineThickness ??
+      "Normal") as OutlineThickness;
+    const backgroundOpacity = settings.vlcBackgroundOpacity ?? 128;
+    const outlineOpacity = settings.vlcOutlineOpacity ?? 255;
+    const isBold = settings.vlcIsBold ?? false;
+    // Add subtitle styling options
+    initOptions.push(`--freetype-color=${VLC_COLORS[textColor]}`);
+    initOptions.push(`--freetype-background-opacity=${backgroundOpacity}`);
+    initOptions.push(
+      `--freetype-background-color=${VLC_COLORS[backgroundColor]}`,
+    );
+    initOptions.push(`--freetype-outline-opacity=${outlineOpacity}`);
+    initOptions.push(`--freetype-outline-color=${VLC_COLORS[outlineColor]}`);
+    initOptions.push(
+      `--freetype-outline-thickness=${OUTLINE_THICKNESS[outlineThickness]}`,
+    );
+    initOptions.push(`--sub-text-scale=${settings.subtitleSize}`);
+    initOptions.push("--sub-margin=40");
+    if (isBold) {
+      initOptions.push("--freetype-bold");
+    }
+  }
  if (notTranscoding && chosenAudioTrack) {
    initOptions.push(`--audio-track=${allAudio.indexOf(chosenAudioTrack)}`);
  }