diff --git a/src/components/FullscreenIntroVideo.native.js b/src/components/FullscreenIntroVideo.native.js index c2c2f38..1e1e820 100644 --- a/src/components/FullscreenIntroVideo.native.js +++ b/src/components/FullscreenIntroVideo.native.js @@ -16,6 +16,7 @@ const FullscreenIntroVideo = ({ visible = true, onClose, contentFit = 'contain', + allowSkip = true, skipLabel = 'Passer la vidéo', }) => { const source = url ? (typeof url === 'string' ? { uri: url } : url) : videos.test @@ -120,22 +121,24 @@ const FullscreenIntroVideo = ({ // right: 24, // }} /> - - {skipLabel} - + {allowSkip ? ( + + {skipLabel} + + ) : null} ) diff --git a/src/components/FullscreenIntroVideo.web.js b/src/components/FullscreenIntroVideo.web.js index afdde36..71c14ab 100644 --- a/src/components/FullscreenIntroVideo.web.js +++ b/src/components/FullscreenIntroVideo.web.js @@ -62,6 +62,7 @@ const FullscreenIntroVideo = ({ visible = true, onClose, contentFit = 'cover', + allowSkip = true, requireAudio = false, skipLabel = 'Passer la vidéo', playLabel = 'Lire la vidéo avec le son', @@ -150,7 +151,10 @@ const FullscreenIntroVideo = ({ if (error?.name === 'NotAllowedError' && requireAudio) { setAwaitingInteraction(true) } else if (error?.name === 'NotAllowedError' && !muted) { + video.muted = true setMuted(true) + const mutedResult = video.play() + mutedResult?.catch?.(() => {}) } }) } @@ -224,9 +228,11 @@ const FullscreenIntroVideo = ({ {playLabel} ) : null} - - {skipLabel} - + {allowSkip ? ( + + {skipLabel} + + ) : null} ) diff --git a/src/screens/LandingPage.js b/src/screens/LandingPage.js index b069127..1f6c8e5 100644 --- a/src/screens/LandingPage.js +++ b/src/screens/LandingPage.js @@ -76,18 +76,12 @@ export default function LandingPage({ route }) { const activeVideoClose = phase === FLOW_PHASE.JINGLE ? handleJingleClose : handleWelcomeVideoClose - const skipLabel = - phase === FLOW_PHASE.JINGLE - ? 'Passer / Skip' - : selectedLanguage === 'en' - ? 'Skip video' - : 'Passer la vidéo' + const isJingle = phase === FLOW_PHASE.JINGLE + const skipLabel = selectedLanguage === 'en' ? 'Skip video' : 'Passer la vidéo' const playLabel = - phase === FLOW_PHASE.JINGLE - ? 'Lancer le jingle / Play jingle' - : selectedLanguage === 'en' - ? 'Play video with sound' - : 'Lire la vidéo avec le son' + selectedLanguage === 'en' + ? 'Play video with sound' + : 'Lire la vidéo avec le son' return ( <> @@ -128,7 +122,8 @@ export default function LandingPage({ route }) { visible onClose={activeVideoClose} contentFit="contain" - requireAudio + allowSkip={!isJingle} + requireAudio={!isJingle} skipLabel={skipLabel} playLabel={playLabel} />