Skip to content

Fix an inconsistency between the mute status icon in full screen mode… #39479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thienlnam merged 7 commits into from
Apr 15, 2024
Merged

Fix an inconsistency between the mute status icon in full screen mode… #39479

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d912e12
Fix an inconsistency between the mute status icon in full screen mode…
shahinyan11 Apr 3, 2024
82039cc
fix eslint error
shahinyan11 Apr 3, 2024
71d5de8
run prettier
shahinyan11 Apr 3, 2024
59e16fd
Pull last main and resolve conflicts
shahinyan11 Apr 4, 2024
2b75d3d
Comment addressed
shahinyan11 Apr 8, 2024
6487872
Fix extra pause => play video
shahinyan11 Apr 9, 2024
461030b
Add comment
shahinyan11 Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/components/VideoPlayer/BaseVideoPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Hoverable from '@components/Hoverable';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import {useFullScreenContext} from '@components/VideoPlayerContexts/FullScreenContext';
import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
import {useVolumeContext} from '@components/VideoPlayerContexts/VolumeContext';
import VideoPopoverMenu from '@components/VideoPopoverMenu';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -66,6 +67,7 @@ function BaseVideoPlayer({
const isCurrentlyURLSet = currentlyPlayingURL === url;
const isUploading = CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => url.startsWith(prefix));
const videoStateRef = useRef<AVPlaybackStatus | null>(null);
const {updateVolume} = useVolumeContext();

const togglePlayCurrentVideo = useCallback(() => {
videoResumeTryNumber.current = 0;
Expand Down Expand Up @@ -145,6 +147,16 @@ function BaseVideoPlayer({

if (event.fullscreenUpdate === VideoFullscreenUpdate.PLAYER_DID_DISMISS) {
isFullScreenRef.current = false;

// Sync volume updates in full screen mode after leaving it
currentVideoPlayerRef.current?.getStatusAsync?.().then((status) => {
if (!('isMuted' in status)) {
return;
}

updateVolume(status.isMuted ? 0 : status.volume || 1);
});

// we need to use video state ref to check if video is playing, to catch proper state after exiting fullscreen
// and also fix a bug with fullscreen mode dismissing when handleFullscreenUpdate function changes
if (videoStateRef.current && (!('isPlaying' in videoStateRef.current) || videoStateRef.current.isPlaying)) {
Expand All @@ -154,7 +166,7 @@ function BaseVideoPlayer({
}
}
},
[isFullScreenRef, onFullscreenUpdate, pauseVideo, playVideo, videoResumeTryNumber],
[isFullScreenRef, onFullscreenUpdate, pauseVideo, playVideo, videoResumeTryNumber, updateVolume, currentVideoPlayerRef],
);

const bindFunctions = useCallback(() => {
Expand Down