Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-05-18 16:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'NuvioMedia:main' into localization-patch

Browse source
This commit is contained in:
albyalex96 2026-03-16 11:25:46 +01:00 committed by GitHub
commit 6a7a7b0f38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 102 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/player/AndroidVideoPlayer.tsx
View file

@ -189,6 +189,11 @@ const AndroidVideoPlayer: React.FC = () => {
const metadataResult = useMetadata({ id: id || 'placeholder', type: (type as any) }); const metadataResult = useMetadata({ id: id || 'placeholder', type: (type as any) });
const { metadata, cast } = Boolean(id && type) ? (metadataResult as any) : { metadata: null, cast: [] }; 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 hasLogo = metadata && metadata.logo;
const openingAnimation = useOpeningAnimation(backdrop, metadata); const openingAnimation = useOpeningAnimation(backdrop, metadata);
@ -212,12 +217,12 @@ const AndroidVideoPlayer: React.FC = () => {
type: type === 'series' ? 'series' : 'movie', type: type === 'series' ? 'series' : 'movie',
title: episodeTitle || title, title: episodeTitle || title,
year: year || 0, year: year || 0,
imdbId: imdbId || '', imdbId: resolvedImdbId || '',
season: season, season: season,
episode: episode, episode: episode,
showTitle: title, showTitle: title,
showYear: year, showYear: year,
showImdbId: imdbId, showImdbId: resolvedImdbId,
episodeId: episodeId episodeId: episodeId
}); });
@ -244,7 +249,7 @@ const AndroidVideoPlayer: React.FC = () => {
traktAutosync, traktAutosync,
controlsHook.seekToTime, controlsHook.seekToTime,
currentStreamProvider, currentStreamProvider,
imdbId, resolvedImdbId,
season, season,
episode, episode,
releaseDate, releaseDate,
@ -267,7 +272,7 @@ const AndroidVideoPlayer: React.FC = () => {
const nextEpisodeHook = useNextEpisode(type, season, episode, groupedEpisodes, (metadataResult as any)?.groupedEpisodes, episodeId); const nextEpisodeHook = useNextEpisode(type, season, episode, groupedEpisodes, (metadataResult as any)?.groupedEpisodes, episodeId);
const { segments: skipIntervals, outroSegment } = useSkipSegments({ const { segments: skipIntervals, outroSegment } = useSkipSegments({
imdbId: imdbId || (id?.startsWith('tt') ? id : undefined), imdbId: resolvedImdbId || (id?.startsWith('tt') ? id : undefined),
type, type,
season, season,
episode, episode,
@ -731,7 +736,7 @@ const AndroidVideoPlayer: React.FC = () => {
id, id,
type: 'series', type: 'series',
episodeId: ep.stremioId || `${id}:${ep.season_number}:${ep.episode_number}`, episodeId: ep.stremioId || `${id}:${ep.season_number}:${ep.episode_number}`,
imdbId: imdbId ?? undefined, imdbId: resolvedImdbId ?? undefined,
backdrop: backdrop || undefined, backdrop: backdrop || undefined,
availableStreams: {}, availableStreams: {},
groupedEpisodes: groupedEpisodes, groupedEpisodes: groupedEpisodes,
@ -741,7 +746,7 @@ const AndroidVideoPlayer: React.FC = () => {
// Subtitle addon fetching // Subtitle addon fetching
const fetchAvailableSubtitles = useCallback(async () => { const fetchAvailableSubtitles = useCallback(async () => {
const targetImdbId = imdbId; const targetImdbId = resolvedImdbId;
setIsLoadingSubtitleList(true); setIsLoadingSubtitleList(true);
try { try {
@ -820,7 +825,7 @@ const AndroidVideoPlayer: React.FC = () => {
} finally { } finally {
setIsLoadingSubtitleList(false); setIsLoadingSubtitleList(false);
} }
}, [imdbId, type, season, episode, id]); }, [resolvedImdbId, type, season, episode, id]);
const loadWyzieSubtitle = useCallback(async (subtitle: WyzieSubtitle) => { const loadWyzieSubtitle = useCallback(async (subtitle: WyzieSubtitle) => {
if (!subtitle.url) return; if (!subtitle.url) return;
@ -1046,7 +1051,10 @@ const AndroidVideoPlayer: React.FC = () => {
onLongPressActivated={speedControl.activateSpeedBoost} onLongPressActivated={speedControl.activateSpeedBoost}
onLongPressEnd={speedControl.deactivateSpeedBoost} onLongPressEnd={speedControl.deactivateSpeedBoost}
onLongPressStateChange={(e) => { 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} toggleControls={toggleControls}
showControls={playerState.showControls} showControls={playerState.showControls}
@ -1119,7 +1127,7 @@ const AndroidVideoPlayer: React.FC = () => {
canEnterPictureInPicture={canShowPipButton} canEnterPictureInPicture={canShowPipButton}
onEnterPictureInPicture={handleEnterPictureInPicture} onEnterPictureInPicture={handleEnterPictureInPicture}
isBuffering={playerState.isBuffering} isBuffering={playerState.isBuffering}
imdbId={imdbId} imdbId={resolvedImdbId}
/> />
<SpeedActivatedOverlay <SpeedActivatedOverlay
@ -1145,7 +1153,7 @@ const AndroidVideoPlayer: React.FC = () => {
{/* Parental Guide Overlay - Shows after controls first hide */} {/* Parental Guide Overlay - Shows after controls first hide */}
<ParentalGuideOverlay <ParentalGuideOverlay
imdbId={imdbId || (id?.startsWith('tt') ? id : undefined)} imdbId={resolvedImdbId || (id?.startsWith('tt') ? id : undefined)}
type={type as 'movie' | 'series'} type={type as 'movie' | 'series'}
season={season} season={season}
episode={episode} episode={episode}
@ -1154,7 +1162,7 @@ const AndroidVideoPlayer: React.FC = () => {
{/* Skip Intro Button - Shows during intro section of TV episodes */} {/* Skip Intro Button - Shows during intro section of TV episodes */}
<SkipIntroButton <SkipIntroButton
imdbId={imdbId || (id?.startsWith('tt') ? id : undefined)} imdbId={resolvedImdbId || (id?.startsWith('tt') ? id : undefined)}
type={type || 'movie'} type={type || 'movie'}
season={season} season={season}
episode={episode} episode={episode}
@ -1301,7 +1309,7 @@ const AndroidVideoPlayer: React.FC = () => {
visible={modals.showSubmitIntroModal} visible={modals.showSubmitIntroModal}
onClose={() => modals.setShowSubmitIntroModal(false)} onClose={() => modals.setShowSubmitIntroModal(false)}
currentTime={playerState.currentTime} currentTime={playerState.currentTime}
imdbId={imdbId} imdbId={resolvedImdbId}
season={season} season={season}
episode={episode} episode={episode}
/> />

21
src/components/player/android/hooks/useSpeedControl.ts
View file

@ -59,23 +59,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
useNativeDriver: true useNativeDriver: true
}).start(); }).start();
setTimeout(() => { }, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 300,
useNativeDriver: true
}).start(() => setShowSpeedActivatedOverlay(false));
}, 2000);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
const deactivateSpeedBoost = useCallback(() => { const deactivateSpeedBoost = useCallback(() => {
if (isSpeedBoosted) { if (isSpeedBoosted) {
setPlaybackSpeed(originalSpeed); setPlaybackSpeed(originalSpeed);
setIsSpeedBoosted(false); 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 { return {
playbackSpeed, playbackSpeed,

138
src/components/player/components/GestureControls.tsx
View file

@ -191,13 +191,9 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
height: '100%' as const, height: '100%' as const,
}; };
// Full gesture area style // Full gesture area style covering the entire video
const gestureAreaStyle = { const gestureAreaStyle = {
position: 'absolute' as const, ...StyleSheet.absoluteFillObject,
top: screenDimensions.height * 0.15,
left: 0,
width: screenDimensions.width,
height: screenDimensions.height * 0.7,
zIndex: 10, zIndex: 10,
}; };
@ -237,41 +233,39 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
failOffsetY={[-20, 20]} failOffsetY={[-20, 20]}
maxPointers={1} maxPointers={1}
> >
<View style={gestureAreaStyle}> <LongPressGestureHandler
{/* Left side gestures */} onActivated={onLongPressActivated}
<TapGestureHandler onEnded={onLongPressEnd}
ref={leftDoubleTapRef} onHandlerStateChange={onLongPressStateChange}
numberOfTaps={2} minDurationMs={500}
onActivated={handleLeftDoubleTap} maxDist={100000}
> >
<View style={leftSideStyle}> <View style={gestureAreaStyle}>
<LongPressGestureHandler {/* Left side gestures */}
onActivated={onLongPressActivated} <TapGestureHandler
onEnded={onLongPressEnd} ref={leftDoubleTapRef}
onHandlerStateChange={onLongPressStateChange} numberOfTaps={2}
minDurationMs={500} onActivated={handleLeftDoubleTap}
> >
<View style={StyleSheet.absoluteFill}> <View style={leftSideStyle}>
<PanGestureHandler <PanGestureHandler
ref={leftVerticalPanRef} ref={leftVerticalPanRef}
onGestureEvent={gestureControls.onBrightnessGestureEvent} onGestureEvent={gestureControls.onBrightnessGestureEvent}
activeOffsetY={[-10, 10]} activeOffsetY={[-10, 10]}
failOffsetX={[-20, 20]} failOffsetX={[-20, 20]}
maxPointers={1} maxPointers={1}
> >
<View style={StyleSheet.absoluteFill}> <View style={StyleSheet.absoluteFill}>
<TapGestureHandler <TapGestureHandler
waitFor={leftDoubleTapRef} waitFor={leftDoubleTapRef}
onActivated={toggleControls} onActivated={toggleControls}
> >
<View style={StyleSheet.absoluteFill} /> <View style={StyleSheet.absoluteFill} />
</TapGestureHandler> </TapGestureHandler>
</View> </View>
</PanGestureHandler> </PanGestureHandler>
</View> </View>
</LongPressGestureHandler> </TapGestureHandler>
</View>
</TapGestureHandler>
{/* Center area tap handler */} {/* Center area tap handler */}
<TapGestureHandler <TapGestureHandler
@ -298,41 +292,33 @@ export const GestureControls: React.FC<GestureControlsProps> = ({
}} /> }} />
</TapGestureHandler> </TapGestureHandler>
{/* Right side gestures */} {/* Right side gestures */}
<TapGestureHandler <TapGestureHandler
ref={rightDoubleTapRef} ref={rightDoubleTapRef}
numberOfTaps={2} numberOfTaps={2}
onActivated={handleRightDoubleTap} onActivated={handleRightDoubleTap}
> >
<View style={rightSideStyle}> <View style={rightSideStyle}>
<LongPressGestureHandler <PanGestureHandler
onActivated={onLongPressActivated} ref={rightVerticalPanRef}
onEnded={onLongPressEnd} onGestureEvent={gestureControls.onVolumeGestureEvent}
onHandlerStateChange={onLongPressStateChange} activeOffsetY={[-10, 10]}
minDurationMs={500} failOffsetX={[-20, 20]}
> maxPointers={1}
<View style={StyleSheet.absoluteFill}> >
<PanGestureHandler <View style={StyleSheet.absoluteFill}>
ref={rightVerticalPanRef} <TapGestureHandler
onGestureEvent={gestureControls.onVolumeGestureEvent} waitFor={rightDoubleTapRef}
activeOffsetY={[-10, 10]} onActivated={toggleControls}
failOffsetX={[-20, 20]} >
maxPointers={1} <View style={StyleSheet.absoluteFill} />
> </TapGestureHandler>
<View style={StyleSheet.absoluteFill}> </View>
<TapGestureHandler </PanGestureHandler>
waitFor={rightDoubleTapRef} </View>
onActivated={toggleControls} </TapGestureHandler>
> </View>
<View style={StyleSheet.absoluteFill} /> </LongPressGestureHandler>
</TapGestureHandler>
</View>
</PanGestureHandler>
</View>
</LongPressGestureHandler>
</View>
</TapGestureHandler>
</View>
</PanGestureHandler> </PanGestureHandler>
{/* Volume/Brightness Pill Overlay */} {/* Volume/Brightness Pill Overlay */}

21
src/components/player/hooks/useSpeedControl.ts
View file

@ -63,23 +63,22 @@ export const useSpeedControl = (initialSpeed: number = 1.0) => {
useNativeDriver: true useNativeDriver: true
}).start(); }).start();
setTimeout(() => { }, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue, speedActivatedOverlayOpacity]);
Animated.timing(speedActivatedOverlayOpacity, {
toValue: 0,
duration: 300,
useNativeDriver: true
}).start(() => setShowSpeedActivatedOverlay(false));
}, 2000);
}, [holdToSpeedEnabled, isSpeedBoosted, playbackSpeed, holdToSpeedValue]);
const deactivateSpeedBoost = useCallback(() => { const deactivateSpeedBoost = useCallback(() => {
if (isSpeedBoosted) { if (isSpeedBoosted) {
setPlaybackSpeed(originalSpeed); setPlaybackSpeed(originalSpeed);
setIsSpeedBoosted(false); 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 { return {
playbackSpeed, playbackSpeed,