Fixed up style

This commit is contained in:
Alex Kim
2024-11-24 01:15:01 +11:00
parent ad2bfd8f28
commit c56b80889f

View File

@@ -1,14 +1,17 @@
import React, { useCallback, useMemo } from 'react';
import { View, TouchableOpacity } from 'react-native';
import { Ionicons } from '@expo/vector-icons';
import React, { useCallback, useMemo } from "react";
import { View, TouchableOpacity } from "react-native";
import { Ionicons } from "@expo/vector-icons";
import * as DropdownMenu from "zeego/dropdown-menu";
import { useControlContext } from './contexts/ControlContext';
import { useVideoContext } from './contexts/VideoContext';
import { EmbeddedSubtitle, ExternalSubtitle, TranscodedSubtitle } from './types';
import { useAtomValue } from 'jotai';
import { apiAtom } from '@/providers/JellyfinProvider';
import { useLocalSearchParams, useRouter } from 'expo-router';
import { useControlContext } from "./contexts/ControlContext";
import { useVideoContext } from "./contexts/VideoContext";
import {
EmbeddedSubtitle,
ExternalSubtitle,
TranscodedSubtitle,
} from "./types";
import { useAtomValue } from "jotai";
import { apiAtom } from "@/providers/JellyfinProvider";
import { useLocalSearchParams, useRouter } from "expo-router";
interface DropdownViewProps {
showControls: boolean;
@@ -23,7 +26,13 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
const isVideoLoaded = ControlContext?.isVideoLoaded;
const videoContext = useVideoContext();
const { subtitleTracks, audioTracks, setSubtitleURL, setSubtitleTrack, setAudioTrack } = videoContext;
const {
subtitleTracks,
audioTracks,
setSubtitleURL,
setSubtitleTrack,
setAudioTrack,
} = videoContext;
const allSubtitleTracksForDirectPlay = useMemo(() => {
if (mediaSource?.TranscodingUrl) return null;
@@ -52,6 +61,13 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
)[];
}, [item, isVideoLoaded, subtitleTracks, mediaSource?.MediaStreams]);
// const audioForTranscodingStream = mediaSource?.MediaStreams?.filter(
// (x) => x.Type === "Audio"
// ).map((x) => ({
// name: x.DisplayTitle!,
// index: x.Index!,
// }));
// Only used for transcoding streams.
const {
subtitleIndex: subtitleIndexStr,
@@ -66,29 +82,33 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
}>();
// Either its on a text subtitle or its on not on any subtitle therefore it should show all the embedded HLS subtitles.
const isOnTextSubtitle = mediaSource?.MediaStreams?.find((x) => x.Index === parseInt(subtitleIndexStr)
&& x.IsTextSubtitleStream)
|| subtitleIndexStr === "-1";
const isOnTextSubtitle =
mediaSource?.MediaStreams?.find(
(x) => x.Index === parseInt(subtitleIndexStr) && x.IsTextSubtitleStream
) || subtitleIndexStr === "-1";
// TODO: Add support for text sorting subtitles renaming.
const allSubtitleTracksForTranscodingStream = useMemo(() => {
const allSubs = mediaSource?.MediaStreams?.filter((x) => x.Type === "Subtitle") ?? [];
const allSubs =
mediaSource?.MediaStreams?.filter((x) => x.Type === "Subtitle") ?? [];
if (isOnTextSubtitle) {
const textSubtitles =
subtitleTracks
?.map((s) => ({
subtitleTracks?.map((s) => ({
name: s.name,
index: s.index,
IsTextSubtitleStream: true,
})) || [];
const imageSubtitles =
allSubs.filter((x) => !x.IsTextSubtitleStream).map((x) => (
{ name: x.DisplayTitle!,
index: x.Index!,
IsTextSubtitleStream: x.IsTextSubtitleStream
} as TranscodedSubtitle));
const imageSubtitles = allSubs
.filter((x) => !x.IsTextSubtitleStream)
.map(
(x) =>
({
name: x.DisplayTitle!,
index: x.Index!,
IsTextSubtitleStream: x.IsTextSubtitleStream,
} as TranscodedSubtitle)
);
return [...textSubtitles, ...imageSubtitles];
}
@@ -96,33 +116,32 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
const transcodedSubtitle: TranscodedSubtitle[] = allSubs.map((x) => ({
name: x.DisplayTitle!,
index: x.Index!,
IsTextSubtitleStream: x.IsTextSubtitleStream!
IsTextSubtitleStream: x.IsTextSubtitleStream!,
}));
return transcodedSubtitle;
}, [item, isVideoLoaded, subtitleTracks, mediaSource?.MediaStreams]);
const ChangeTranscodingSubtitle = useCallback((subtitleIndex: number) => {
const queryParams = new URLSearchParams({
itemId: item.Id ?? "", // Ensure itemId is a string
audioIndex: audioIndex?.toString() ?? "",
subtitleIndex: subtitleIndex?.toString() ?? "",
mediaSourceId: mediaSource?.Id ?? "", // Ensure mediaSourceId is a string
bitrateValue: bitrateValue,
}).toString();
// @ts-expect-error
router.replace(`player/player?${queryParams}`);
}, [mediaSource]);
const ChangeTranscodingSubtitle = useCallback(
(subtitleIndex: number) => {
const queryParams = new URLSearchParams({
itemId: item.Id ?? "", // Ensure itemId is a string
audioIndex: audioIndex?.toString() ?? "",
subtitleIndex: subtitleIndex?.toString() ?? "",
mediaSourceId: mediaSource?.Id ?? "", // Ensure mediaSourceId is a string
bitrateValue: bitrateValue,
}).toString();
// @ts-expect-error
router.replace(`player/player?${queryParams}`);
},
[mediaSource]
);
return (
<View
style={{
position: 'absolute',
position: "absolute",
zIndex: 1000,
opacity: showControls ? 1 : 0,
}}
@@ -154,51 +173,60 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
loop={true}
sideOffset={10}
>
{!mediaSource?.TranscodingUrl && allSubtitleTracksForDirectPlay?.map((sub, idx: number) => (
<DropdownMenu.Item
key={`subtitle-item-${idx}`}
onSelect={() => {
if ("deliveryUrl" in sub && sub.deliveryUrl) {
setSubtitleURL &&
setSubtitleURL(
api?.basePath + sub.deliveryUrl,
sub.name
{!mediaSource?.TranscodingUrl &&
allSubtitleTracksForDirectPlay?.map((sub, idx: number) => (
<DropdownMenu.Item
key={`subtitle-item-${idx}`}
onSelect={() => {
if ("deliveryUrl" in sub && sub.deliveryUrl) {
setSubtitleURL &&
setSubtitleURL(
api?.basePath + sub.deliveryUrl,
sub.name
);
console.log(
"Set external subtitle: ",
api?.basePath + sub.deliveryUrl
);
} else {
console.log("Set sub index: ", sub.index);
setSubtitleTrack && setSubtitleTrack(sub.index);
}
console.log("Set external subtitle: ", api?.basePath + sub.deliveryUrl);
} else {
console.log("Set sub index: ", sub.index);
setSubtitleTrack && setSubtitleTrack(sub.index);
}
console.log("Subtitle: ", sub);
}}
>
<DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key={`subtitle-item-title-${idx}`}>
{sub.name}
</DropdownMenu.ItemTitle>
</DropdownMenu.Item>
))}
{mediaSource?.TranscodingUrl &&
allSubtitleTracksForTranscodingStream?.map(
(sub, idx: number) => (
<DropdownMenu.Item
key={`subtitle-item-${idx}`}
onSelect={() => {
if (subtitleIndexStr === sub.index.toString()) return;
console.log("Subtitle: ", sub);
}}
>
<DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key={`subtitle-item-title-${idx}`}>
{sub.name}
</DropdownMenu.ItemTitle>
</DropdownMenu.Item>
))}
{mediaSource?.TranscodingUrl && allSubtitleTracksForTranscodingStream?.map((sub, idx: number) => (
<DropdownMenu.Item
key={`subtitle-item-${idx}`}
onSelect={() => {
if (subtitleIndexStr === sub.index.toString()) return;
if (sub.IsTextSubtitleStream && isOnTextSubtitle) {
setSubtitleTrack && setSubtitleTrack(sub.index);
return;
}
ChangeTranscodingSubtitle(sub.index);
}}
>
<DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle key={`subtitle-item-title-${idx}`}>
{sub.name}
</DropdownMenu.ItemTitle>
</DropdownMenu.Item>
))}
if (sub.IsTextSubtitleStream && isOnTextSubtitle) {
setSubtitleTrack && setSubtitleTrack(sub.index);
return;
}
ChangeTranscodingSubtitle(sub.index);
}}
>
<DropdownMenu.ItemIndicator />
<DropdownMenu.ItemTitle
key={`subtitle-item-title-${idx}`}
>
{sub.name}
</DropdownMenu.ItemTitle>
</DropdownMenu.Item>
)
)}
</DropdownMenu.SubContent>
</DropdownMenu.Sub>
<DropdownMenu.Sub>
@@ -233,4 +261,4 @@ const DropdownView: React.FC<DropdownViewProps> = ({ showControls }) => {
);
};
export default DropdownView;
export default DropdownView;