Merge origin/develop into sonarqube resolve conflicts (.gitignore, settings, DownloadProvider, downloads page)

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

@@ -124,6 +124,19 @@ const DownloadsPage = () => {
     }
   }, [downloadedFiles]);
 
+  const otherMedia = useMemo(() => {
+    try {
+      return (
+        downloadedFiles?.filter(
+          (f) => f.item.Type !== "Movie" && f.item.Type !== "Episode",
+        ) || []
+      );
+    } catch {
+      setShowMigration(true);
+      return [];
+    }
+  }, [downloadedFiles]);
+
   const headerRightComponent = useMemo(
     () => (
       <HeaderRight
@@ -168,8 +181,30 @@ const DownloadsPage = () => {
         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 (
     <>
@@ -272,6 +307,34 @@ const DownloadsPage = () => {
                 </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'>
@@ -301,6 +364,11 @@ const DownloadsPage = () => {
             <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>

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

@@ -24,7 +24,7 @@ export default function IndexLayout() {
             headerShown: !Platform.isTV,
             headerTitle: t("tabs.library"),
             headerBlurEffect: "none",
-            headerTransparent: true,
+            headerTransparent: Platform.OS === "ios",
             headerShadowVisible: false,
             headerRight: () =>
               !pluginSettings?.libraryOptions?.locked &&
@@ -48,7 +48,7 @@ export default function IndexLayout() {
             title: "",
             headerShown: !Platform.isTV,
             headerBlurEffect: "none",
-            headerTransparent: true,
+            headerTransparent: Platform.OS === "ios",
             headerShadowVisible: false,
           }}
         />
@@ -61,7 +61,7 @@ export default function IndexLayout() {
             title: "",
             headerShown: !Platform.isTV,
             headerBlurEffect: "none",
-            headerTransparent: true,
+            headerTransparent: Platform.OS === "ios",
             headerShadowVisible: false,
           }}
         />

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();
@@ -612,8 +618,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)}`);
   }