mirror of
https://github.com/tapframe/NuvioStreaming.git
synced 2026-05-18 07:51:46 +00:00
Merge branch 'NuvioMedia:main' into localization-patch
This commit is contained in:
albyalex96
GitHub
commit
6a7a7b0f38
4 changed files with 102 additions and 110 deletions
|
|
@ -189,6 +189,11 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
|
||||
const metadataResult = useMetadata({ id: id || 'placeholder', type: (type as any) });
|
||||
const { metadata, cast } = Boolean(id && type) ? (metadataResult as any) : { metadata: null, cast: [] };
|
||||
|
||||
// For content with provider IDs (e.g. kitsu:123), imdbId from route params may be null at
|
||||
// navigation time. useMetadata resolves it asynchronously via ARM + TMDB. Use that resolved
|
||||
// value as a fallback so Trakt scrobbling and watched status use a real IMDb ID.
|
||||
const resolvedImdbId: string | undefined = imdbId || (metadataResult as any).imdbId || undefined;
|
||||
const hasLogo = metadata && metadata.logo;
|
||||
const openingAnimation = useOpeningAnimation(backdrop, metadata);
|
||||
|
||||
|
|
@ -212,12 +217,12 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
type: type === 'series' ? 'series' : 'movie',
|
||||
title: episodeTitle || title,
|
||||
year: year || 0,
|
||||
imdbId: imdbId || '',
|
||||
imdbId: resolvedImdbId || '',
|
||||
season: season,
|
||||
episode: episode,
|
||||
showTitle: title,
|
||||
showYear: year,
|
||||
showImdbId: imdbId,
|
||||
showImdbId: resolvedImdbId,
|
||||
episodeId: episodeId
|
||||
});
|
||||
|
||||
|
|
@ -244,7 +249,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
traktAutosync,
|
||||
controlsHook.seekToTime,
|
||||
currentStreamProvider,
|
||||
imdbId,
|
||||
resolvedImdbId,
|
||||
season,
|
||||
episode,
|
||||
releaseDate,
|
||||
|
|
@ -267,7 +272,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
const nextEpisodeHook = useNextEpisode(type, season, episode, groupedEpisodes, (metadataResult as any)?.groupedEpisodes, episodeId);
|
||||
|
||||
const { segments: skipIntervals, outroSegment } = useSkipSegments({
|
||||
imdbId: imdbId || (id?.startsWith('tt') ? id : undefined),
|
||||
imdbId: resolvedImdbId || (id?.startsWith('tt') ? id : undefined),
|
||||
type,
|
||||
season,
|
||||
episode,
|
||||
|
|
@ -731,7 +736,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
id,
|
||||
type: 'series',
|
||||
episodeId: ep.stremioId || `${id}:${ep.season_number}:${ep.episode_number}`,
|
||||
imdbId: imdbId ?? undefined,
|
||||
imdbId: resolvedImdbId ?? undefined,
|
||||
backdrop: backdrop || undefined,
|
||||
availableStreams: {},
|
||||
groupedEpisodes: groupedEpisodes,
|
||||
|
|
@ -741,7 +746,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
|
||||
// Subtitle addon fetching
|
||||
const fetchAvailableSubtitles = useCallback(async () => {
|
||||
const targetImdbId = imdbId;
|
||||
const targetImdbId = resolvedImdbId;
|
||||
|
||||
setIsLoadingSubtitleList(true);
|
||||
try {
|
||||
|
|
@ -820,7 +825,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
} finally {
|
||||
setIsLoadingSubtitleList(false);
|
||||
}
|
||||
}, [imdbId, type, season, episode, id]);
|
||||
}, [resolvedImdbId, type, season, episode, id]);
|
||||
|
||||
const loadWyzieSubtitle = useCallback(async (subtitle: WyzieSubtitle) => {
|
||||
if (!subtitle.url) return;
|
||||
|
|
@ -1046,7 +1051,10 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
onLongPressActivated={speedControl.activateSpeedBoost}
|
||||
onLongPressEnd={speedControl.deactivateSpeedBoost}
|
||||
onLongPressStateChange={(e) => {
|
||||
if (e.nativeEvent.state !== 4 && e.nativeEvent.state !== 2) speedControl.deactivateSpeedBoost();
|
||||
const state = e.nativeEvent.state;
|
||||
if (state === 5 || state === 3 || state === 1) { // END, CANCELLED, FAILED
|
||||
speedControl.deactivateSpeedBoost();
|
||||
}
|
||||
}}
|
||||
toggleControls={toggleControls}
|
||||
showControls={playerState.showControls}
|
||||
|
|
@ -1119,7 +1127,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
canEnterPictureInPicture={canShowPipButton}
|
||||
onEnterPictureInPicture={handleEnterPictureInPicture}
|
||||
isBuffering={playerState.isBuffering}
|
||||
imdbId={imdbId}
|
||||
imdbId={resolvedImdbId}
|
||||
/>
|
||||
|
||||
<SpeedActivatedOverlay
|
||||
|
|
@ -1145,7 +1153,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
|
||||
{/* Parental Guide Overlay - Shows after controls first hide */}
|
||||
<ParentalGuideOverlay
|
||||
imdbId={imdbId || (id?.startsWith('tt') ? id : undefined)}
|
||||
imdbId={resolvedImdbId || (id?.startsWith('tt') ? id : undefined)}
|
||||
type={type as 'movie' | 'series'}
|
||||
season={season}
|
||||
episode={episode}
|
||||
|
|
@ -1154,7 +1162,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
|
||||
{/* Skip Intro Button - Shows during intro section of TV episodes */}
|
||||
<SkipIntroButton
|
||||
imdbId={imdbId || (id?.startsWith('tt') ? id : undefined)}
|
||||
imdbId={resolvedImdbId || (id?.startsWith('tt') ? id : undefined)}
|
||||
type={type || 'movie'}
|
||||
season={season}
|
||||
episode={episode}
|
||||
|
|
@ -1301,7 +1309,7 @@ const AndroidVideoPlayer: React.FC = () => {
|
|||
visible={modals.showSubmitIntroModal}
|
||||
onClose={() => modals.setShowSubmitIntroModal(false)}
|
||||
currentTime={playerState.currentTime}
|
||||
imdbId={imdbId}
|
||||
imdbId={resolvedImdbId}
|
||||
season={season}
|
||||
episode={episode}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -59,23 +59,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
|
|||
useNativeDriver: true
|
||||
}).start();
|
||||
|
||||
setTimeout(() => {
|
||||
Animated.timing(speedActivatedOverlayOpacity, {
|
||||
toValue: 0,
|
||||
duration: 300,
|
||||
useNativeDriver: true
|
||||
}).start(() => setShowSpeedActivatedOverlay(false));
|
||||
}, 2000);
|
||||
|
||||
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
|
||||
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
|
||||
|
||||
const deactivateSpeedBoost = useCallback(() => {
|
||||
if (isSpeedBoosted) {
|
||||
setPlaybackSpeed(originalSpeed);
|
||||
setIsSpeedBoosted(false);
|
||||
Animated.timing(speedActivatedOverlayOpacity, { toValue: 0, duration: 100, useNativeDriver: true }).start();
|
||||
|
||||
Animated.timing(speedActivatedOverlayOpacity, {
|
||||
toValue: 0,
|
||||
duration: 100,
|
||||
useNativeDriver: true
|
||||
}).start(() => {
|
||||
setShowSpeedActivatedOverlay(false);
|
||||
});
|
||||
}
|
||||
}, [isSpeedBoosted, originalSpeed]);
|
||||
}, [isSpeedBoosted, originalSpeed, speedActivatedOverlayOpacity]);
|
||||
|
||||
return {
|
||||
playbackSpeed,
|
||||
|
|
|
|||
|
|
@ -191,13 +191,9 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
|
|||
height: '100%' as const,
|
||||
};
|
||||
|
||||
// Full gesture area style
|
||||
// Full gesture area style covering the entire video
|
||||
const gestureAreaStyle = {
|
||||
position: 'absolute' as const,
|
||||
top: screenDimensions.height * 0.15,
|
||||
left: 0,
|
||||
width: screenDimensions.width,
|
||||
height: screenDimensions.height * 0.7,
|
||||
...StyleSheet.absoluteFillObject,
|
||||
zIndex: 10,
|
||||
};
|
||||
|
||||
|
|
@ -237,41 +233,39 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
|
|||
failOffsetY={[-20, 20]}
|
||||
maxPointers={1}
|
||||
>
|
||||
<View style={gestureAreaStyle}>
|
||||
{/* Left side gestures */}
|
||||
<TapGestureHandler
|
||||
ref={leftDoubleTapRef}
|
||||
numberOfTaps={2}
|
||||
onActivated={handleLeftDoubleTap}
|
||||
>
|
||||
<View style={leftSideStyle}>
|
||||
<LongPressGestureHandler
|
||||
onActivated={onLongPressActivated}
|
||||
onEnded={onLongPressEnd}
|
||||
onHandlerStateChange={onLongPressStateChange}
|
||||
minDurationMs={500}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<PanGestureHandler
|
||||
ref={leftVerticalPanRef}
|
||||
onGestureEvent={gestureControls.onBrightnessGestureEvent}
|
||||
activeOffsetY={[-10, 10]}
|
||||
failOffsetX={[-20, 20]}
|
||||
maxPointers={1}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<TapGestureHandler
|
||||
waitFor={leftDoubleTapRef}
|
||||
onActivated={toggleControls}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill} />
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
</PanGestureHandler>
|
||||
</View>
|
||||
</LongPressGestureHandler>
|
||||
</View>
|
||||
</TapGestureHandler>
|
||||
<LongPressGestureHandler
|
||||
onActivated={onLongPressActivated}
|
||||
onEnded={onLongPressEnd}
|
||||
onHandlerStateChange={onLongPressStateChange}
|
||||
minDurationMs={500}
|
||||
maxDist={100000}
|
||||
>
|
||||
<View style={gestureAreaStyle}>
|
||||
{/* Left side gestures */}
|
||||
<TapGestureHandler
|
||||
ref={leftDoubleTapRef}
|
||||
numberOfTaps={2}
|
||||
onActivated={handleLeftDoubleTap}
|
||||
>
|
||||
<View style={leftSideStyle}>
|
||||
<PanGestureHandler
|
||||
ref={leftVerticalPanRef}
|
||||
onGestureEvent={gestureControls.onBrightnessGestureEvent}
|
||||
activeOffsetY={[-10, 10]}
|
||||
failOffsetX={[-20, 20]}
|
||||
maxPointers={1}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<TapGestureHandler
|
||||
waitFor={leftDoubleTapRef}
|
||||
onActivated={toggleControls}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill} />
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
</PanGestureHandler>
|
||||
</View>
|
||||
</TapGestureHandler>
|
||||
|
||||
{/* Center area tap handler */}
|
||||
<TapGestureHandler
|
||||
|
|
@ -298,41 +292,33 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
|
|||
}} />
|
||||
</TapGestureHandler>
|
||||
|
||||
{/* Right side gestures */}
|
||||
<TapGestureHandler
|
||||
ref={rightDoubleTapRef}
|
||||
numberOfTaps={2}
|
||||
onActivated={handleRightDoubleTap}
|
||||
>
|
||||
<View style={rightSideStyle}>
|
||||
<LongPressGestureHandler
|
||||
onActivated={onLongPressActivated}
|
||||
onEnded={onLongPressEnd}
|
||||
onHandlerStateChange={onLongPressStateChange}
|
||||
minDurationMs={500}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<PanGestureHandler
|
||||
ref={rightVerticalPanRef}
|
||||
onGestureEvent={gestureControls.onVolumeGestureEvent}
|
||||
activeOffsetY={[-10, 10]}
|
||||
failOffsetX={[-20, 20]}
|
||||
maxPointers={1}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<TapGestureHandler
|
||||
waitFor={rightDoubleTapRef}
|
||||
onActivated={toggleControls}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill} />
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
</PanGestureHandler>
|
||||
</View>
|
||||
</LongPressGestureHandler>
|
||||
</View>
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
{/* Right side gestures */}
|
||||
<TapGestureHandler
|
||||
ref={rightDoubleTapRef}
|
||||
numberOfTaps={2}
|
||||
onActivated={handleRightDoubleTap}
|
||||
>
|
||||
<View style={rightSideStyle}>
|
||||
<PanGestureHandler
|
||||
ref={rightVerticalPanRef}
|
||||
onGestureEvent={gestureControls.onVolumeGestureEvent}
|
||||
activeOffsetY={[-10, 10]}
|
||||
failOffsetX={[-20, 20]}
|
||||
maxPointers={1}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill}>
|
||||
<TapGestureHandler
|
||||
waitFor={rightDoubleTapRef}
|
||||
onActivated={toggleControls}
|
||||
>
|
||||
<View style={StyleSheet.absoluteFill} />
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
</PanGestureHandler>
|
||||
</View>
|
||||
</TapGestureHandler>
|
||||
</View>
|
||||
</LongPressGestureHandler>
|
||||
</PanGestureHandler>
|
||||
|
||||
{/* Volume/Brightness Pill Overlay */}
|
||||
|
|
|
|||
|
|
@ -63,23 +63,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
|
|||
useNativeDriver: true
|
||||
}).start();
|
||||
|
||||
setTimeout(() => {
|
||||
Animated.timing(speedActivatedOverlayOpacity, {
|
||||
toValue: 0,
|
||||
duration: 300,
|
||||
useNativeDriver: true
|
||||
}).start(() => setShowSpeedActivatedOverlay(false));
|
||||
}, 2000);
|
||||
|
||||
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
|
||||
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
|
||||
|
||||
const deactivateSpeedBoost = useCallback(() => {
|
||||
if (isSpeedBoosted) {
|
||||
setPlaybackSpeed(originalSpeed);
|
||||
setIsSpeedBoosted(false);
|
||||
Animated.timing(speedActivatedOverlayOpacity, { toValue: 0, duration: 100, useNativeDriver: true }).start();
|
||||
|
||||
Animated.timing(speedActivatedOverlayOpacity, {
|
||||
toValue: 0,
|
||||
duration: 100,
|
||||
useNativeDriver: true
|
||||
}).start(() => {
|
||||
setShowSpeedActivatedOverlay(false);
|
||||
});
|
||||
}
|
||||
}, [isSpeedBoosted, originalSpeed]);
|
||||
}, [isSpeedBoosted, originalSpeed, speedActivatedOverlayOpacity]);
|
||||
|
||||
return {
|
||||
playbackSpeed,
|
||||
|
|
|
|||
Loading…
Reference in a new issue